Merge pull request #95 from utopia-php/fix-wildcards-g4

Fix wildcards for OPTIONS

Author: eldadfux

src/App.php

@@ -760,8 +760,41 @@ public function run(Request $request, Response $response): static
             $response->disablePayload();
         }
 
+        if(self::REQUEST_METHOD_OPTIONS == $method) {
+            try {
+                foreach ($groups as $group) {
+                    foreach (self::$options as $option) { // Group options hooks
+                        /** @var Hook $option */
+                        if (in_array($group, $option->getGroups())) {
+                            \call_user_func_array($option->getAction(), $this->getArguments($option, [], $request->getParams()));
+                        }
+                    }
+                }
+
+                foreach (self::$options as $option) { // Global options hooks
+                    /** @var Hook $option */
+                    if (in_array('*', $option->getGroups())) {
+                        \call_user_func_array($option->getAction(), $this->getArguments($option, [], $request->getParams()));
+                    }
+                }
+            } catch (\Throwable $e) {
+                foreach (self::$errors as $error) { // Global error hooks
+                    /** @var Hook $error */
+                    if (in_array('*', $error->getGroups())) {
+                        self::setResource('error', function () use ($e) {
+                            return $e;
+                        });
+                        \call_user_func_array($error->getAction(), $this->getArguments($error, [], $request->getParams()));
+                    }
+                }
+            }
+
+            return $this;
+        }
+
         if (null === $route && null !== self::$wildcardRoute) {
             $route = self::$wildcardRoute;
+            $this->route = $route;
             $path = \parse_url($request->getURI(), PHP_URL_PATH);
             $route->path($path);
         }

tests/AppTest.php

@@ -612,20 +612,56 @@ public function testWildcardRoute(): void
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/unknown_path';
 
+        App::init()
+            ->action(function () {
+                $route = $this->app->getRoute();
+                App::setResource('myRoute', fn () => $route);
+            });
+
+        App::options()
+            ->inject('request')
+            ->inject('response')
+            ->action(function (Request $request, Response $response) {
+                $origin = $request->getOrigin();
+                $response
+                    ->addHeader('Server', 'Appwrite')
+                    ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
+                    ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-Appwrite-ID, Content-Range, Range, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
+                    ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
+                    ->addHeader('Access-Control-Allow-Origin', $origin)
+                    ->addHeader('Access-Control-Allow-Credentials', 'true')
+                    ->noContent();
+            });
+
         App::wildcard()
+            ->inject('myRoute')
             ->inject('response')
-            ->action(function ($response) {
-                $response->send('HELLO');
+            ->action(function (mixed $myRoute, $response) {
+                if($myRoute == null) {
+                    $response->send('ROUTE IS NULL!');
+                } else {
+                    $response->send('HELLO');
+                }
             });
 
         \ob_start();
         @$this->app->run(new Request(), new Response());
         $result = \ob_get_contents();
         \ob_end_clean();
 
+        $this->assertEquals('HELLO', $result);
+
+        \ob_start();
+        $req = new Request();
+        $req = $req->setMethod('OPTIONS');
+        @$this->app->run($req, new Response());
+        $result = \ob_get_contents();
+        \ob_end_clean();
+
+        $this->assertEquals('', $result);
+
         $_SERVER['REQUEST_METHOD'] = $method;
         $_SERVER['REQUEST_URI'] = $uri;
 
-        $this->assertEquals('HELLO', $result);
     }
 }