Move to SspBridge in MaxAgeRule

Author: cicnavi

src/Factories/RequestRulesManagerFactory.php

@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\Module\oidc\Factories;
 
+use SimpleSAML\Module\oidc\Bridges\SspBridge;
 use SimpleSAML\Module\oidc\Factories\Entities\ClientEntityFactory;
 use SimpleSAML\Module\oidc\Helpers;
 use SimpleSAML\Module\oidc\ModuleConfig;
@@ -60,6 +61,7 @@ public function __construct(
         private readonly Helpers $helpers,
         private readonly JwksResolver $jwksResolver,
         private readonly FederationParticipationValidator $federationParticipationValidator,
+        private readonly SspBridge $sspBridge,
         private readonly ?FederationCache $federationCache = null,
         private readonly ?ProtocolCache $protocolCache = null,
     ) {
@@ -106,6 +108,7 @@ private function getDefaultRules(): array
                 $this->helpers,
                 $this->authSimpleFactory,
                 $this->authenticationService,
+                $this->sspBridge,
             ),
             new ScopeRule($this->requestParamsResolver, $this->helpers, $this->scopeRepository),
             new RequiredOpenIdScopeRule($this->requestParamsResolver, $this->helpers),

src/Server/RequestRules/Rules/MaxAgeRule.php

@@ -5,6 +5,7 @@
 namespace SimpleSAML\Module\oidc\Server\RequestRules\Rules;
 
 use Psr\Http\Message\ServerRequestInterface;
+use SimpleSAML\Module\oidc\Bridges\SspBridge;
 use SimpleSAML\Module\oidc\Factories\AuthSimpleFactory;
 use SimpleSAML\Module\oidc\Helpers;
 use SimpleSAML\Module\oidc\Server\Exceptions\OidcServerException;
@@ -16,7 +17,6 @@
 use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
 use SimpleSAML\OpenID\Codebooks\HttpMethodsEnum;
 use SimpleSAML\OpenID\Codebooks\ParamsEnum;
-use SimpleSAML\Utils\HTTP;
 
 class MaxAgeRule extends AbstractRule
 {
@@ -25,6 +25,7 @@ public function __construct(
         Helpers $helpers,
         private readonly AuthSimpleFactory $authSimpleFactory,
         private readonly AuthenticationService $authenticationService,
+        private readonly SspBridge $sspBridge,
     ) {
         parent::__construct($requestParamsResolver, $helpers);
     }
@@ -88,9 +89,10 @@ public function checkRule(
         if ($isExpired) {
             unset($requestParams['prompt']);
             $loginParams = [];
-            // TODO mivanci Move to SspBridge
-            $loginParams['ReturnTo'] = (new HTTP())
-                ->addURLParameters((new HTTP())->getSelfURLNoQuery(), $requestParams);
+            $loginParams['ReturnTo'] = $this->sspBridge->utils()->http()->addURLParameters(
+                $this->sspBridge->utils()->http()->getSelfURLNoQuery(),
+                $requestParams,
+            );
 
             $this->authenticationService->authenticate($client, $loginParams);
         }

src/Services/Container.php

@@ -375,7 +375,7 @@ public function __construct()
             new RedirectUriRule($requestParamsResolver, $helpers),
             new RequestObjectRule($requestParamsResolver, $helpers, $jwksResolver),
             new PromptRule($requestParamsResolver, $helpers, $authSimpleFactory, $authenticationService),
-            new MaxAgeRule($requestParamsResolver, $helpers, $authSimpleFactory, $authenticationService),
+            new MaxAgeRule($requestParamsResolver, $helpers, $authSimpleFactory, $authenticationService, $sspBridge),
             new ScopeRule($requestParamsResolver, $helpers, $scopeRepository),
             new RequiredOpenIdScopeRule($requestParamsResolver, $helpers),
             new CodeChallengeRule($requestParamsResolver, $helpers),