fixes incorrect schemaExtensions format limosa-io#107 (limosa-io#108)

Author: arietimmerman

src/Attribute/Schema.php

@@ -4,6 +4,13 @@
 
 class Schema extends Complex
 {
+    public $required;
+
+    function __construct($name, $required = true)
+    {
+        parent::__construct($name);
+        $this->required = $required;
+    }
 
     public function generateSchema()
     {
@@ -31,4 +38,8 @@ public function generateSchema()
         return $result;
     }
 
+    public function getName(){
+        return $this->name;
+    }
+
 }

src/Http/Controllers/ResourceTypesController.php

@@ -20,9 +20,23 @@ public function __construct()
         $resourceTypes = [];
 
         foreach ($config as $key => $value) {
-            $schemas = $value['map']->getSchemas();
+            $schemas = $value['map']->getSchemaNodes();
 
-            $resourceTypes[] = new ResourceType($value['singular'], $key, $key, $value['description'] ?? null, $schemas[0], array_slice($schemas, 1));
+            $resourceTypes[] = new ResourceType(
+                $value['singular'],
+                $key,
+                $key,
+                $value['description'] ?? null,
+                $schemas[0]->getName(),
+                collect(array_slice($schemas, 1))->map(
+                    function ($element) {
+                        return [
+                            'schema' => $element->getName(),
+                            'required' => $element->required
+                        ];
+                    }
+                )->toArray()
+            );
         }
 
         $this->resourceTypes = collect($resourceTypes);

src/SCIMConfig.php

@@ -127,7 +127,7 @@ protected function doRead(&$object, $attributes = [])
                         eloquent('primary')->ensure('boolean')->default(false)
                     )->ensure('nullable', 'array', 'max:20')
                 ),
-                (new AttributeSchema('urn:ietf:params:scim:schemas:extension:enterprise:2.0:User', true))->withSubAttributes(
+                (new AttributeSchema('urn:ietf:params:scim:schemas:extension:enterprise:2.0:User', false))->withSubAttributes(
                     eloquent('employeeNumber')->ensure('nullable')
                 )
             ),

tests/ResourceTypesTest.php

@@ -50,7 +50,10 @@ public function testGetOne(){
             "description" => "User Account",
             "schema" => "urn:ietf:params:scim:schemas:core:2.0:User",
             "schemaExtensions" => [
-                "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User"
+                [
+                    "schema" => "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User",
+                    "required" => false
+                ]
             ],
             "meta" => [
                 "location" => "http://localhost/scim/v2/ResourceTypes/User",