From f372b8672dd0f8b48ae012ab82f776b7fb8fecc9 Mon Sep 17 00:00:00 2001
From: mahdi purHosseini <mahdip9811@gmail.com>
Date: Tue, 19 Sep 2023 13:46:34 +0330
Subject: [PATCH] fix cors

---
 app/Http/Kernel.php                      |  2 +-
 app/Http/Middleware/Cors.php             | 54 ++++++++++++------------
 app/Providers/MessageServiceProvider.php |  3 +-
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 88b099ab..70fcea1a 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -19,7 +19,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\TrustProxies::class,
-        \App\Http\Middleware\Cors::class,
+//        \App\Http\Middleware\Cors::class,
     ];
 
     /**
diff --git a/app/Http/Middleware/Cors.php b/app/Http/Middleware/Cors.php
index f817ccbd..56d32731 100644
--- a/app/Http/Middleware/Cors.php
+++ b/app/Http/Middleware/Cors.php
@@ -1,30 +1,32 @@
-<?php // /app/Http/Middleware/Cors.php
-namespace App\Http\Middleware;
-use Closure;
-class Cors {
+<?php
+
+    namespace App\Http\Middleware;
+
+    use Closure;
+
+    class Cors {
 
 
-    public function handle($request, Closure $next)
-    {
-        /* @var $response Response */
-        $response = $next($request)
-        ->header('Access-Control-Allow-Origin', '*')
-        ->header('Access-Control-Allow-credentials', true)
-        ->header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
-        if (!$request->isMethod('OPTIONS')) {
-            return $response;
+        public function handle($request, Closure $next)
+        {
+            /* @var $response Response */
+            $response = $next($request)
+            ->header('Access-Control-Allow-Origin', '*')
+            ->header('Access-Control-Allow-credentials', true)
+            ->header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
+            if (!$request->isMethod('OPTIONS')) {
+                return $response;
+            }
+            $allow = $response->headers->get('Allow'); // true list of allowed methods
+            if (!$allow) {
+                return $response;
+            }
+            $headers = [
+                'Access-Control-Allow-Methods' => $allow,
+                'Access-Control-Max-Age' => 3600,
+                'Access-Control-Allow-Headers' => 'X-Requested-With, Origin, X-Csrftoken, Content-Type, Accept',
+            ];
+            return $response->withHeaders($headers);
         }
-        $allow = $response->headers->get('Allow'); // true list of allowed methods
-        if (!$allow) {
-            return $response;
-        }
-        $headers = [
-            'Access-Control-Allow-Methods' => $allow,
-            'Access-Control-Max-Age' => 3600,
-            'Access-Control-Allow-Headers' => 'X-Requested-With, Origin, X-Csrftoken, Content-Type, Accept',
-        ];
-        return $response->withHeaders($headers);
+
     }
-
-
-}
diff --git a/app/Providers/MessageServiceProvider.php b/app/Providers/MessageServiceProvider.php
index 3d1b7bd6..925f7218 100644
--- a/app/Providers/MessageServiceProvider.php
+++ b/app/Providers/MessageServiceProvider.php
@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Packages\Messaging\src\Facades\MessageResponse;
 
 class MessageServiceProvider extends ServiceProvider
 {
@@ -12,7 +13,7 @@ class MessageServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->singleton('messages', function() {
-            return new \App\Appended\Classes\Common\Response\MessageResponse;
+            return new MessageResponse;
         });
     }