OIDC Userinfo: Started writing tests to cover userinfo calling

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

diff --git a/app/Access/Oidc/OidcUserDetails.php b/app/Access/Oidc/OidcUserDetails.php
index 172bc9ceb44600f5f3b3f39619d729e200a9fe93..bccc49ee4d86d0be73a795ca8eaea6394a916907 100644 (file)
--- a/app/Access/Oidc/OidcUserDetails.php
+++ b/app/Access/Oidc/OidcUserDetails.php
@@ -28,7 +28,7 @@ class OidcUserDetails
     }
 
     /**
-     * Populate user details from OidcIdToken data.
+     * Populate user details from the given claim data.
      */
     public function populate(
         ProvidesClaims $claims,
@@ -38,11 +38,11 @@ class OidcUserDetails
     ): void {
         $this->externalId = $claims->getClaim($idClaim) ?? $this->externalId;
         $this->email = $claims->getClaim('email') ?? $this->email;
-        $this->name = static::getUserDisplayName($displayNameClaims, $claims, $this->externalId) ?? $this->name;
+        $this->name = static::getUserDisplayName($displayNameClaims, $claims) ?? $this->name;
         $this->groups = static::getUserGroups($groupsClaim, $claims) ?? $this->groups;
     }
 
-    protected static function getUserDisplayName(string $displayNameClaims, ProvidesClaims $token, string $defaultValue): string
+    protected static function getUserDisplayName(string $displayNameClaims, ProvidesClaims $token): string
     {
         $displayNameClaimParts = explode('|', $displayNameClaims);
 
@@ -54,10 +54,6 @@ class OidcUserDetails
             }
         }
 
-        if (count($displayName) === 0) {
-            $displayName[] = $defaultValue;
-        }
-
         return implode(' ', $displayName);
     }