Merge branch 'bcash-main' into main

Author: mevdschee

api.include.php

@@ -11365,7 +11365,7 @@ public function __construct(Config $config)
 
         private function parseBody(string $body) /*: ?object*/
         {
-            $first = substr($body, 0, 1);
+            $first = substr(ltrim($body), 0, 1);
             if ($first == '[' || $first == '{') {
                 $object = json_decode($body);
                 $causeCode = json_last_error();

api.php

@@ -11365,7 +11365,7 @@ public function __construct(Config $config)
 
         private function parseBody(string $body) /*: ?object*/
         {
-            $first = substr($body, 0, 1);
+            $first = substr(ltrim($body), 0, 1);
             if ($first == '[' || $first == '{') {
                 $object = json_decode($body);
                 $causeCode = json_last_error();

src/Tqdev/PhpCrudApi/Api.php

@@ -169,7 +169,7 @@ public function __construct(Config $config)
 
     private function parseBody(string $body) /*: ?object*/
     {
-        $first = substr($body, 0, 1);
+        $first = substr(ltrim($body), 0, 1);
         if ($first == '[' || $first == '{') {
             $object = json_decode($body);
             $causeCode = json_last_error();

src/Tqdev/PhpCrudApi/Middleware/JwtAuthMiddleware.php

@@ -69,9 +69,18 @@ private function getVerifiedClaims(string $token, int $time, int $leeway, int $t
         foreach ($requirements as $field => $values) {
             if (!empty($values)) {
                 if ($field != 'alg') {
-                    if (!isset($claims[$field]) || !in_array($claims[$field], $values)) {
+                    if (!isset($claims[$field])) {
                         return array();
                     }
+                    if (is_array($claims[$field])) {
+                        if (!array_intersect($claims[$field], $values)) {
+                            return array();
+                        }
+                    } else {
+                        if (!in_array($claims[$field], $values)) {
+                            return array();
+                        }
+                    }
                 }
             }
         }

tests/functional/001_records/007_edit_post.log

@@ -16,3 +16,25 @@ Content-Type: application/json; charset=utf-8
 Content-Length: 62
 
 {"id":3,"user_id":1,"category_id":1,"content":"test (edited)"}
+===
+PUT /records/posts/3
+
+    {
+        "user_id": 1,
+        "category_id": 1,
+        "content": "test (edited 1)"
+    }
+===
+200
+Content-Type: application/json; charset=utf-8
+Content-Length: 1
+
+1
+===
+GET /records/posts/3
+===
+200
+Content-Type: application/json; charset=utf-8
+Content-Length: 64
+
+{"id":3,"user_id":1,"category_id":1,"content":"test (edited 1)"}