SSP-2030_OIDC_module_switch_to_ProcessingChain_for_authproc_support_consent_mod

src/Services/AuthenticationService.php

@@ -41,10 +41,20 @@
 {
     use GetClientFromRequestTrait;
 
+    /**
+     * @var \SimpleSAML\Auth\State|string
+     * @psalm-var \SimpleSAML\Auth\State|class-string
+     */
+    protected string|State $authState = \SimpleSAML\Auth\State::class;
+
     /**
      * ID of auth source used during authn.
      */
     private ?string $authSourceId = null;
+
+    /**
+     * @var string
+     */
     private string $userIdAttr;
 
     /**
@@ -86,7 +96,7 @@
         $this->authSourceId = $authSimple->getAuthSource()->getAuthId();
 
         if (! $authSimple->isAuthenticated()) {
             $this->authenticate($request);
         } elseif ($this->sessionService->getIsAuthnPerformedInPreviousRequest()) {
             $this->sessionService->setIsAuthnPerformedInPreviousRequest(false);
 
@@ -145,7 +155,7 @@
         }
 
         if (empty($state['Oidc']['RelyingPartyMetadata']['id'])) {
-            throw new Error\Exception('OIDC RelyingPartyMetadata ID does not exist in state');
+            throw new Error\Exception('OIDC RelyingPartyMetadata ID does not exist in state.');
         }
 
         $client = $this->clientRepository->findById((string)$state['Oidc']['RelyingPartyMetadata']['id']);
@@ -167,8 +177,11 @@
 
     public function getAuthorizationRequestFromState(array $state): AuthorizationRequest
     {
-        if (!($state['authorizationRequest'] instanceof AuthorizationRequest)) {
-            throw new Exception('Authorization Request is not valid');
+        if (
+            !isset($state['authorizationRequest'])
+            || !($state['authorizationRequest'] instanceof AuthorizationRequest)
+        ) {
+            throw new Exception('Authorization Request is not valid.');
         }
         return $state['authorizationRequest'];
     }
@@ -221,16 +234,35 @@
         return $state;
     }
 
+    /**
+     * Inject the \SimpleSAML\Auth\State dependency.
+     *
+     * @param State $authState
+     */
+    public function setAuthState(State $authState): void
+    {
+        $this->authState = $authState;
+    }
+
+    /**
+     * @return bool
+     */
     public function isCookieBasedAuthn(): bool
     {
         return (bool) $this->sessionService->getIsCookieBasedAuthn();
     }
 
+    /**
+     * @return string|null
+     */
     public function getAuthSourceId(): ?string
     {
         return $this->authSourceId;
     }
 
+    /**
+     * @return string|null
+     */
     public function getSessionId(): ?string
     {
         return $this->sessionService->getCurrentSession()->getSessionId();
@@ -295,7 +327,8 @@
         }
 
         $stateId = (string)$queryParameters[ProcessingChain::AUTHPARAM];
-        $state = State::loadState($stateId, ProcessingChain::COMPLETED_STAGE);
+        \assert($this->authState instanceof State);
+        $state = $this->authState::loadState($stateId, ProcessingChain::COMPLETED_STAGE);
 
         $this->authSourceId = (string)$state['authSourceId'];
         unset($state['authSourceId']);