Ensure resource types are presented correctly in list response (#93)

limosa-io · Sep 30, 2024 · fa60195 · fa60195
1 parent 2f219c4
commit fa60195
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/Helper.php b/src/Helper.php
@@ -50,7 +50,7 @@ public static function prepareReturn(Arrayable $object, ResourceType $resourceTy
     public static function objectToSCIMArray($object, ResourceType $resourceType = null, array $attributes = [])
     {
         if($resourceType == null){
-            return $object;
+            return $object instanceof Arrayable ? $object->toArray() : $object;
         }
 
         $mapping = $resourceType->getMapping();

diff --git a/src/SCIM/ResourceType.php b/src/SCIM/ResourceType.php
@@ -2,9 +2,10 @@
 
 namespace ArieTimmerman\Laravel\SCIMServer\SCIM;
 
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
 
-class ResourceType implements Jsonable
+class ResourceType implements Jsonable, Arrayable
 {
     public $id;
 

diff --git a/tests/ResourceTypesTest.php b/tests/ResourceTypesTest.php
@@ -16,6 +16,26 @@ public function testGet()
     {
         $response = $this->get('/scim/v2/ResourceTypes');
         $response->assertStatus(200);
+
+        $response->assertJsonStructure([
+            'schemas',
+            'totalResults',
+            'Resources' => [
+                '*' => [
+                    'schemas',
+                    'id',
+                    'name',
+                    'endpoint',
+                    'description',
+                    'schema',
+                    'schemaExtensions',
+                    'meta' => [
+                        'location',
+                        'resourceType'
+                    ]
+                ]
+            ]
+        ]);
     }
 
     public function testGetOne(){