Move to SspBridge in PromptRule

Author: cicnavi

rector.php

@@ -16,7 +16,7 @@
     ]);
 
     $rectorConfig->paths([
-        // TODO mivanci also go trough commented out paths...
+        // TODO v7 mivanci also go trough commented out paths...
         //__DIR__ . '/docker',
         //__DIR__ . '/hooks',
         //__DIR__ . '/public',

src/Factories/RequestRulesManagerFactory.php

@@ -102,6 +102,7 @@ private function getDefaultRules(): array
                 $this->helpers,
                 $this->authSimpleFactory,
                 $this->authenticationService,
+                $this->sspBridge,
             ),
             new MaxAgeRule(
                 $this->requestParamsResolver,

src/ModuleConfig.php

@@ -234,7 +234,7 @@ public function config(): Configuration
         return $this->moduleConfig;
     }
 
-    // TODO mivanci Move to dedicated \SimpleSAML\Module\oidc\Utils\Routes::getModuleUrl
+    // TODO mivanci v7 Move to dedicated \SimpleSAML\Module\oidc\Utils\Routes::getModuleUrl
     public function getModuleUrl(?string $path = null): string
     {
         $base = $this->sspBridge->module()->getModuleURL(self::MODULE_NAME);

src/Server/RequestRules/Rules/PromptRule.php

@@ -6,6 +6,7 @@
 
 use League\OAuth2\Server\Exception\OAuthServerException;
 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 PromptRule 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);
     }
@@ -82,9 +83,10 @@ public function checkRule(
         if (in_array('login', $prompt, true) && $authSimple->isAuthenticated()) {
             unset($requestParams[ParamsEnum::Prompt->value]);
             $loginParams = [];
-            // TODO mivanci move to SSP Bridge
-            $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/Server/RequestRules/Rules/ResponseTypeRule.php

@@ -38,7 +38,7 @@ public function checkRule(
             throw  OidcServerException::invalidRequest('Missing response_type or client_id');
         }
 
-        // TODO consider checking for supported response types, for example, from configuration...
+        // TODO v7 consider checking for supported response types, for example, from configuration...
 
         return new Result($this->getKey(), $requestParams[ParamsEnum::ResponseType->value]);
     }

src/Services/AuthenticationService.php

@@ -89,7 +89,7 @@ public function processRequest(
         ServerRequestInterface $request,
         OAuth2AuthorizationRequest $authorizationRequest,
     ): array {
-        // TODO mivanci Fix: client has already been resolved up to this point, but we are again fetching it from DB.
+        // TODO mivanci v7 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);
 

src/Services/Container.php

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

templates/config/protocol.twig

@@ -93,7 +93,7 @@
     <p>
         {% for scope, claims in moduleConfig.getScopes %}
             {{ scope }}{{ loop.last ? '' : ', ' }}
-            {# TODO mivanci Add claims or extract scopes to sepparate page. #}
+            {# TODO v7 mivanci Add claims or extract scopes to sepparate page. #}
         {% endfor %}
     </p>
 

tests/unit/src/Controllers/Federation/EntityStatementControllerTest.php

@@ -99,7 +99,7 @@ public function testCanGetConfigurationStatement(): void
         $this->moduleConfigMock->expects($this->once())->method('getFederationEnabled')->willReturn(true);
         $this->federationCacheMock->expects($this->once())->method('get')->willReturn(null);
 
-        // TODO mivanci
+        // TODO v7 mivanci
         $this->markTestIncomplete('Move to simplesamlphp/openid library for building entity statements.');
     }
 }