CorsMiddleware Cleanup

Author: ToxicTree

app/Http/Middleware/CorsMiddleware.php

@@ -1,28 +1,7 @@
 <?php
-/*
 
 namespace App\Http\Middleware;
 
-class CorsMiddleware {
-
-    public function handle($request, \Closure $next)
-    {
-        $response = $next($request);
-
-        $response->header('Access-Control-Allow-Methods', 'HEAD, GET, POST, PUT, PATCH, DELETE');
-        $response->header('Access-Control-Allow-Headers', $request->header('Access-Control-Request-Headers'));
-        $response->header('Access-Control-Allow-Origin', '*');
-
-        return $response;
-    }
-
-}
-*/
-
-namespace App\Http\Middleware;
-
-use Closure;
-
 class CorsMiddleware
 {
     /**
@@ -32,19 +11,20 @@ class CorsMiddleware
      * @param  \Closure  $next
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle($request, \Closure $next)
     {
         $headers = [
-            //'Access-Control-Allow-Origin'      => '*',
+            'Access-Control-Allow-Origin'      => '*',
             'Access-Control-Allow-Methods'     => 'POST, GET, OPTIONS, PUT, DELETE',
-            'Access-Control-Allow-Credentials' => 'true',
-            'Access-Control-Max-Age'           => '86400',
-            'Access-Control-Allow-Headers'     => 'Content-Type, Authorization, X-Requested-With'
+            //'Access-Control-Allow-Credentials' => 'true',
+            //'Access-Control-Max-Age'           => '86400',
+            //'Access-Control-Allow-Headers'     => 'Content-Type, Authorization, X-Requested-With'
+            'Access-Control-Allow-Headers'     => $request->header('Access-Control-Request-Headers')
         ];
 
         if ($request->isMethod('OPTIONS'))
         {
-            return response()->json('{"method":"OPTIONS"}', 200, $headers);
+            return response('')->withHeaders($headers);
         }
 
         $response = $next($request);
@@ -55,4 +35,4 @@ public function handle($request, Closure $next)
 
         return $response;
     }
-}
+}

app/Http/routes.php

@@ -10,7 +10,6 @@
 | and give it the Closure to call when that URI is requested.
 |
 */
-header('Access-Control-Allow-Origin: *');
 
 $app->get   ('/',            'Controller@tableGetAll_');