From f2c11f8180ef0c116a6d8c8bed0e71a258f0fe97 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 2 Jun 2021 09:07:53 +1000
Subject: [PATCH] Fixes for CORS

---
 app/Http/Kernel.php                     |  5 +---
 app/Http/Middleware/VerifyCsrfToken.php |  2 +-
 app/Http/Middleware/WebCors.php         | 36 -------------------------
 app/Jobs/Util/SchedulerCheck.php        |  2 +-
 4 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 app/Http/Middleware/WebCors.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 7b79179c9374..74b0320f163f 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -41,7 +41,6 @@ use App\Http\Middleware\TrustProxies;
 use App\Http\Middleware\UrlSetDb;
 use App\Http\Middleware\UserVerified;
 use App\Http\Middleware\VerifyCsrfToken;
-use App\Http\Middleware\WebCors;
 use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
 use Illuminate\Auth\Middleware\Authorize;
 use Illuminate\Auth\Middleware\EnsureEmailIsVerified;
@@ -73,7 +72,6 @@ class Kernel extends HttpKernel
         TrustProxies::class,
         // \Fruitcake\Cors\HandleCors::class,
         Cors::class,
-        WebCors::class,
 
     ];
 
@@ -87,12 +85,10 @@ class Kernel extends HttpKernel
             EncryptCookies::class,
             AddQueuedCookiesToResponse::class,
             StartSession::class,
-            // \Illuminate\Session\Middleware\AuthenticateSession::class,
             ShareErrorsFromSession::class,
             VerifyCsrfToken::class,
             SubstituteBindings::class,
             QueryLogging::class,
-            WebCors::class,
         ],
 
         'api' => [
@@ -167,6 +163,7 @@ class Kernel extends HttpKernel
 
 
     protected $middlewarePriority = [
+        Cors::class,
         SetDomainNameDb::class,
         SetDb::class,
         SetWebDb::class,
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index 7f2c0fea3417..121074f3c9b2 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -28,6 +28,6 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        //
+        'livewire/message/*'
     ];
 }
diff --git a/app/Http/Middleware/WebCors.php b/app/Http/Middleware/WebCors.php
deleted file mode 100644
index b443f1874ae1..000000000000
--- a/app/Http/Middleware/WebCors.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Support\Facades\Response;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-
-class WebCors
-{
-    public function handle($request, Closure $next)
-    {
-        if ($request->getMethod() == 'OPTIONS') {
-            header('Access-Control-Allow-Origin: *');
-
-            // ALLOW OPTIONS METHOD
-            $headers = [
-                'Access-Control-Allow-Methods'=> 'POST, GET, OPTIONS, PUT, DELETE',
-                'Access-Control-Allow-Headers'=> 'X-API-COMPANY-KEY,X-CLIENT-VERSION,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,X-CSRF-TOKEN,X-LIVEWIRE',
-            ];
-
-            return Response::make('OK', 200, $headers);
-        }
-
-        $response = $next($request);
-
-        $response->headers->set('Access-Control-Allow-Origin', $request->getSchemeAndHttpHost());
-        $response->headers->set('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
-        $response->headers->set('Access-Control-Allow-Headers', 'X-API-COMPANY-KEY,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,X-CSRF-TOKEN,X-LIVEWIRE');
-        $response->headers->set('Access-Control-Expose-Headers', 'X-APP-VERSION,X-MINIMUM-CLIENT-VERSION');
-        $response->headers->set('X-APP-VERSION', config('ninja.app_version'));
-        $response->headers->set('X-MINIMUM-CLIENT-VERSION', config('ninja.minimum_client_version'));
-
-        return $response;
-    }
-}
\ No newline at end of file
diff --git a/app/Jobs/Util/SchedulerCheck.php b/app/Jobs/Util/SchedulerCheck.php
index adeb4e016079..52cde6782bb6 100644
--- a/app/Jobs/Util/SchedulerCheck.php
+++ b/app/Jobs/Util/SchedulerCheck.php
@@ -44,7 +44,7 @@ class SchedulerCheck implements ShouldQueue
         {
 
              try {
-                Artisan::call('migrate', ['--force' => true]);
+                Artisan::call('migrate', ['--force' => 'true']);
             } catch (\Exception $e) {
                 nlog("I wasn't able to migrate the data.");
                 nlog($e->getMessage());