refactor: update User creation internals

StudioAH · May 8, 2023 · 467d44a · 467d44a
1 parent 13e30e6
commit 467d44a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 36 deletions.
diff --git a/src/Controller/Logout.php b/src/Controller/Logout.php
@@ -29,7 +29,7 @@ public function __invoke(
     ): ResponseInterface|RedirectResponse {
         try {
             $response = $cas->logout($request);
-        } catch (Throwable) {
+        } catch (Throwable $e) {
             // TODO: Should we log the error ?
             // If yes, we need to inject the LoggerInterface and require it
             // in composer.json. Do we want an extra dependency?

diff --git a/src/Security/CasAuthenticator.php b/src/Security/CasAuthenticator.php
@@ -54,7 +54,7 @@ public function authenticate(Request $request): Passport
             );
         }
 
-        $user = $this->userProvider->loadUserByResponse($response);
+        $user = $this->userProvider->loadUserByResponse($this->httpFoundationFactory->createResponse($response));
 
         return new SelfValidatingPassport(
             new UserBadge(

diff --git a/src/Security/Core/User/CasUser.php b/src/Security/Core/User/CasUser.php
@@ -16,11 +16,9 @@
 
 final class CasUser implements CasUserInterface, Stringable
 {
-    /**
-     * @param mixed[] $payload
-     */
-    public function __construct(private readonly array $payload)
-    {
+    public function __construct(
+        private readonly array $payload
+    ) {
     }
 
     public function __toString(): string
@@ -37,19 +35,14 @@ public function get(string $key, mixed $default = null): mixed
         return $this->payload[$key] ?? $default;
     }
 
-    public function getAttribute(string $key, mixed $default = null): mixed
-    {
-        return $this->payload['attributes'][$key] ?? $default;
-    }
-
-    public function getAttributes(): array
+    public function getPassword(): ?string
     {
-        return $this->get('attributes', []);
+        return null;
     }
 
-    public function getPassword(): ?string
+    public function getPayload(): array
     {
-        return null;
+        return $this->payload;
     }
 
     public function getPgt(): ?string

diff --git a/src/Security/Core/User/CasUserInterface.php b/src/Security/Core/User/CasUserInterface.php
@@ -18,19 +18,9 @@ interface CasUserInterface extends EquatableInterface, UserInterface
 {
     public function __toString(): string;
 
-    /**
-     * @param mixed $default
-     *
-     * @return mixed|null
-     */
-    public function get(string $key, mixed $default = null);
-
-    public function getAttribute(string $key, mixed $default = null): mixed;
-
-    /**
-     * @return array<array|string>
-     */
-    public function getAttributes(): array;
+    public function get(string $key, mixed $default = null): mixed;
+
+    public function getPayload(): array;
 
     public function getPgt(): ?string;
 }
diff --git a/src/Security/Core/User/CasUserProvider.php b/src/Security/Core/User/CasUserProvider.php
@@ -14,29 +14,32 @@
 use EcPhp\CasLib\Contract\Response\CasResponseBuilderInterface;
 use EcPhp\CasLib\Contract\Response\Type\ServiceValidate;
 use Exception;
-use Psr\Http\Message\ResponseInterface;
+use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\Exception\UserNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Throwable;
 
 final class CasUserProvider implements CasUserProviderInterface
 {
-    public function __construct(private readonly CasResponseBuilderInterface $casResponseBuilder)
-    {
+    public function __construct(
+        private readonly CasResponseBuilderInterface $casResponseBuilder,
+        private readonly HttpMessageFactoryInterface $httpMessageFactory
+    ) {
     }
 
     public function loadUserByIdentifier($identifier): UserInterface
     {
         throw new UnsupportedUserException('Unsupported operation.');
     }
 
-    public function loadUserByResponse(ResponseInterface $response): CasUserInterface
+    public function loadUserByResponse(Response $response): CasUserInterface
     {
         try {
             $casResponse = $this
                 ->casResponseBuilder
-                ->fromResponse($response);
+                ->fromResponse($this->httpMessageFactory->createResponse($response));
         } catch (Throwable $e) {
             throw new UserNotFoundException(
                 sprintf('Unable to get user from response, %s', $e->getMessage()),

diff --git a/src/Security/Core/User/CasUserProviderInterface.php b/src/Security/Core/User/CasUserProviderInterface.php
@@ -11,10 +11,10 @@
 
 namespace EcPhp\CasBundle\Security\Core\User;
 
-use Psr\Http\Message\ResponseInterface;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 interface CasUserProviderInterface extends UserProviderInterface
 {
-    public function loadUserByResponse(ResponseInterface $response): CasUserInterface;
+    public function loadUserByResponse(Response $response): CasUserInterface;
 }