Use already resolved client for authentication

Author: cicnavi

src/Server/RequestRules/Rules/MaxAgeRule.php

@@ -92,7 +92,7 @@ public function checkRule(
             $loginParams['ReturnTo'] = (new HTTP())
                 ->addURLParameters((new HTTP())->getSelfURLNoQuery(), $requestParams);
 
-            $this->authenticationService->authenticate($request, $loginParams);
+            $this->authenticationService->authenticate($client, $loginParams);
         }
 
         return new Result($this->getKey(), $lastAuth);

src/Server/RequestRules/Rules/PromptRule.php

@@ -86,7 +86,7 @@ public function checkRule(
             $loginParams['ReturnTo'] = (new HTTP())
                 ->addURLParameters((new HTTP())->getSelfURLNoQuery(), $requestParams);
 
-            $this->authenticationService->authenticate($request, $loginParams);
+            $this->authenticationService->authenticate($client, $loginParams);
         }
 
         return null;

src/Services/AuthenticationService.php

@@ -96,7 +96,7 @@ public function processRequest(
         $this->authSourceId = $authSimple->getAuthSource()->getAuthId();
 
         if (! $authSimple->isAuthenticated()) {
-            $this->authenticate($request);
+            $this->authenticate($oidcClient);
         } elseif ($this->sessionService->getIsAuthnPerformedInPreviousRequest()) {
             $this->sessionService->setIsAuthnPerformedInPreviousRequest(false);
 
@@ -268,23 +268,17 @@ public function getSessionId(): ?string
     }
 
     /**
-     * @param   ServerRequestInterface  $request
-     * @param   array                   $loginParams
-     *
-     * @return void
      * @throws Error\BadRequest
      * @throws Error\NotFound
      * @throws \JsonException
      * @throws \SimpleSAML\Module\oidc\Server\Exceptions\OidcServerException
      */
 
     public function authenticate(
-        ServerRequestInterface $request,
+        ClientEntityInterface $clientEntity,
         array $loginParams = [],
     ): void {
-        // TODO mivanci Fix: client has already been resolved up to this point, but we are again fetching it from DB.
-        $oidcClient = $this->helpers->client()->getFromRequest($request, $this->clientRepository);
-        $authSimple = $this->authSimpleFactory->build($oidcClient);
+        $authSimple = $this->authSimpleFactory->build($clientEntity);
 
         $this->sessionService->setIsCookieBasedAuthn(false);
         $this->sessionService->setIsAuthnPerformedInPreviousRequest(true);

tests/unit/src/Services/AuthenticationServiceTest.php

@@ -331,11 +331,8 @@ public function testGetAuthenticateUserItThrowsIfClaimsNotExist(): void
     public function testItAuthenticates(): void
     {
         $this->authSimpleMock->expects($this->once())->method('login')->with([]);
-        $this->clientHelperMock->expects($this->once())
-            ->method('getFromRequest')
-            ->willReturn($this->clientEntityMock);
 
-        $this->mock()->authenticate($this->serverRequestMock);
+        $this->mock()->authenticate($this->clientEntityMock);
     }
 
     /**