TypeScript: Updated compile target, addressed issues

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

diff --git a/app/Access/Oidc/OidcUserDetails.php b/app/Access/Oidc/OidcUserDetails.php
index bccc49ee4d86d0be73a795ca8eaea6394a916907..7a422a58de2fcea067454f189d063886641ae688 100644 (file)
--- a/app/Access/Oidc/OidcUserDetails.php
+++ b/app/Access/Oidc/OidcUserDetails.php
@@ -11,6 +11,7 @@ class OidcUserDetails
         public ?string $email = null,
         public ?string $name = null,
         public ?array $groups = null,
         public ?string $email = null,
         public ?string $name = null,
         public ?array $groups = null,

+        public ?string $picture = null,

     ) {
     }
 
     ) {
     }
 


@@ -22,7 +23,7 @@ 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;
     }


@@ -40,15 +41,16 @@ class OidcUserDetails
         $this->email = $claims->getClaim('email') ?? $this->email;
         $this->name = static::getUserDisplayName($displayNameClaims, $claims) ?? $this->name;
         $this->groups = static::getUserGroups($groupsClaim, $claims) ?? $this->groups;
         $this->email = $claims->getClaim('email') ?? $this->email;
         $this->name = static::getUserDisplayName($displayNameClaims, $claims) ?? $this->name;
         $this->groups = static::getUserGroups($groupsClaim, $claims) ?? $this->groups;

+        $this->picture = static::getPicture($claims) ?: $this->picture;

     }
 
     }
 

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

     {
         $displayNameClaimParts = explode('|', $displayNameClaims);
 
         $displayName = [];
         foreach ($displayNameClaimParts as $claim) {
     {
         $displayNameClaimParts = explode('|', $displayNameClaims);
 
         $displayName = [];
         foreach ($displayNameClaimParts as $claim) {

-            $component = $token->getClaim(trim($claim)) ?? '';
+            $component = $claims->getClaim(trim($claim)) ?? '';

             if ($component !== '') {
                 $displayName[] = $component;
             }
             if ($component !== '') {
                 $displayName[] = $component;
             }


@@ -57,19 +59,29 @@ class OidcUserDetails
         return implode(' ', $displayName);
     }
 
         return implode(' ', $displayName);
     }
 

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

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

-            return [];
+            return null;

         }
 
         }
 

-        $groupsList = Arr::get($token->getAllClaims(), $groupsClaim);
+        $groupsList = Arr::get($claims->getAllClaims(), $groupsClaim);

         if (!is_array($groupsList)) {
         if (!is_array($groupsList)) {

-            return [];
+            return null;

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

+
+    protected static function getPicture(ProvidesClaims $claims): ?string
+    {
+        $picture = $claims->getClaim('picture');
+        if (is_string($picture) && str_starts_with($picture, 'http')) {
+            return $picture;
+        }
+
+        return null;
+    }

 }
 }