Merge pull request #33 from utilewebsites/master

Fix origin denied issue by trimming trailing slash from APP_URL and H…
murdercode · Jan 22, 2025 · a990350 · a990350
2 parents e093609 + ce6c0cf
commit a990350
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/Http/Middleware/TinymceMiddleware.php b/src/Http/Middleware/TinymceMiddleware.php
@@ -22,17 +22,19 @@ public function handle($request, Closure $next)
         /**
          * Check if the request coming from the same origin
          */
-        $accepted_origins = [config('app.url')];
-        if (isset($_SERVER['HTTP_ORIGIN'])) {
-            if (in_array($_SERVER['HTTP_ORIGIN'], $accepted_origins)) {
-                header('Access-Control-Allow-Origin: '.$_SERVER['HTTP_ORIGIN']);
+        $accepted_origins = [rtrim(config('app.url'), '/')];
+        $origin = rtrim($_SERVER['HTTP_ORIGIN'], '/');
+
+        if (isset($origin)) {
+            if (in_array($origin, $accepted_origins)) {
+                header('Access-Control-Allow-Origin: ' . $origin);
             } else {
                 header('HTTP/1.1 403 Origin Denied');
-
                 return response()->json(['error' => 'Origin denied']);
             }
         }
 
+
         return $next($request);
     }
 }