Merge remote-tracking branch 'upstream/master'

Backed out php minimum of 7.4 to remain compatible with upstream

Author: uberbrady

.github/workflows/ci.yml

@@ -9,6 +9,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: php-actions/composer@v6
+      with:
+        php_version: 8
     - uses: php-actions/phpunit@v3
       with:
-        php_version: 7.4
+        php_version: 8

composer.json

@@ -10,10 +10,10 @@
         }
     ],
     "require": {
-		"php": "^7.4|^8.0",
-        "illuminate/database": "^6.0|^7.0|^8.0",
-        "illuminate/support": "^6.0|^7.0|^8.0",
-        "illuminate/console": "^6.0|^7.0|^8.0",
+		"php": "^7.0|^8.0",
+        "illuminate/database": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/console": "^6.0|^7.0|^8.0|^9.0",
         "tmilos/scim-schema": "^0.1.0",
         "tmilos/scim-filter-parser": "^1.3"
     },

composer.lock

@@ -1,5 +1,6 @@
 <?php
 
 return [
-    "publish_routes" => true
+    "publish_routes" => true,
+    'omit_main_schema_in_return' => false
 ];

config/scim.php

@@ -616,7 +616,7 @@ public function applyWhereCondition(&$query, $operator, $value)
 
         //only filter on OWN eloquent attributes
         if (empty($this->eloquentAttributes)) {
-            throw new SCIMException("Can't filter on . " + $this->getFullKey());
+            throw new SCIMException("Can't filter on . " . $this->getFullKey());
         }
 
         $attribute = $this->eloquentAttributes[0];

src/Attribute/AttributeMapping.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace ArieTimmerman\Laravel\SCIMServer;
 
 use ArieTimmerman\Laravel\SCIMServer\Attribute\AttributeMapping;
@@ -96,6 +97,16 @@ public static function objectToSCIMArray($object, ResourceType $resourceType = n
                     $parent[$key] = AttributeMapping::eloquentAttributeToString($value);
                 }
             }
+
+            if (config('scim.omit_main_schema_in_return')) {
+                $defaultSchema = collect($mapping->getDefaultSchema())->first();
+
+                $main = $result[$defaultSchema];
+                unset($result[$defaultSchema]);
+
+                $result = array_merge($result, $main);
+            }
+            
         } else {
             $result = $userArray;
         }

src/Helper.php

@@ -18,46 +18,46 @@ public function getSchemas()
         }
 
         $config = resolve(SCIMConfig::class)->getConfig();
-    
+
         $schemas = [];
-    
+
         foreach ($config as $key => $value) {
             if ($key != 'Users' && $key != 'Group') {
                 continue;
             }
 
             // TODO: FIX THIS. Schema is now an array but should be a string
             $schema = (new SchemaBuilderV2())->get($value['schema'][0]);
-            
+
             if ($schema == null) {
                 throw new SCIMException("Schema not found");
             }
-            
-            $schema->getMeta()->setLocation(route('scim.schemas', ['id' => '23']));
-            
+
+            $schema->getMeta()->setLocation(route('scim.schemas', ['id' => $schema->getId()]));
+
             $schemas[] = $schema->serializeObject();
         }
-    
+
         $this->schemas = collect($schemas);
 
         return $this->schemas;
     }
-    
+
     public function show($id)
     {
-        $result = $this->schemas->first(
+        $result = $this->getSchemas()->first(
             function ($value, $key) use ($id) {
                 return $value['id'] == $id;
             }
         );
-         
+
         if ($result == null) {
             throw (new SCIMException(sprintf('Resource "%s" not found', $id)))->setCode(404);
         }
-         
+
         return $result;
     }
-    
+
     public function index()
     {
         return new ListResponse($this->getSchemas(), 1, $this->getSchemas()->count());

src/Http/Controllers/SchemaController.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Contracts\Support\Jsonable;
 
-class Schema implements JsonAble
+class Schema implements Jsonable
 {
     const SCHEMA_USER = "urn:ietf:params:scim:schemas:core:2.0:User";
     const SCHEMA_GROUP = "urn:ietf:params:scim:schemas:core:2.0:Group";