Fix for replace for extension schemas (limosa-io#120)

Author: arietimmerman

Dockerfile

@@ -22,7 +22,7 @@ RUN composer require arietimmerman/laravel-scim-server @dev && \
 
 RUN touch ./.database.sqlite && \
     echo "DB_CONNECTION=sqlite" >> ./.env && \
-    echo "DB_DATABASE=/example/.database.sqlite" >> ./.env && \
+    echo "DB_DATABASE=/.database.sqlite" >> ./.env && \
     echo "APP_URL=http://localhost:18123" >> ./.env
 
 RUN php artisan migrate && \

src/Attribute/Complex.php

@@ -18,7 +18,7 @@ class Complex extends AbstractComplex
      */
     public function getSchemas()
     {
-        return collect($this->getSchemaNodes())->map(fn ($element) => $element->name)->values()->toArray();
+        return collect($this->getSchemaNodes())->map(fn($element) => $element->name)->values()->toArray();
     }
 
 
@@ -76,21 +76,29 @@ public function patch($operation, $value, Model &$object, Path $path = null, $re
                 $attributeNames = $path?->getAttributePath()?->getAttributeNames() ?? [];
 
                 if (!empty($attributeNames)) {
-                    $attribute = $this->getSubNode($attributeNames[0]);
+                    $schema = $path->getAttributePath()?->path?->schema;
+                    // Resolve attribute either directly or via schema parent when specified
+                    $attribute = $schema
+                        ? ((($parent = $this->getSubNode($schema)) instanceof Schema) ? $parent->getSubNode($attributeNames[0]) : null)
+                        : $this->getSubNode($attributeNames[0]);
+
                     if ($attribute != null) {
                         $attribute->patch($operation, $value, $object, $path->shiftAttributePathAttributes());
-                    } elseif ($this->parent == null) {
-                        // this is the root node, check within the first (the default) schema node
-                        // pass the unchanged path object
+                        return; // done
+                    }
+
+                    if ($this->parent == null) {
+                        // root node: delegate unchanged path to default schema node
                         $this->getSchemaNode()->patch($operation, $value, $object, $path);
-                    } else {
-                        throw new SCIMException('Unknown path: ' . (string)$path . ", in object: " . $this->getFullKey());
+                        return; // done
                     }
+
+                    throw new SCIMException('Unknown path: ' . (string)$path . ", in object: " . $this->getFullKey());
                 }
             }
         } else {
             // if there is no path, keys of value are attribute names
-            switch($operation) {
+            switch ($operation) {
                 case 'replace':
                     $this->replace($value, $object, $path, false);
                     break;
@@ -300,6 +308,6 @@ public function applyComparison(Builder &$query, Path $path, $parentAttribute =
      */
     public function getDefaultSchema()
     {
-        return collect($this->subAttributes)->first(fn ($element) => $element instanceof Schema)->name;
+        return collect($this->subAttributes)->first(fn($element) => $element instanceof Schema)->name;
     }
 }

tests/CustomSchemaTest.php

@@ -79,4 +79,28 @@ public function testPost()
         $this->assertEquals('Dr. Marie Jo', $json['urn:ietf:params:scim:schemas:core:2.0:User']['userName']);
         $this->assertEquals('123', $json['urn:ietf:params:scim:schemas:extension:enterprise:2.0:User']['employeeNumber']);
     }
+
+    public function testPatchEnterpriseSchema()
+    {
+        $response = $this->patch('/scim/v2/Users/2', [
+            "schemas" => [
+                "urn:ietf:params:scim:api:messages:2.0:PatchOp",
+            ],
+            "Operations" => [
+                [
+                    "op" => "replace",
+                    "path" => "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:employeeNumber",
+                    "value" => "12345"
+                ]
+            ]
+        ]);
+
+
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertArrayHasKey('urn:ietf:params:scim:schemas:extension:enterprise:2.0:User', $json);
+        $this->assertEquals('12345', $json['urn:ietf:params:scim:schemas:extension:enterprise:2.0:User']['employeeNumber']);
+    }
 }