System CLI: Updated to 126de5599c state

[bookstack] / app / Access / Oidc / OidcUserDetails.php

diff --git a/app/Access/Oidc/OidcUserDetails.php b/app/Access/Oidc/OidcUserDetails.php
index 1fb40ddc23e625ff5297d2d1a471d74f3371d4c2..fae20de0b6224cb011807017aa6442c56179e4e8 100644 (file)
--- a/app/Access/Oidc/OidcUserDetails.php
+++ b/app/Access/Oidc/OidcUserDetails.php
@@ -22,31 +22,27 @@ class OidcUserDetails
         $hasEmpty = empty($this->externalId)
             || empty($this->email)
             || empty($this->name)
         $hasEmpty = empty($this->externalId)
             || empty($this->email)
             || empty($this->name)

-            || ($groupSyncActive && empty($this->groups));
+            || ($groupSyncActive && $this->groups === null);

 
         return !$hasEmpty;
     }
 
     /**
 
         return !$hasEmpty;
     }
 
     /**

-     * Populate user details from OidcIdToken data.
+     * Populate user details from the given claim data.

      */
      */

-    public static function fromToken(
-        OidcIdToken $token,
+    public function populate(
+        ProvidesClaims $claims,

         string $idClaim,
         string $displayNameClaims,
         string $groupsClaim,
         string $idClaim,
         string $displayNameClaims,
         string $groupsClaim,

-    ): static {
-        $id = $token->getClaim($idClaim);
-
-        return new self(
-            externalId: $id,
-            email: $token->getClaim('email'),
-            name: static::getUserDisplayName($displayNameClaims, $token, $id),
-            groups: static::getUserGroups($groupsClaim, $token),
-        );
+    ): void {
+        $this->externalId = $claims->getClaim($idClaim) ?? $this->externalId;
+        $this->email = $claims->getClaim('email') ?? $this->email;
+        $this->name = static::getUserDisplayName($displayNameClaims, $claims) ?? $this->name;
+        $this->groups = static::getUserGroups($groupsClaim, $claims) ?? $this->groups;

     }
 
     }
 

-    protected static function getUserDisplayName(string $displayNameClaims, OidcIdToken $token, string $defaultValue): string
+    protected static function getUserDisplayName(string $displayNameClaims, ProvidesClaims $token): string

     {
         $displayNameClaimParts = explode('|', $displayNameClaims);
 
     {
         $displayNameClaimParts = explode('|', $displayNameClaims);
 


@@ -58,22 +54,18 @@ class OidcUserDetails
             }
         }
 
             }
         }
 

-        if (count($displayName) === 0) {
-            $displayName[] = $defaultValue;
-        }
-

         return implode(' ', $displayName);
     }
 
         return implode(' ', $displayName);
     }
 

-    protected static function getUserGroups(string $groupsClaim, OidcIdToken $token): array
+    protected static function getUserGroups(string $groupsClaim, ProvidesClaims $token): ?array

     {
         if (empty($groupsClaim)) {
     {
         if (empty($groupsClaim)) {

-            return [];
+            return null;

         }
 
         $groupsList = Arr::get($token->getAllClaims(), $groupsClaim);
         if (!is_array($groupsList)) {
         }
 
         $groupsList = Arr::get($token->getAllClaims(), $groupsClaim);
         if (!is_array($groupsList)) {

-            return [];
+            return null;

         }
 
         return array_values(array_filter($groupsList, function ($val) {
         }
 
         return array_values(array_filter($groupsList, function ($val) {