Rename ClientIdRule to ClientRule

cicnavi · cicnavi · commit ce40d9592a40 · 2025-09-10T16:10:55.000+02:00
diff --git a/src/Controllers/VerifiableCredentials/CredentialIssuerConfigurationController.php b/src/Controllers/VerifiableCredentials/CredentialIssuerConfigurationController.php
@@ -35,25 +35,27 @@ public function __construct(
 
     public function configuration(): Response
     {
-        // TODO mivanci Abstract configuring Credential Issuer / Configuration away from module config.
         // https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0.html#name-credential-issuer-metadata-p
 
         $signer = $this->moduleConfig->getProtocolSigner();
 
         $credentialConfigurationsSupported = $this->moduleConfig->getCredentialConfigurationsSupported();
 
         // For now, we only support one credential signing algorithm.
+        /** @psalm-suppress MixedAssignment */
         foreach ($credentialConfigurationsSupported as $credentialConfigurationId => $credentialConfiguration) {
-            // Draft 17
-            $credentialConfiguration[ClaimsEnum::CredentialSigningAlgValuesSupported->value] = [
-                $signer->algorithmId(),
-            ];
-            // Earlier drafts
-            // TODO mivanci Delete CryptographicSuitesSupported once we are on the final draft.
-            $credentialConfiguration[ClaimsEnum::CryptographicSuitesSupported->value] = [
-                $signer->algorithmId(),
-            ];
-            $credentialConfigurationsSupported[$credentialConfigurationId] = $credentialConfiguration;
+            if (is_array($credentialConfiguration)) {
+                // Draft 17
+                $credentialConfiguration[ClaimsEnum::CredentialSigningAlgValuesSupported->value] = [
+                    $signer->algorithmId(),
+                ];
+                // Earlier drafts
+                // TODO mivanci Delete CryptographicSuitesSupported once we are on the final draft.
+                $credentialConfiguration[ClaimsEnum::CryptographicSuitesSupported->value] = [
+                    $signer->algorithmId(),
+                ];
+                $credentialConfigurationsSupported[$credentialConfigurationId] = $credentialConfiguration;
+            }
         }
 
         $configuration = [
diff --git a/src/Factories/RequestRulesManagerFactory.php b/src/Factories/RequestRulesManagerFactory.php
@@ -15,7 +15,7 @@
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\AcrValuesRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\AddClaimsToIdTokenRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientAuthenticationRule;
-use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientIdRule;
+use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\CodeChallengeMethodRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\CodeChallengeRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\CodeVerifierRule;
@@ -84,7 +84,7 @@ private function getDefaultRules(): array
     {
         return [
             new StateRule($this->requestParamsResolver, $this->helpers),
-            new ClientIdRule(
+            new ClientRule(
                 $this->requestParamsResolver,
                 $this->helpers,
                 $this->clientRepository,
diff --git a/src/Server/AuthorizationServer.php b/src/Server/AuthorizationServer.php
@@ -18,7 +18,7 @@
 use SimpleSAML\Module\oidc\Server\Exceptions\OidcServerException;
 use SimpleSAML\Module\oidc\Server\Grants\Interfaces\AuthorizationValidatableWithRequestRules;
 use SimpleSAML\Module\oidc\Server\RequestRules\RequestRulesManager;
-use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientIdRule;
+use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\IdTokenHintRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\PostLogoutRedirectUriRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\RedirectUriRule;
@@ -79,7 +79,7 @@ public function validateAuthorizationRequest(ServerRequestInterface $request): O
     {
         $rulesToExecute = [
             StateRule::class,
-            ClientIdRule::class,
+            ClientRule::class,
             RedirectUriRule::class,
         ];
 
diff --git a/src/Server/Grants/AuthCodeGrant.php b/src/Server/Grants/AuthCodeGrant.php
@@ -40,7 +40,7 @@
 use SimpleSAML\Module\oidc\Server\RequestRules\RequestRulesManager;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\AcrValuesRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientAuthenticationRule;
-use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientIdRule;
+use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\CodeChallengeMethodRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\CodeChallengeRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\CodeVerifierRule;
@@ -389,7 +389,7 @@ public function respondToAccessTokenRequest(
         //[$clientId] = $this->getClientCredentials($request);
 
         $rulesToExecute = [
-            ClientIdRule::class,
+            ClientRule::class,
             RedirectUriRule::class,
             ClientAuthenticationRule::class,
             CodeVerifierRule::class,
@@ -403,7 +403,7 @@ public function respondToAccessTokenRequest(
         );
 
         /** @var \SimpleSAML\Module\oidc\Entities\Interfaces\ClientEntityInterface $client */
-        $client = $resultBag->getOrFail(ClientIdRule::class)->getValue();
+        $client = $resultBag->getOrFail(ClientRule::class)->getValue();
         /** @var ?string $clientAuthenticationParam */
         $clientAuthenticationParam = $resultBag->getOrFail(ClientAuthenticationRule::class)->getValue();
         /** @var ?string $codeVerifier */
@@ -668,7 +668,7 @@ public function validateAuthorizationRequestWithRequestRules(
         /** @var string|null $state */
         $state = $resultBag->getOrFail(StateRule::class)->getValue();
         /** @var \SimpleSAML\Module\oidc\Entities\Interfaces\ClientEntityInterface $client */
-        $client = $resultBag->getOrFail(ClientIdRule::class)->getValue();
+        $client = $resultBag->getOrFail(ClientRule::class)->getValue();
 
         // Some rules have to have certain things available in order to work properly...
         $this->requestRulesManager->setData('default_scope', $this->defaultScope);
diff --git a/src/Server/Grants/ImplicitGrant.php b/src/Server/Grants/ImplicitGrant.php
@@ -24,7 +24,7 @@
 use SimpleSAML\Module\oidc\Server\RequestRules\RequestRulesManager;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\AcrValuesRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\AddClaimsToIdTokenRule;
-use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientIdRule;
+use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\MaxAgeRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\PromptRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\RedirectUriRule;
@@ -142,7 +142,7 @@ public function validateAuthorizationRequestWithRequestRules(
         /** @var string|null $state */
         $state = $resultBag->getOrFail(StateRule::class)->getValue();
         /** @var \SimpleSAML\Module\oidc\Entities\Interfaces\ClientEntityInterface $client */
-        $client = $resultBag->getOrFail(ClientIdRule::class)->getValue();
+        $client = $resultBag->getOrFail(ClientRule::class)->getValue();
 
         // Some rules need certain things available in order to work properly...
         $this->requestRulesManager->setData('default_scope', $this->defaultScope);
diff --git a/src/Server/RequestRules/Rules/ClientAuthenticationRule.php b/src/Server/RequestRules/Rules/ClientAuthenticationRule.php
@@ -47,7 +47,7 @@ public function checkRule(
         array $allowedServerRequestMethods = [HttpMethodsEnum::GET],
     ): ?ResultInterface {
         /** @var \SimpleSAML\Module\oidc\Entities\Interfaces\ClientEntityInterface $client */
-        $client = $currentResultBag->getOrFail(ClientIdRule::class)->getValue();
+        $client = $currentResultBag->getOrFail(ClientRule::class)->getValue();
 
         // We will only perform client authentication if the client type is confidential.
         if (!$client->isConfidential()) {
diff --git a/src/Server/RequestRules/Rules/ClientRule.php b/src/Server/RequestRules/Rules/ClientRule.php
@@ -28,7 +28,10 @@
 use SimpleSAML\OpenID\Federation;
 use Throwable;
 
-class ClientIdRule extends AbstractRule
+/**
+ * Resolve a client instance based on a client_id or request object.
+ */
+class ClientRule extends AbstractRule
 {
     protected const KEY_REQUEST_OBJECT_JTI = 'request_object_jti';
 
diff --git a/src/Server/RequestRules/Rules/CodeChallengeRule.php b/src/Server/RequestRules/Rules/CodeChallengeRule.php
@@ -28,7 +28,7 @@ public function checkRule(
         array $allowedServerRequestMethods = [HttpMethodsEnum::GET],
     ): ?ResultInterface {
         /** @var \SimpleSAML\Module\oidc\Entities\Interfaces\ClientEntityInterface $client */
-        $client = $currentResultBag->getOrFail(ClientIdRule::class)->getValue();
+        $client = $currentResultBag->getOrFail(ClientRule::class)->getValue();
         /** @var string $redirectUri */
         $redirectUri = $currentResultBag->getOrFail(RedirectUriRule::class)->getValue();
         /** @var string|null $state */
diff --git a/src/Server/RequestRules/Rules/CodeVerifierRule.php b/src/Server/RequestRules/Rules/CodeVerifierRule.php
@@ -27,7 +27,7 @@ public function checkRule(
         array $allowedServerRequestMethods = [HttpMethodsEnum::GET],
     ): ?ResultInterface {
         /** @var \SimpleSAML\Module\oidc\Entities\Interfaces\ClientEntityInterface $client */
-        $client = $currentResultBag->getOrFail(ClientIdRule::class)->getValue();
+        $client = $currentResultBag->getOrFail(ClientRule::class)->getValue();
 
         $codeVerifier = $this->requestParamsResolver->getFromRequestBasedOnAllowedMethods(
             ParamsEnum::CodeVerifier->value,
diff --git a/src/Server/RequestRules/Rules/MaxAgeRule.php b/src/Server/RequestRules/Rules/MaxAgeRule.php
@@ -52,7 +52,7 @@ public function checkRule(
         );
 
         /** @var \SimpleSAML\Module\oidc\Entities\Interfaces\ClientEntityInterface $client */
-        $client = $currentResultBag->getOrFail(ClientIdRule::class)->getValue();
+        $client = $currentResultBag->getOrFail(ClientRule::class)->getValue();
 
         $authSimple = $this->authSimpleFactory->build($client);
 
diff --git a/src/Server/RequestRules/Rules/PromptRule.php b/src/Server/RequestRules/Rules/PromptRule.php
@@ -48,7 +48,7 @@ public function checkRule(
         array $allowedServerRequestMethods = [HttpMethodsEnum::GET],
     ): ?ResultInterface {
         /** @var \SimpleSAML\Module\oidc\Entities\Interfaces\ClientEntityInterface $client */
-        $client = $currentResultBag->getOrFail(ClientIdRule::class)->getValue();
+        $client = $currentResultBag->getOrFail(ClientRule::class)->getValue();
 
         $authSimple = $this->authSimpleFactory->build($client);
 
diff --git a/src/Server/RequestRules/Rules/RedirectUriRule.php b/src/Server/RequestRules/Rules/RedirectUriRule.php
@@ -29,7 +29,7 @@ public function checkRule(
         bool $useFragmentInHttpErrorResponses = false,
         array $allowedServerRequestMethods = [HttpMethodsEnum::GET],
     ): ?ResultInterface {
-        $client = $currentResultBag->getOrFail(ClientIdRule::class)->getValue();
+        $client = $currentResultBag->getOrFail(ClientRule::class)->getValue();
         if (! $client instanceof ClientEntityInterface) {
             throw new LogicException('Can not check redirect_uri, client is not ClientEntityInterface.');
         }
diff --git a/src/Server/RequestRules/Rules/RequestObjectRule.php b/src/Server/RequestRules/Rules/RequestObjectRule.php
@@ -67,7 +67,7 @@ public function checkRule(
         // It is protected, we must validate it.
 
         /** @var \SimpleSAML\Module\oidc\Entities\Interfaces\ClientEntityInterface $client */
-        $client = $currentResultBag->getOrFail(ClientIdRule::class)->getValue();
+        $client = $currentResultBag->getOrFail(ClientRule::class)->getValue();
         /** @var string $redirectUri */
         $redirectUri = $currentResultBag->getOrFail(RedirectUriRule::class)->getValue();
         /** @var ?string $stateValue */
diff --git a/src/Server/RequestRules/Rules/RequestedClaimsRule.php b/src/Server/RequestRules/Rules/RequestedClaimsRule.php
@@ -56,7 +56,7 @@ public function checkRule(
             return null;
         }
         /** @var \SimpleSAML\Module\oidc\Entities\Interfaces\ClientEntityInterface $client */
-        $client = $currentResultBag->getOrFail(ClientIdRule::class)->getValue();
+        $client = $currentResultBag->getOrFail(ClientRule::class)->getValue();
 
         $authorizedClaims = [];
         foreach ($client->getScopes() as $scope) {
diff --git a/src/Server/RequestRules/Rules/ScopeOfflineAccessRule.php b/src/Server/RequestRules/Rules/ScopeOfflineAccessRule.php
@@ -31,7 +31,7 @@ public function checkRule(
         /** @var string|null $state */
         $state = $currentResultBag->getOrFail(StateRule::class)->getValue();
         /** @var \SimpleSAML\Module\oidc\Entities\Interfaces\ClientEntityInterface $client */
-        $client = $currentResultBag->getOrFail(ClientIdRule::class)->getValue();
+        $client = $currentResultBag->getOrFail(ClientRule::class)->getValue();
         /** @var \League\OAuth2\Server\Entities\ScopeEntityInterface[] $validScopes */
         $validScopes = $currentResultBag->getOrFail(ScopeRule::class)->getValue();
 
diff --git a/src/Services/Container.php b/src/Services/Container.php
@@ -80,7 +80,7 @@
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\AcrValuesRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\AddClaimsToIdTokenRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientAuthenticationRule;
-use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientIdRule;
+use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\CodeChallengeMethodRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\CodeChallengeRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\CodeVerifierRule;
@@ -386,7 +386,7 @@ public function __construct()
 
         $requestRules = [
             new StateRule($requestParamsResolver, $helpers),
-            new ClientIdRule(
+            new ClientRule(
                 $requestParamsResolver,
                 $helpers,
                 $clientRepository,
diff --git a/tests/unit/src/Server/RequestRules/Rules/ClientIdRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/ClientIdRuleTest.php
@@ -15,7 +15,7 @@
 use SimpleSAML\Module\oidc\Server\Exceptions\OidcServerException;
 use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultBagInterface;
 use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultInterface;
-use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientIdRule;
+use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
 use SimpleSAML\Module\oidc\Services\LoggerService;
 use SimpleSAML\Module\oidc\Utils\FederationCache;
 use SimpleSAML\Module\oidc\Utils\FederationParticipationValidator;
@@ -24,7 +24,7 @@
 use SimpleSAML\OpenID\Federation;
 
 /**
- * @covers \SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientIdRule
+ * @covers \SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule
  */
 class ClientIdRuleTest extends TestCase
 {
@@ -62,9 +62,9 @@ protected function setUp(): void
         $this->federationParticipationValidatorStub = $this->createStub(FederationParticipationValidator::class);
     }
 
-    protected function sut(): ClientIdRule
+    protected function sut(): ClientRule
     {
-        return new ClientIdRule(
+        return new ClientRule(
             $this->requestParamsResolverStub,
             $this->helpersStub,
             $this->clientRepositoryStub,
@@ -79,7 +79,7 @@ protected function sut(): ClientIdRule
 
     public function testConstruct(): void
     {
-        $this->assertInstanceOf(ClientIdRule::class, $this->sut());
+        $this->assertInstanceOf(ClientRule::class, $this->sut());
     }
 
     public function testCheckRuleEmptyClientIdThrows(): void
diff --git a/tests/unit/src/Server/RequestRules/Rules/CodeChallengeRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/CodeChallengeRuleTest.php
@@ -15,7 +15,7 @@
 use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultInterface;
 use SimpleSAML\Module\oidc\Server\RequestRules\Result;
 use SimpleSAML\Module\oidc\Server\RequestRules\ResultBag;
-use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientIdRule;
+use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\CodeChallengeRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\RedirectUriRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\StateRule;
@@ -52,7 +52,7 @@ protected function setUp(): void
         $this->loggerServiceStub = $this->createStub(LoggerService::class);
         $this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
         $this->clientStub = $this->createStub(ClientEntityInterface::class);
-        $this->clientIdResult = new Result(ClientIdRule::class, $this->clientStub);
+        $this->clientIdResult = new Result(ClientRule::class, $this->clientStub);
         $this->helpers = new Helpers();
     }
 
diff --git a/tests/unit/src/Server/RequestRules/Rules/RedirectUriRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/RedirectUriRuleTest.php
@@ -14,7 +14,7 @@
 use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultInterface;
 use SimpleSAML\Module\oidc\Server\RequestRules\Result;
 use SimpleSAML\Module\oidc\Server\RequestRules\ResultBag;
-use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientIdRule;
+use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\RedirectUriRule;
 use SimpleSAML\Module\oidc\Services\LoggerService;
 use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -76,7 +76,7 @@ public function testCheckRuleClientIdDependency(): void
      */
     public function testCheckRuleWithInvalidClientDependancy(): void
     {
-        $this->resultBag->add(new Result(ClientIdRule::class, 'invalid'));
+        $this->resultBag->add(new Result(ClientRule::class, 'invalid'));
         $this->expectException(LogicException::class);
         $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub);
     }
@@ -112,7 +112,7 @@ public function testCheckRuleDifferentClientRedirectUriArrayThrows(): void
         $this->requestParamsResolverStub->method('getAsStringBasedOnAllowedMethods')->willReturn('invalid');
 
         $this->clientStub->method('getRedirectUri')->willReturn([$this->redirectUri]);
-        $this->resultBag->add(new Result(ClientIdRule::class, $this->clientStub));
+        $this->resultBag->add(new Result(ClientRule::class, $this->clientStub));
 
         $this->expectException(OidcServerException::class);
         $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub);
@@ -137,7 +137,7 @@ public function testCheckRuleWithValidRedirectUri(): void
     protected function prepareValidResultBag(): ResultBag
     {
         $this->clientStub->method('getRedirectUri')->willReturn($this->redirectUri);
-        $this->resultBag->add(new Result(ClientIdRule::class, $this->clientStub));
+        $this->resultBag->add(new Result(ClientRule::class, $this->clientStub));
         return $this->resultBag;
     }
 }
diff --git a/tests/unit/src/Server/RequestRules/Rules/RequestObjectRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/RequestObjectRuleTest.php
@@ -14,7 +14,7 @@
 use SimpleSAML\Module\oidc\Server\Exceptions\OidcServerException;
 use SimpleSAML\Module\oidc\Server\RequestRules\Result;
 use SimpleSAML\Module\oidc\Server\RequestRules\ResultBag;
-use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientIdRule;
+use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\RedirectUriRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\RequestObjectRule;
 use SimpleSAML\Module\oidc\Services\LoggerService;
@@ -39,7 +39,7 @@ protected function setUp(): void
         $this->clientStub = $this->createStub(ClientEntityInterface::class);
         $this->resultBagStub = $this->createStub(ResultBag::class);
         $this->resultBagStub->method('getOrFail')->willReturnMap([
-            [ClientIdRule::class, new Result(ClientIdRule::class, $this->clientStub)],
+            [ClientRule::class, new Result(ClientRule::class, $this->clientStub)],
             [RedirectUriRule::class, new Result(RedirectUriRule::class, 'https://example.com/redirect')],
         ]);
         $this->requestParamsResolverMock = $this->createMock(RequestParamsResolver::class);
diff --git a/tests/unit/src/Server/RequestRules/Rules/RequestedClaimsRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/RequestedClaimsRuleTest.php
@@ -13,7 +13,7 @@
 use SimpleSAML\Module\oidc\Helpers;
 use SimpleSAML\Module\oidc\Server\RequestRules\Result;
 use SimpleSAML\Module\oidc\Server\RequestRules\ResultBag;
-use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientIdRule;
+use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
 use SimpleSAML\Module\oidc\Server\RequestRules\Rules\RequestedClaimsRule;
 use SimpleSAML\Module\oidc\Services\LoggerService;
 use SimpleSAML\Module\oidc\Utils\ClaimTranslatorExtractor;
@@ -44,7 +44,7 @@ protected function setUp(): void
         $this->clientStub = $this->createStub(ClientEntityInterface::class);
         $this->requestStub = $this->createStub(ServerRequestInterface::class);
         $this->clientStub->method('getScopes')->willReturn(['openid', 'profile', 'email']);
-        $this->resultBag->add(new Result(ClientIdRule::class, $this->clientStub));
+        $this->resultBag->add(new Result(ClientRule::class, $this->clientStub));
         $this->loggerServiceStub = $this->createStub(LoggerService::class);
         $this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
         $this->claimSetEntityFactoryStub = $this->createStub(ClaimSetEntityFactory::class);
