Merge pull request #32 from modulusphp/feature/cors-update

Feature/cors update

Author: donaldp

Upstart.php

@@ -5,6 +5,7 @@
 use App\Resolvers\AppServiceResolver;
 use Modulus\Framework\Upstart\AppLogger;
 use Modulus\Framework\Upstart\AppConnect;
+use Modulus\Framework\Upstart\HandleCors;
 use Modulus\Framework\Upstart\ErrorReport;
 use Modulus\Framework\Upstart\SwishRouter;
 use Modulus\Framework\Mocks\MustRememberMe;
@@ -15,6 +16,7 @@ class Upstart
 {
   use AppLogger;        // Configure application logger
   use AppConnect;       // Initialize Database connection and Environment variables
+  use HandleCors;       // Allow other applications to reach the router dispatch
   use SwishRouter;      // Handle application routing
   use ErrorReport;      // Handle application error reporting
   use ViewComponent;    // Strap application View
@@ -42,6 +44,7 @@ class Upstart
    */
   public function boot(?bool $isConsole = false) : void
   {
+    $this->addCors();
     if (Upstart::$isReady) return;
 
     $this->bootEnv();

Upstart/HandleCors.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Modulus\Framework\Upstart;
+
+trait HandleCors
+{
+  /**
+   * add Cors
+   *
+   * @return void
+   */
+  public function addCors()
+  {
+    header('Access-Control-Allow-Credentials: 0');
+    header('Access-Control-Allow-Origin: *');
+    header('Access-Control-Allow-Headers: *');
+    header('Access-Control-Allow-Methods: *');
+
+    if (isset($_SERVER["REQUEST_METHOD"]) && $_SERVER["REQUEST_METHOD"] === "OPTIONS") {
+      exit;
+    }
+  }
+
+  /**
+   * remove Cors
+   *
+   * @return void
+   */
+  public function removeCors()
+  {
+    header_remove('Access-Control-Allow-Credentials');
+    header_remove('Access-Control-Allow-Origin');
+    header_remove('Access-Control-Allow-Headers');
+    header_remove('Access-Control-Allow-Methods');
+  }
+}

Upstart/SwishEvents.php

@@ -35,7 +35,8 @@ private function swishFails()
    */
   private function swishBefore()
   {
-    return function($route, $callback) {
+    $self = $this;
+    return function($route, $callback) use ($self) {
       $route->variables = (new Reflect)->handle($callback, $route->variables, $route);
 
       // get controller middleware
@@ -55,18 +56,23 @@ private function swishBefore()
         }
       }
 
+      // get all middleware's
       foreach (Route::$routes as $key => $value) {
         if ($value['id'] == $route->id) {
           $route->middleware = array_merge($value['middleware'], $all ?? []);
         }
       }
 
+      // create a new request object
       $request = Reflect::$request ?? new Request(array_merge($_POST, $_FILES));
       $request->route = $route;
       $this->setRequest($request);
 
+      // remove cors to allow the middleware to handle it
+      $self->removeCors();
       Middleware::run($request, $route, substr($route->file, 0, strlen($route->file) - 4));
 
+      // return matched variables
       return $route->variables;
     };
   }

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "modulusphp/framework",
   "description": "Framework component for modulusPHP",
-  "version": "1.9.8.2",
+  "version": "1.9.8.3",
   "license": "MIT",
   "type": "package",
   "authors": [{