Merge pull request #19183 from uberbrady/#19096-and-#19095-company-and-location-and-groups-in-scim

SCIM: Fix address handling and work around Entra email changes
2026-06-12 21:51:37 +01:00
parent 5169d174ad 288bded7d9
commit bb178b0a5c
1 changed files with 6 additions and 2 deletions
@@ -361,7 +361,11 @@ class SnipeSCIMConfig
                        {
                            if ($value) {
                                try {
-                                    $object->email = $value[0]['value'];
+                                    if (is_string($value)) {
+                                        $object->email = $value; // Weird MS-SCIM stuff :/
+                                    } else {
+                                        $object->email = $value[0]['value'];
+                                    }
                                } catch (\Throwable $e) {
                                    \Log::debug($e);
                                    throw new SCIMException("Unknown email object:  '".print_r($value, true)."'", 422);
@@ -470,7 +474,7 @@ class SnipeSCIMConfig
                                $address['primary'] = true;
                            }

-                            return $address;
+                            return [$address];
                        }

                        public function doWrite($operation, $subop, $value, Model &$object, ?Path $path = null, $removeIfNotSet = false)