[TASK] Don't re-fetch user data on user refresh (#15)

TYPO3GmbH · Sep 9, 2024 · 2c5fe4f · 2c5fe4f
1 parent e326265
commit 2c5fe4f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
@@ -9,7 +9,6 @@ services:
   keycloak.typo3.com.user.provider:
     class: '%t3g_keycloak.keycloak.user_provider_class%'
     arguments:
-      $tokenService: '@keycloak.typo3.com.token_service'
       $roleMapping: '%t3g_keycloak.keycloak.role_mapping%'
       $defaultRoles: '%t3g_keycloak.keycloak.default_roles%'
 

diff --git a/src/Security/KeyCloakUser.php b/src/Security/KeyCloakUser.php
@@ -16,9 +16,9 @@ class KeyCloakUser implements UserInterface
 {
     private string $identifier;
     private array $roles;
-    private ?string $fullName = null;
-    private ?string $email = null;
-    private bool $fresh = false;
+    private ?string $fullName;
+    private ?string $email;
+    private bool $fresh;
 
     public function __construct(string $identifier, array $roles, ?string $email = null, ?string $fullName = null, bool $fresh = false)
     {

diff --git a/src/Security/KeyCloakUserProvider.php b/src/Security/KeyCloakUserProvider.php
@@ -13,17 +13,14 @@
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
-use T3G\Bundle\Keycloak\Service\TokenService;
 
 class KeyCloakUserProvider implements UserProviderInterface
 {
-    private TokenService $tokenService;
     private array $roleMapping;
     private array $defaultRoles;
 
-    public function __construct(TokenService $tokenService, array $roleMapping, array $defaultRoles = ['ROLE_USER', 'ROLE_OAUTH_USER'])
+    public function __construct(array $roleMapping, array $defaultRoles = ['ROLE_USER', 'ROLE_OAUTH_USER'])
     {
-        $this->tokenService = $tokenService;
         $this->roleMapping = $roleMapping;
         $this->defaultRoles = $defaultRoles;
     }
@@ -83,16 +80,7 @@ public function refreshUser(UserInterface $user): KeyCloakUser
             throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', \get_class($user)));
         }
 
-        $userData = $this->tokenService->fetchUserData();
-
-        return $this->loadUserByIdentifier(
-            $userData['preferred_username'],
-            $userData['realm_access']['roles'] ?? [],
-            $this->tokenService->getScopes(),
-            $userData['email'] ?? null,
-            $userData['name'] ?? null,
-            true
-        );
+        return new KeyCloakUser($user->getUsername(), $user->getRoles(), $user->getEmail(), $user->getFullName(), false);
     }
 
     /**