fix: Fix to Processing Head and Other Request Methods

WebFiori · Sep 1, 2024 · 15f5d0f · 15f5d0f
1 parent 30e1ef9
commit 15f5d0f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/webfiori/http/APITestCase.php b/webfiori/http/APITestCase.php
@@ -84,21 +84,19 @@ public function callEndpoint(WebServicesManager $manager, string $requestMethod,
                 $apiEndpointName = $service->getName();
             }
         }
-        if ($method == RequestMethod::GET || $method == RequestMethod::DELETE) {
-            foreach ($parameters as $key => $val) {
-                $_GET[$key] = $this->parseVal($val);
-            }
-            $_GET['service'] = $apiEndpointName;
-            $this->unset($_GET, $parameters, $manager);
-        } else if ($method == RequestMethod::POST || $method == RequestMethod::PUT || $method == RequestMethod::PATCH) {
+        if ($method == RequestMethod::POST || $method == RequestMethod::PUT || $method == RequestMethod::PATCH) {
             foreach ($parameters as $key => $val) {
                 $_POST[$key] = $this->parseVal($val);
             }
             $_POST['service'] = $apiEndpointName;
             $_SERVER['CONTENT_TYPE'] = 'multipart/form-data';
             $this->unset($_POST, $parameters, $manager);
         } else {
-            $manager->process();
+            foreach ($parameters as $key => $val) {
+                $_GET[$key] = $this->parseVal($val);
+            }
+            $_GET['service'] = $apiEndpointName;
+            $this->unset($_GET, $parameters, $manager);
         }
 
         $retVal = $manager->readOutputStream();

diff --git a/webfiori/http/WebServicesManager.php b/webfiori/http/WebServicesManager.php
@@ -988,10 +988,14 @@ private function getAction() {
         foreach ($serviceIdx as $serviceNameIndex) {
             if (($reqMeth == RequestMethod::GET || 
                $reqMeth == RequestMethod::DELETE ||  
-               $reqMeth == RequestMethod::OPTIONS || 
-               $reqMeth == RequestMethod::PATCH) && isset($_GET[$serviceNameIndex])) {
+               $reqMeth == RequestMethod::CONNECT || 
+               $reqMeth == RequestMethod::HEAD || 
+               $reqMeth == RequestMethod::TRACE || 
+               $reqMeth == RequestMethod::OPTIONS) && isset($_GET[$serviceNameIndex])) {
                 $retVal = filter_var($_GET[$serviceNameIndex]);
-            } else if (($reqMeth == RequestMethod::POST || $reqMeth == RequestMethod::PUT) && isset($_POST[$serviceNameIndex])) {
+            } else if (($reqMeth == RequestMethod::POST || 
+                    $reqMeth == RequestMethod::PUT || 
+                    $reqMeth == RequestMethod::PATCH) && isset($_POST[$serviceNameIndex])) {
                 $retVal = filter_var($_POST[$serviceNameIndex]);
             }
         }