|
{{ 'Owner'|trans }}
diff --git a/templates/formpost.twig b/templates/formpost.twig
new file mode 100644
index 00000000..95e9604f
--- /dev/null
+++ b/templates/formpost.twig
@@ -0,0 +1,18 @@
+
+
+
+
+ Submitting...
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests/unit/src/Controllers/Admin/ClientControllerTest.php b/tests/unit/src/Controllers/Admin/ClientControllerTest.php
index 02134ac8..2e77e018 100644
--- a/tests/unit/src/Controllers/Admin/ClientControllerTest.php
+++ b/tests/unit/src/Controllers/Admin/ClientControllerTest.php
@@ -82,6 +82,7 @@ class ClientControllerTest extends TestCase
],
'jwks_uri' => 'https://example.com/jwks',
'signed_jwks_uri' => 'https://example.com/signed-jwks',
+ 'response_modes_allowed' => ['query', 'fragment', 'form_post'],
];
protected function setUp(): void
diff --git a/tests/unit/src/Forms/ClientFormTest.php b/tests/unit/src/Forms/ClientFormTest.php
index 425c3d2e..7638da68 100644
--- a/tests/unit/src/Forms/ClientFormTest.php
+++ b/tests/unit/src/Forms/ClientFormTest.php
@@ -81,6 +81,7 @@ public function setUp(): void
),
'expires_at' => null,
'allowed_origin' => [],
+ 'response_modes_allowed' => ['query', 'fragment', 'form_post',],
];
}
diff --git a/tests/unit/src/Server/Grants/ImplicitGrantTest.php b/tests/unit/src/Server/Grants/ImplicitGrantTest.php
index d28dabda..5f487746 100644
--- a/tests/unit/src/Server/Grants/ImplicitGrantTest.php
+++ b/tests/unit/src/Server/Grants/ImplicitGrantTest.php
@@ -31,7 +31,6 @@ class ImplicitGrantTest extends TestCase
protected MockObject $accessTokenRepositoryMock;
protected MockObject $requestRulesManagerMock;
protected MockObject $requestParamsResolverMock;
- protected string $queryDelimiter;
protected MockObject $accessTokenEntityFactoryMock;
protected MockObject $scopeRepositoryMock;
protected MockObject $serverRequestMock;
@@ -48,7 +47,6 @@ protected function setUp(): void
$this->accessTokenRepositoryMock = $this->createMock(AccessTokenRepository::class);
$this->requestRulesManagerMock = $this->createMock(RequestRulesManager::class);
$this->requestParamsResolverMock = $this->createMock(RequestParamsResolver::class);
- $this->queryDelimiter = '#';
$this->accessTokenEntityFactoryMock = $this->createMock(AccessTokenEntityFactory::class);
$this->scopeRepositoryMock = $this->createMock(ScopeRepositoryInterface::class);
@@ -66,7 +64,6 @@ protected function sut(
?AccessTokenRepositoryInterface $accessTokenRepository = null,
?RequestRulesManager $requestRulesManager = null,
?RequestParamsResolver $requestParamsResolver = null,
- ?string $queryDelimiter = null,
?AccessTokenEntityFactory $accessTokenEntityFactory = null,
?ScopeRepositoryInterface $scopeRepository = null,
): ImplicitGrant {
@@ -75,7 +72,6 @@ protected function sut(
$accessTokenRepository ??= $this->accessTokenRepositoryMock;
$requestRulesManager ??= $this->requestRulesManagerMock;
$requestParamsResolver ??= $this->requestParamsResolverMock;
- $queryDelimiter ??= $this->queryDelimiter;
$accessTokenEntityFactory ??= $this->accessTokenEntityFactoryMock;
$scopeRepository ??= $this->scopeRepositoryMock;
@@ -86,7 +82,6 @@ protected function sut(
$accessTokenRepository,
$requestRulesManager,
$requestParamsResolver,
- $queryDelimiter,
$accessTokenEntityFactory,
);
diff --git a/tests/unit/src/Server/RequestRules/RequestRulesManagerTest.php b/tests/unit/src/Server/RequestRules/RequestRulesManagerTest.php
index c70118db..2efabc97 100644
--- a/tests/unit/src/Server/RequestRules/RequestRulesManagerTest.php
+++ b/tests/unit/src/Server/RequestRules/RequestRulesManagerTest.php
@@ -12,6 +12,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultBagInterface;
use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultInterface;
use SimpleSAML\Module\oidc\Server\RequestRules\RequestRulesManager;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
/**
@@ -122,6 +123,7 @@ public function testSetData(RequestRulesManager $requestRulesManager): void
$this->isInstanceOf(ResultBagInterface::class),
$this->isInstanceOf(LoggerService::class),
$this->arrayHasKey($this->key),
+ $this->isInstanceOf(ResponseModeInterface::class),
);
$requestRulesManager->add($ruleMock);
diff --git a/tests/unit/src/Server/RequestRules/Rules/AcrValuesRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/AcrValuesRuleTest.php
index 302eaa30..8a147402 100644
--- a/tests/unit/src/Server/RequestRules/Rules/AcrValuesRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/AcrValuesRuleTest.php
@@ -12,6 +12,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultInterface;
use SimpleSAML\Module\oidc\Server\RequestRules\Result;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\AcrValuesRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -25,6 +26,7 @@ class AcrValuesRuleTest extends TestCase
protected Stub $resultStub;
protected Stub $loggerServiceStub;
protected Stub $requestParamsResolverStub;
+ protected Stub $responseModeStub;
protected Helpers $helpers;
/**
@@ -37,6 +39,7 @@ protected function setUp(): void
$this->resultStub = $this->createStub(ResultInterface::class);
$this->loggerServiceStub = $this->createStub(LoggerService::class);
$this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
$this->helpers = new Helpers();
}
@@ -62,6 +65,8 @@ public function testNoAcrIsSetIfAcrValuesNotRequested(): void
$this->requestStub,
$this->resultBagStub,
$this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
) ?? new Result(AcrValuesRule::class, null);
$this->assertNull($result->getValue());
}
@@ -79,6 +84,8 @@ public function testPopulatesAcrValuesFromClaimsParameter(): void
$this->requestStub,
$this->resultBagStub,
$this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
) ?? new Result(AcrValuesRule::class, null);
$this->assertSame(['1', '0'], $result->getValue()['values']);
@@ -96,6 +103,8 @@ public function testPopulatesAcrValuesFromAcrValuesRequestParameter(): void
$this->requestStub,
$this->resultBagStub,
$this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
) ?? new Result(AcrValuesRule::class, null);
$this->assertSame(['1', '0'], $result->getValue()['values']);
diff --git a/tests/unit/src/Server/RequestRules/Rules/AddClaimsToIdTokenRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/AddClaimsToIdTokenRuleTest.php
index fb54da45..121dc7e2 100644
--- a/tests/unit/src/Server/RequestRules/Rules/AddClaimsToIdTokenRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/AddClaimsToIdTokenRuleTest.php
@@ -13,6 +13,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\ResultBag;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\AddClaimsToIdTokenRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ResponseTypeRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -48,6 +49,7 @@ class AddClaimsToIdTokenRuleTest extends TestCase
private ResultBag $resultBag;
private Stub $loggerServiceStub;
+ private Stub $responseModeStub;
/**
* @throws \Exception
@@ -60,6 +62,7 @@ protected function setUp(): void
$this->loggerServiceStub = $this->createStub(LoggerService::class);
$this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
$this->helpers = new Helpers();
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -83,7 +86,13 @@ public function testAddClaimsToIdTokenRuleTest($responseType)
{
$this->resultBag->add(new Result(ResponseTypeRule::class, $responseType));
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub) ??
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
new Result(AddClaimsToIdTokenRule::class, null);
$this->assertTrue($result->getValue());
}
@@ -103,7 +112,13 @@ public function testDoNotAddClaimsToIdTokenRuleTest($responseType)
{
$this->resultBag->add(new Result(ResponseTypeRule::class, $responseType));
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub) ??
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
new Result(AddClaimsToIdTokenRule::class, null);
$this->assertFalse($result->getValue());
@@ -128,6 +143,12 @@ public static function invalidResponseTypeProvider(): array
public function testAddClaimsToIdTokenRuleThrowsWithNoResponseTypeParamTest()
{
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
}
}
diff --git a/tests/unit/src/Server/RequestRules/Rules/ClientRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/ClientRuleTest.php
index abf0eb9e..191c982a 100644
--- a/tests/unit/src/Server/RequestRules/Rules/ClientRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/ClientRuleTest.php
@@ -16,6 +16,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultBagInterface;
use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultInterface;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\FederationCache;
use SimpleSAML\Module\oidc\Utils\FederationParticipationValidator;
@@ -41,6 +42,7 @@ class ClientRuleTest extends TestCase
protected Stub $helpersStub;
protected Stub $jwksResolverStub;
protected Stub $federationParticipationValidatorStub;
+ protected Stub $responseModeStub;
/**
* @throws \Exception
@@ -60,6 +62,7 @@ protected function setUp(): void
$this->helpersStub = $this->createStub(Helpers::class);
$this->jwksResolverStub = $this->createStub(JwksResolver::class);
$this->federationParticipationValidatorStub = $this->createStub(FederationParticipationValidator::class);
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(): ClientRule
@@ -91,6 +94,8 @@ public function testCheckRuleEmptyClientIdThrows(): void
$this->requestStub,
$this->resultBagStub,
$this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
);
}
@@ -103,6 +108,8 @@ public function testCheckRuleInvalidClientThrows(): void
$this->requestStub,
$this->resultBagStub,
$this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
);
}
@@ -119,6 +126,8 @@ public function testCheckRuleForValidClientId(): void
$this->requestStub,
$this->resultBagStub,
$this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
);
$this->assertInstanceOf(ResultInterface::class, $result);
$this->assertInstanceOf(ClientEntityInterface::class, $result->getValue());
diff --git a/tests/unit/src/Server/RequestRules/Rules/CodeChallengeMethodRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/CodeChallengeMethodRuleTest.php
index f01343ca..e3c66093 100644
--- a/tests/unit/src/Server/RequestRules/Rules/CodeChallengeMethodRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/CodeChallengeMethodRuleTest.php
@@ -19,6 +19,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRedirectUriRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\CodeChallengeMethodRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\StateRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -36,6 +37,7 @@ class CodeChallengeMethodRuleTest extends TestCase
protected Stub $requestParamsResolverStub;
protected MockObject $codeChallengeVerifiersRepositoryMock;
protected Helpers $helpers;
+ protected Stub $responseModeStub;
/**
* @throws \Exception
*/
@@ -49,6 +51,7 @@ protected function setUp(): void
$this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
$this->codeChallengeVerifiersRepositoryMock = $this->createMock(CodeChallengeVerifiersRepository::class);
$this->helpers = new Helpers();
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -75,7 +78,7 @@ public function testCheckRuleRedirectUriDependency(): void
{
$resultBag = new ResultBag();
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
/**
@@ -87,7 +90,7 @@ public function testCheckRuleStateDependency(): void
$resultBag = new ResultBag();
$resultBag->add($this->redirectUriResult);
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
/**
@@ -100,7 +103,7 @@ public function testCheckRuleWithInvalidCodeChallengeMethodThrows(): void
$this->codeChallengeVerifiersRepositoryMock->expects($this->once())->method('has')
->with('invalid')->willReturn(false);
$this->expectException(OidcServerException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
/**
@@ -113,7 +116,13 @@ public function testCheckRuleForValidCodeChallengeMethod(): void
$this->requestParamsResolverStub->method('getAsStringBasedOnAllowedMethods')->willReturn('plain');
$this->codeChallengeVerifiersRepositoryMock->expects($this->once())->method('has')
->with('plain')->willReturn(true);
- $result = $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
$this->assertInstanceOf(ResultInterface::class, $result);
$this->assertSame('plain', $result->getValue());
diff --git a/tests/unit/src/Server/RequestRules/Rules/CodeChallengeRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/CodeChallengeRuleTest.php
index 1755ea6f..6e84765d 100644
--- a/tests/unit/src/Server/RequestRules/Rules/CodeChallengeRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/CodeChallengeRuleTest.php
@@ -19,6 +19,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\CodeChallengeRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\StateRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -39,6 +40,7 @@ class CodeChallengeRuleTest extends TestCase
protected Stub $clientStub;
protected Result $clientIdResult;
protected Helpers $helpers;
+ protected Stub $responseModeStub;
/**
* @throws \Exception
@@ -54,6 +56,7 @@ protected function setUp(): void
$this->clientStub = $this->createStub(ClientEntityInterface::class);
$this->clientIdResult = new Result(ClientRule::class, $this->clientStub);
$this->helpers = new Helpers();
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -77,7 +80,7 @@ public function testCheckRuleRedirectUriDependency(): void
{
$resultBag = new ResultBag();
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
/**
@@ -89,7 +92,7 @@ public function testCheckRuleStateDependency(): void
$resultBag = new ResultBag();
$resultBag->add($this->redirectUriResult);
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
/**
@@ -100,7 +103,13 @@ public function testCheckRuleNoCodeReturnsNullForConfidentialClients(): void
$this->clientStub->method('isConfidential')->willReturn(true);
$resultBag = $this->prepareValidResultBag();
$this->requestParamsResolverStub->method('getAsStringBasedOnAllowedMethods')->willReturn(null);
- $result = $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
$this->assertInstanceOf(ResultInterface::class, $result);
$this->assertNull($result->getValue());
}
@@ -113,7 +122,7 @@ public function testCheckRuleInvalidCodeChallengeThrows(): void
$resultBag = $this->prepareValidResultBag();
$this->requestParamsResolverStub->method('getAsStringBasedOnAllowedMethods')->willReturn('too-short');
$this->expectException(OidcServerException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
/**
@@ -125,7 +134,13 @@ public function testCheckRuleForValidCodeChallenge(): void
$resultBag = $this->prepareValidResultBag();
$this->requestParamsResolverStub->method('getAsStringBasedOnAllowedMethods')->willReturn($this->codeChallenge);
- $result = $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
$this->assertInstanceOf(ResultInterface::class, $result);
$this->assertSame($this->codeChallenge, $result->getValue());
diff --git a/tests/unit/src/Server/RequestRules/Rules/IdTokenHintRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/IdTokenHintRuleTest.php
index d8137a8e..65de0270 100644
--- a/tests/unit/src/Server/RequestRules/Rules/IdTokenHintRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/IdTokenHintRuleTest.php
@@ -14,6 +14,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultBagInterface;
use SimpleSAML\Module\oidc\Server\RequestRules\Result;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\IdTokenHintRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
use SimpleSAML\OpenID\Core;
@@ -46,6 +47,7 @@ class IdTokenHintRuleTest extends TestCase
protected MockObject $coreMock;
protected MockObject $idTokenFactoryMock;
protected MockObject $idTokenMock;
+ protected Stub $responseModeStub;
/**
* @throws \ReflectionException
@@ -70,6 +72,7 @@ protected function setUp(): void
$this->idTokenFactoryMock = $this->createMock(IdTokenFactory::class);
$this->idTokenMock = $this->createMock(IdToken::class);
$this->coreMock->method('idTokenFactory')->willReturn($this->idTokenFactoryMock);
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -110,6 +113,8 @@ public function testCheckRuleIsNullWhenParamNotSet(): void
$this->requestStub,
$this->resultBagStub,
$this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
) ?? new Result(IdTokenHintRule::class);
$this->assertNull($result->getValue());
@@ -122,7 +127,13 @@ public function testCheckRuleThrowsForMalformedIdToken(): void
{
$this->requestParamsResolverStub->method('getAsStringBasedOnAllowedMethods')->willReturn('malformed');
$this->expectException(Throwable::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
}
/**
@@ -139,7 +150,13 @@ public function testCheckRuleThrowsForIdTokenWithInvalidSignature(): void
->with('invalid-it-token')
->willReturn($this->idTokenMock);
$this->expectException(Throwable::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
}
/**
@@ -157,7 +174,13 @@ public function testCheckRuleThrowsForIdTokenWithInvalidIssuer(): void
$this->requestParamsResolverStub->method('getAsStringBasedOnAllowedMethods')
->willReturn('id-token');
$this->expectException(Throwable::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
}
/**
@@ -172,7 +195,13 @@ public function testCheckRulePassesForValidIdToken(): void
$this->idTokenMock->method('getIssuer')->willReturn(self::$issuer);
$this->idTokenFactoryMock->method('fromToken')
->willReturn($this->idTokenMock);
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub) ??
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
new Result(IdTokenHintRule::class);
$this->assertInstanceOf(IdToken::class, $result->getValue());
diff --git a/tests/unit/src/Server/RequestRules/Rules/PostLogoutRedirectUriRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/PostLogoutRedirectUriRuleTest.php
index 7bf7d279..8b5c225a 100644
--- a/tests/unit/src/Server/RequestRules/Rules/PostLogoutRedirectUriRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/PostLogoutRedirectUriRuleTest.php
@@ -21,6 +21,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\IdTokenHintRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\PostLogoutRedirectUriRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\StateRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
use SimpleSAML\OpenID\Core\IdToken;
@@ -50,6 +51,7 @@ class PostLogoutRedirectUriRuleTest extends TestCase
protected Stub $requestParamsResolverStub;
protected Helpers $helpers;
protected MockObject $idTokenMock;
+ protected Stub $responseModeStub;
public static function setUpBeforeClass(): void
{
@@ -83,6 +85,7 @@ protected function setUp(): void
$this->helpers = new Helpers();
$this->idTokenMock = $this->createMock(IdToken::class);
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -107,7 +110,13 @@ protected function sut(
*/
public function testCheckRuleReturnsNullIfNoParamSet(): void
{
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub) ??
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
(new Result(PostLogoutRedirectUriRule::class));
$this->assertNull($result->getValue());
@@ -123,7 +132,13 @@ public function testCheckRuleThrowsWhenIdTokenHintNotAvailable(): void
$this->expectException(Throwable::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub) ??
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
(new Result(PostLogoutRedirectUriRule::class));
}
@@ -148,7 +163,13 @@ public function testCheckRuleThrowsWhenAudClaimNotValid(): void
$this->expectException(Throwable::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub) ??
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
(new Result(PostLogoutRedirectUriRule::class));
}
@@ -176,7 +197,13 @@ public function testCheckRuleThrowsWhenClientNotFound(): void
$this->expectException(Throwable::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub) ??
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
(new Result(PostLogoutRedirectUriRule::class));
}
@@ -204,7 +231,13 @@ public function testCheckRuleThrowsWhenPostLogoutRegisteredUriNotRegistered(): v
$this->expectException(Throwable::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub) ??
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
(new Result(PostLogoutRedirectUriRule::class));
}
@@ -231,7 +264,13 @@ public function testCheckRuleReturnsForRegisteredPostLogoutRedirectUri(): void
new Result(IdTokenHintRule::class, $this->idTokenMock),
);
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub) ??
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
(new Result(PostLogoutRedirectUriRule::class));
$this->assertEquals(self::$postLogoutRedirectUri, $result->getValue());
diff --git a/tests/unit/src/Server/RequestRules/Rules/RedirectUriRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/RedirectUriRuleTest.php
index 33a31f4e..68dbd391 100644
--- a/tests/unit/src/Server/RequestRules/Rules/RedirectUriRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/RedirectUriRuleTest.php
@@ -17,6 +17,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\ResultBag;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRedirectUriRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -34,6 +35,7 @@ class RedirectUriRuleTest extends TestCase
protected Stub $requestParamsResolverStub;
protected Helpers $helpers;
protected Stub $moduleConfigStub;
+ protected Stub $responseModeStub;
/**
@@ -48,6 +50,7 @@ protected function setUp(): void
$this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
$this->helpers = new Helpers();
$this->moduleConfigStub = $this->createStub(ModuleConfig::class);
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -73,7 +76,13 @@ protected function sut(
public function testCheckRuleClientIdDependency(): void
{
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
}
/**
@@ -84,7 +93,13 @@ public function testCheckRuleWithInvalidClientDependancy(): void
{
$this->resultBag->add(new Result(ClientRule::class, 'invalid'));
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
}
/**
@@ -95,7 +110,7 @@ public function testCheckRuleRedirectUriNotSetThrows(): void
$resultBag = $this->prepareValidResultBag();
$this->expectException(OidcServerException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
/**
@@ -107,7 +122,7 @@ public function testCheckRuleDifferentClientRedirectUriThrows(): void
$resultBag = $this->prepareValidResultBag();
$this->expectException(OidcServerException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
/**
@@ -121,7 +136,13 @@ public function testCheckRuleDifferentClientRedirectUriArrayThrows(): void
$this->resultBag->add(new Result(ClientRule::class, $this->clientStub));
$this->expectException(OidcServerException::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
}
/**
@@ -134,7 +155,13 @@ public function testCheckRuleWithValidRedirectUri(): void
$resultBag = $this->prepareValidResultBag();
- $result = $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
$this->assertInstanceOf(ResultInterface::class, $result);
$this->assertSame($this->redirectUri, $result->getValue());
diff --git a/tests/unit/src/Server/RequestRules/Rules/RequestObjectRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/RequestObjectRuleTest.php
index 45861adb..56f0679a 100644
--- a/tests/unit/src/Server/RequestRules/Rules/RequestObjectRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/RequestObjectRuleTest.php
@@ -17,6 +17,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRedirectUriRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\RequestObjectRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\JwksResolver;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -33,6 +34,7 @@ class RequestObjectRuleTest extends TestCase
protected Stub $loggerServiceStub;
protected MockObject $jwksResolverMock;
protected Helpers $helpers;
+ protected Stub $responseModeStub;
protected function setUp(): void
{
@@ -49,6 +51,7 @@ protected function setUp(): void
$this->loggerServiceStub = $this->createStub(LoggerService::class);
$this->jwksResolverMock = $this->createMock(JwksResolver::class);
$this->helpers = new Helpers();
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -74,7 +77,13 @@ public function testCanCreateInstance(): void
public function testRequestParamCanBeAbsent(): void
{
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub);
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
$this->assertNull($result);
}
@@ -85,7 +94,13 @@ public function testUnprotectedRequestParamCanBeUsed(): void
$this->requestParamsResolverMock->expects($this->once())->method('parseRequestObjectToken')
->with('token')->willReturn($this->requestObjectMock);
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub);
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
$this->assertInstanceOf(Result::class, $result);
$this->assertIsArray($result->getValue());
$this->assertNotEmpty($result->getValue());
@@ -100,7 +115,13 @@ public function testMissingClientJwksThrows(): void
$this->clientStub->expects($this->once())->method('getJwks')->willReturn(null);
$this->expectException(OidcServerException::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
}
public function testThrowsForInvalidRequestObject(): void
@@ -116,7 +137,13 @@ public function testThrowsForInvalidRequestObject(): void
->willReturn(['jwks']);
$this->expectException(OidcServerException::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
}
public function testReturnsValidRequestObject(): void
@@ -132,7 +159,13 @@ public function testReturnsValidRequestObject(): void
->with($this->clientStub)
->willReturn(['jwks']);
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub);
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
$this->assertInstanceOf(Result::class, $result);
$this->assertIsArray($result->getValue());
diff --git a/tests/unit/src/Server/RequestRules/Rules/RequestedClaimsRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/RequestedClaimsRuleTest.php
index a17f677d..33caca10 100644
--- a/tests/unit/src/Server/RequestRules/Rules/RequestedClaimsRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/RequestedClaimsRuleTest.php
@@ -15,6 +15,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\ResultBag;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\RequestedClaimsRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\ClaimTranslatorExtractor;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -33,6 +34,7 @@ class RequestedClaimsRuleTest extends TestCase
protected Stub $requestParamsResolverStub;
protected Stub $claimSetEntityFactoryStub;
protected Helpers $helpers;
+ protected Stub $responseModeStub;
/**
@@ -57,6 +59,7 @@ protected function setUp(): void
});
$this->helpers = new Helpers();
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -80,7 +83,13 @@ protected function sut(
*/
public function testNoRequestedClaims(): void
{
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub);
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
$this->assertNull($result);
}
@@ -113,7 +122,13 @@ public function testWithClaims(): void
$this->requestParamsResolverStub->method('getBasedOnAllowedMethods')->willReturn(json_encode($requestedClaims));
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub);
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
$this->assertNotNull($result);
$this->assertEquals($expectedClaims, $result->getValue());
}
@@ -132,7 +147,13 @@ public function testOnlyWithNonStandardClaimRequest(): void
$requestedClaims = $expectedClaims;
$this->requestParamsResolverStub->method('getBasedOnAllowedMethods')->willReturn(json_encode($requestedClaims));
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub);
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
$this->assertNotNull($result);
$this->assertEquals($expectedClaims, $result->getValue());
}
diff --git a/tests/unit/src/Server/RequestRules/Rules/RequiredNonceRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/RequiredNonceRuleTest.php
index 6bfbd34e..cb15a571 100644
--- a/tests/unit/src/Server/RequestRules/Rules/RequiredNonceRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/RequiredNonceRuleTest.php
@@ -15,6 +15,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRedirectUriRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\RequiredNonceRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\StateRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -37,6 +38,7 @@ class RequiredNonceRuleTest extends TestCase
protected Stub $loggerServiceStub;
protected Stub $requestParamsResolverStub;
+ protected Stub $responseModeStub;
/**
* @throws \Exception
@@ -54,6 +56,7 @@ protected function setUp(): void
$this->loggerServiceStub = $this->createStub(LoggerService::class);
$this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
$this->helpers = new Helpers();
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -77,7 +80,7 @@ public function testCheckRuleRedirectUriDependency(): void
{
$resultBag = new ResultBag();
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
/**
@@ -89,7 +92,7 @@ public function testCheckRuleStateDependency(): void
$resultBag = new ResultBag();
$resultBag->add($this->redirectUriResult);
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
/**
@@ -101,7 +104,13 @@ public function testCheckRulePassesWhenNonceIsPresent()
$this->requestParamsResolverStub->method('getAsStringBasedOnAllowedMethods')
->willReturn($this->requestQueryParams['nonce']);
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub) ??
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
new Result(RequiredNonceRule::class, null);
$this->assertEquals($this->requestQueryParams['nonce'], $result->getValue());
@@ -114,6 +123,12 @@ public function testCheckRuleThrowsWhenNonceIsNotPresent()
{
$this->expectException(OidcServerException::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
}
}
diff --git a/tests/unit/src/Server/RequestRules/Rules/RequiredOpenIdScopeRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/RequiredOpenIdScopeRuleTest.php
index 05668b79..84de98eb 100644
--- a/tests/unit/src/Server/RequestRules/Rules/RequiredOpenIdScopeRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/RequiredOpenIdScopeRuleTest.php
@@ -17,6 +17,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\RequiredOpenIdScopeRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ScopeRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\StateRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -36,6 +37,7 @@ class RequiredOpenIdScopeRuleTest extends TestCase
protected Stub $loggerServiceStub;
protected Stub $requestParamsResolverStub;
protected Helpers $helpers;
+ protected Stub $responseModeStub;
/**
* @throws \Exception
@@ -53,6 +55,7 @@ protected function setUp(): void
$this->loggerServiceStub = $this->createStub(LoggerService::class);
$this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
$this->helpers = new Helpers();
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -76,7 +79,7 @@ public function testCheckRuleRedirectUriDependency(): void
{
$resultBag = new ResultBag();
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
/**
@@ -88,7 +91,7 @@ public function testCheckRuleStateDependency(): void
$resultBag = new ResultBag();
$resultBag->add($this->redirectUriResult);
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
/**
@@ -102,7 +105,13 @@ public function testCheckRulePassesWhenOpenIdScopeIsPresent()
$resultBag->add($this->stateResult);
$resultBag->add($this->scopeResult);
- $result = $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub) ??
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
new Result(RequiredOpenIdScopeRule::class, null);
$this->assertTrue($result->getValue());
@@ -123,6 +132,6 @@ public function testCheckRuleThrowsWhenOpenIdScopeIsNotPresent()
$this->expectException(OidcServerException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, [], $this->responseModeStub);
}
}
diff --git a/tests/unit/src/Server/RequestRules/Rules/ResponseModeRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/ResponseModeRuleTest.php
new file mode 100644
index 00000000..4fcef301
--- /dev/null
+++ b/tests/unit/src/Server/RequestRules/Rules/ResponseModeRuleTest.php
@@ -0,0 +1,332 @@
+ 'client123',
+ 'response_type' => 'code',
+ 'response_mode' => 'query',
+ ];
+
+ protected function setUp(): void
+ {
+ $this->requestStub = $this->createStub(ServerRequestInterface::class);
+ $this->loggerServiceStub = $this->createStub(LoggerService::class);
+ $this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
+ $this->helpers = new Helpers();
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
+
+ $this->clientStub = $this->createStub(ClientEntityInterface::class);
+ $this->clientStub->method('getAllowedResponseModes')->willReturn(['query', 'fragment', 'form_post']);
+
+ $this->queryResponseModeStub = $this->createStub(QueryResponseMode::class);
+ $this->fragmentResponseModeStub = $this->createStub(FragmentResponseMode::class);
+ $this->formPostResponseModeStub = $this->createStub(FormPostResponseMode::class);
+
+ $this->resultBag = new ResultBag();
+ $this->resultBag->add(new Result(ClientRule::class, $this->clientStub));
+ $this->resultBag->add(new Result(ClientRedirectUriRule::class, 'https://example.org/callback'));
+ $this->resultBag->add(new Result(StateRule::class, 'state123'));
+ }
+
+ protected function sut(
+ ?RequestParamsResolver $requestParamsResolver = null,
+ ?Helpers $helpers = null,
+ ?QueryResponseMode $queryResponseMode = null,
+ ?FragmentResponseMode $fragmentResponseMode = null,
+ ?FormPostResponseMode $formPostResponseMode = null,
+ ): ResponseModeRule {
+ return new ResponseModeRule(
+ $requestParamsResolver ?? $this->requestParamsResolverStub,
+ $helpers ?? $this->helpers,
+ $queryResponseMode ?? $this->queryResponseModeStub,
+ $fragmentResponseMode ?? $this->fragmentResponseModeStub,
+ $formPostResponseMode ?? $this->formPostResponseModeStub,
+ );
+ }
+
+ public function testThrowsWhenClientIdMissing(): void
+ {
+ $params = $this->requestParams;
+ unset($params['client_id']);
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($params);
+
+ $this->expectException(OidcServerException::class);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+ }
+
+ public function testReturnsQueryResponseModeWhenExplicitlyRequested(): void
+ {
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($this->requestParams);
+
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+
+ $this->assertNotNull($result);
+ $this->assertSame($this->queryResponseModeStub, $result->getValue());
+ }
+
+ public function testReturnsFragmentResponseModeWhenExplicitlyRequested(): void
+ {
+ $params = $this->requestParams;
+ $params['response_mode'] = 'fragment';
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($params);
+
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+
+ $this->assertNotNull($result);
+ $this->assertSame($this->fragmentResponseModeStub, $result->getValue());
+ }
+
+ public function testReturnsFormPostResponseModeWhenExplicitlyRequested(): void
+ {
+ $params = $this->requestParams;
+ $params['response_mode'] = 'form_post';
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($params);
+
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+
+ $this->assertNotNull($result);
+ $this->assertSame($this->formPostResponseModeStub, $result->getValue());
+ }
+
+ public function testDefaultsToQueryWhenResponseModeNotSetAndResponseTypeIsCode(): void
+ {
+ $params = $this->requestParams;
+ unset($params['response_mode']);
+ $params['response_type'] = 'code';
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($params);
+
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+
+ $this->assertNotNull($result);
+ $this->assertSame($this->queryResponseModeStub, $result->getValue());
+ }
+
+ /**
+ * @dataProvider tokenResponseTypeProvider
+ */
+ public function testDefaultsToFragmentWhenResponseModeNotSetAndResponseTypeContainsToken(
+ string $responseType,
+ ): void {
+ $params = $this->requestParams;
+ unset($params['response_mode']);
+ $params['response_type'] = $responseType;
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($params);
+
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+
+ $this->assertNotNull($result);
+ $this->assertSame($this->fragmentResponseModeStub, $result->getValue());
+ }
+
+ public static function tokenResponseTypeProvider(): array
+ {
+ return [
+ 'token' => ['token'],
+ 'id_token token' => ['id_token token'],
+ 'code token' => ['code token'],
+ 'code id_token token' => ['code id_token token'],
+ ];
+ }
+
+ public function testDefaultsToQueryWhenResponseModeAndResponseTypeNotSet(): void
+ {
+ $params = ['client_id' => 'client123'];
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($params);
+
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+
+ $this->assertNotNull($result);
+ $this->assertSame($this->queryResponseModeStub, $result->getValue());
+ }
+
+ public function testThrowsOnInvalidResponseMode(): void
+ {
+ $params = $this->requestParams;
+ $params['response_mode'] = 'invalid';
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($params);
+
+ $this->expectException(OidcServerException::class);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+ }
+
+ public function testThrowsWhenResponseModeNotAllowedByClient(): void
+ {
+ $this->clientStub = $this->createStub(ClientEntityInterface::class);
+ $this->clientStub->method('getAllowedResponseModes')->willReturn(['query']);
+
+ $this->resultBag = new ResultBag();
+ $this->resultBag->add(new Result(ClientRule::class, $this->clientStub));
+ $this->resultBag->add(new Result(ClientRedirectUriRule::class, 'https://example.org/callback'));
+ $this->resultBag->add(new Result(StateRule::class, 'state123'));
+
+ $params = $this->requestParams;
+ $params['response_mode'] = 'fragment';
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($params);
+
+ $this->expectException(OidcServerException::class);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+ }
+
+ public function testThrowsWhenClientRuleResultMissing(): void
+ {
+ $resultBag = new ResultBag();
+
+ $params = $this->requestParams;
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($params);
+
+ $this->expectException(LogicException::class);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+ }
+
+ public function testThrowsWhenRedirectUriResultMissing(): void
+ {
+ $resultBag = new ResultBag();
+ $resultBag->add(new Result(ClientRule::class, $this->clientStub));
+
+ $params = $this->requestParams;
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($params);
+
+ $this->expectException(LogicException::class);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+ }
+
+ public function testThrowsWhenStateResultMissing(): void
+ {
+ $resultBag = new ResultBag();
+ $resultBag->add(new Result(ClientRule::class, $this->clientStub));
+ $resultBag->add(new Result(ClientRedirectUriRule::class, 'https://example.org/callback'));
+
+ $params = $this->requestParams;
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($params);
+
+ $this->expectException(LogicException::class);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+ }
+
+ public function testResultKeyMatchesRuleClass(): void
+ {
+ $this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($this->requestParams);
+
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
+
+ $this->assertNotNull($result);
+ $this->assertSame(ResponseModeRule::class, $result->getKey());
+ }
+}
diff --git a/tests/unit/src/Server/RequestRules/Rules/ResponseTypeRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/ResponseTypeRuleTest.php
index ecd2d1e6..5b1c5c91 100644
--- a/tests/unit/src/Server/RequestRules/Rules/ResponseTypeRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/ResponseTypeRuleTest.php
@@ -12,6 +12,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Result;
use SimpleSAML\Module\oidc\Server\RequestRules\ResultBag;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ResponseTypeRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -49,6 +50,7 @@ class ResponseTypeRuleTest extends TestCase
private ResultBag $resultBag;
protected Stub $loggerServiceStub;
+ protected Stub $responseModeStub;
/**
* @throws \Exception
@@ -61,6 +63,7 @@ protected function setUp(): void
$this->loggerServiceStub = $this->createStub(LoggerService::class);
$this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
$this->helpers = new Helpers();
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -84,7 +87,13 @@ public function testResponseTypeRuleTest($responseType)
{
$this->requestParams['response_type'] = $responseType;
$this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($this->requestParams);
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub) ??
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
new Result(ResponseTypeRule::class, null);
$this->assertSame($responseType, $result->getValue());
}
@@ -103,6 +112,12 @@ public function testResponseTypeRuleThrowsWithNoResponseTypeParamTest()
unset($params['response_type']);
$this->requestParamsResolverStub->method('getAllBasedOnAllowedMethods')->willReturn($params);
$this->expectException(OidcServerException::class);
- $this->sut()->checkRule($this->requestStub, $this->resultBag, $this->loggerServiceStub);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBag,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ );
}
}
diff --git a/tests/unit/src/Server/RequestRules/Rules/ScopeOfflineAccessRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/ScopeOfflineAccessRuleTest.php
index e9bddd38..a640af98 100644
--- a/tests/unit/src/Server/RequestRules/Rules/ScopeOfflineAccessRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/ScopeOfflineAccessRuleTest.php
@@ -17,6 +17,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultBagInterface;
use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultInterface;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ScopeOfflineAccessRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -39,6 +40,7 @@ class ScopeOfflineAccessRuleTest extends TestCase
protected Stub $openIdConfigurationStub;
protected Stub $requestParamsResolverStub;
protected Helpers $helpers;
+ protected Stub $responseModeStub;
/**
* @throws \Exception
@@ -69,6 +71,7 @@ protected function setUp(): void
$this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
$this->helpers = new Helpers();
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -115,7 +118,13 @@ public function testReturnsFalseWhenOfflineAccessScopeNotPresent(): void
$this->moduleConfigStub->method('config')
->willReturn($this->openIdConfigurationStub);
- $result = $this->sut()->checkRule($this->serverRequestStub, $this->resultBagMock, $this->loggerServiceMock);
+ $result = $this->sut()->checkRule(
+ $this->serverRequestStub,
+ $this->resultBagMock,
+ $this->loggerServiceMock,
+ [],
+ $this->responseModeStub,
+ );
$this->assertNotNull($result);
$this->assertFalse($result->getValue());
@@ -146,7 +155,13 @@ public function testThrowsWhenClientDoesntHaveOfflineAccessScopeRegistered(): vo
$this->expectException(OidcServerException::class);
- $this->sut()->checkRule($this->serverRequestStub, $this->resultBagMock, $this->loggerServiceMock);
+ $this->sut()->checkRule(
+ $this->serverRequestStub,
+ $this->resultBagMock,
+ $this->loggerServiceMock,
+ [],
+ $this->responseModeStub,
+ );
}
/**
@@ -173,7 +188,13 @@ public function testReturnsTrueWhenClientDoesHaveOfflineAccessScopeRegistered():
$this->moduleConfigStub->method('config')
->willReturn($this->openIdConfigurationStub);
- $result = $this->sut()->checkRule($this->serverRequestStub, $this->resultBagMock, $this->loggerServiceMock);
+ $result = $this->sut()->checkRule(
+ $this->serverRequestStub,
+ $this->resultBagMock,
+ $this->loggerServiceMock,
+ [],
+ $this->responseModeStub,
+ );
$this->assertNotNull($result);
$this->assertTrue($result->getValue());
diff --git a/tests/unit/src/Server/RequestRules/Rules/ScopeRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/ScopeRuleTest.php
index 1916686e..fa144662 100644
--- a/tests/unit/src/Server/RequestRules/Rules/ScopeRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/ScopeRuleTest.php
@@ -20,6 +20,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ClientRedirectUriRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\ScopeRule;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\StateRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -47,6 +48,7 @@ class ScopeRuleTest extends TestCase
protected Stub $requestParamsResolverStub;
protected Stub $helpersStub;
protected Stub $strHelperMock;
+ protected Stub $responseModeStub;
/**
* @throws \Exception
@@ -67,6 +69,7 @@ protected function setUp(): void
$this->helpersStub = $this->createStub(Helpers::class);
$this->strHelperMock = $this->createMock(Helpers\Str::class);
$this->helpersStub->method('str')->willReturn($this->strHelperMock);
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -98,7 +101,13 @@ public function testCheckRuleRedirectUriDependency(): void
{
$resultBag = new ResultBag();
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, $this->data);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $resultBag,
+ $this->loggerServiceStub,
+ $this->data,
+ $this->responseModeStub,
+ );
}
/**
@@ -110,7 +119,13 @@ public function testCheckRuleStateDependency(): void
$resultBag = new ResultBag();
$resultBag->add($this->redirectUriResult);
$this->expectException(LogicException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, $this->data);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $resultBag,
+ $this->loggerServiceStub,
+ $this->data,
+ $this->responseModeStub,
+ );
}
/**
@@ -134,7 +149,13 @@ public function testValidScopes(): void
),
);
- $result = $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, $this->data);
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $resultBag,
+ $this->loggerServiceStub,
+ $this->data,
+ $this->responseModeStub,
+ );
$this->assertInstanceOf(ResultInterface::class, $result);
$this->assertIsArray($result->getValue());
$this->assertSame($this->scopeEntities['openid'], $result->getValue()[0]);
@@ -161,7 +182,13 @@ public function testInvalidScopeThrows(): void
);
$this->expectException(OidcServerException::class);
- $this->sut()->checkRule($this->requestStub, $resultBag, $this->loggerServiceStub, $this->data);
+ $this->sut()->checkRule(
+ $this->requestStub,
+ $resultBag,
+ $this->loggerServiceStub,
+ $this->data,
+ $this->responseModeStub,
+ );
}
protected function prepareValidResultBag(): ResultBag
diff --git a/tests/unit/src/Server/RequestRules/Rules/StateRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/StateRuleTest.php
index aa38de1b..336ca8bb 100644
--- a/tests/unit/src/Server/RequestRules/Rules/StateRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/StateRuleTest.php
@@ -11,6 +11,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultInterface;
use SimpleSAML\Module\oidc\Server\RequestRules\ResultBag;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\StateRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -23,6 +24,7 @@ class StateRuleTest extends TestCase
protected Stub $loggerServiceStub;
protected Stub $requestParamsResolverStub;
protected Helpers $helpers;
+ protected Stub $responseModeStub;
/**
* @throws \Exception
@@ -32,6 +34,7 @@ public function setUp(): void
$this->loggerServiceStub = $this->createStub(LoggerService::class);
$this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
$this->helpers = new Helpers();
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -65,7 +68,13 @@ public function testCheckRuleHasValue(): void
$resultBag = new ResultBag();
$data = [];
- $result = $this->sut()->checkRule($request, $resultBag, $this->loggerServiceStub, $data);
+ $result = $this->sut()->checkRule(
+ $request,
+ $resultBag,
+ $this->loggerServiceStub,
+ $data,
+ $this->responseModeStub,
+ );
$this->assertInstanceOf(ResultInterface::class, $result);
$this->assertSame($value, $result->getValue());
@@ -85,6 +94,8 @@ public function testCheckRulePostMethod(): void
$request,
$resultBag,
$this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
);
$this->assertInstanceOf(ResultInterface::class, $result);
diff --git a/tests/unit/src/Server/RequestRules/Rules/UiLocalesRuleTest.php b/tests/unit/src/Server/RequestRules/Rules/UiLocalesRuleTest.php
index a4eefd8c..749525c3 100644
--- a/tests/unit/src/Server/RequestRules/Rules/UiLocalesRuleTest.php
+++ b/tests/unit/src/Server/RequestRules/Rules/UiLocalesRuleTest.php
@@ -11,6 +11,7 @@
use SimpleSAML\Module\oidc\Server\RequestRules\Interfaces\ResultBagInterface;
use SimpleSAML\Module\oidc\Server\RequestRules\Result;
use SimpleSAML\Module\oidc\Server\RequestRules\Rules\UiLocalesRule;
+use SimpleSAML\Module\oidc\Server\ResponseModes\ResponseModeInterface;
use SimpleSAML\Module\oidc\Services\LoggerService;
use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
@@ -24,6 +25,7 @@ class UiLocalesRuleTest extends TestCase
protected Stub $loggerServiceStub;
protected Stub $requestParamsResolverStub;
protected Helpers $helpers;
+ protected Stub $responseModeStub;
/**
* @throws \Exception
@@ -37,6 +39,7 @@ protected function setUp(): void
$this->loggerServiceStub = $this->createStub(LoggerService::class);
$this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
$this->helpers = new Helpers();
+ $this->responseModeStub = $this->createStub(ResponseModeInterface::class);
}
protected function sut(
@@ -59,7 +62,13 @@ public function testCheckRuleReturnsResultWhenParamSet()
{
$this->requestParamsResolverStub->method('getBasedOnAllowedMethods')->willReturn('en');
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub) ??
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
new Result(UiLocalesRule::class);
$this->assertEquals('en', $result->getValue());
@@ -72,7 +81,13 @@ public function testCheckRuleReturnsNullWhenParamNotSet()
{
$this->requestStub->method('getQueryParams')->willReturn([]);
- $result = $this->sut()->checkRule($this->requestStub, $this->resultBagStub, $this->loggerServiceStub) ??
+ $result = $this->sut()->checkRule(
+ $this->requestStub,
+ $this->resultBagStub,
+ $this->loggerServiceStub,
+ [],
+ $this->responseModeStub,
+ ) ??
new Result(UiLocalesRule::class);
$this->assertNull($result->getValue());
diff --git a/tests/unit/src/Server/ResponseModes/FormPostResponseModeTest.php b/tests/unit/src/Server/ResponseModes/FormPostResponseModeTest.php
new file mode 100644
index 00000000..605a9e34
--- /dev/null
+++ b/tests/unit/src/Server/ResponseModes/FormPostResponseModeTest.php
@@ -0,0 +1,45 @@
+ 'simplesaml/',
+ 'module.enable' => ['oidc' => true],
+ ], '', 'simplesaml');
+
+ $this->sut = new FormPostResponseMode($config);
+ }
+
+ public function testBuildResponseReturnsHtmlWithFormPost(): void
+ {
+ $result = $this->sut->buildResponse(
+ 'https://example.org/callback',
+ ['code' => 'abc123', 'state' => 'xyz'],
+ );
+
+ $this->assertInstanceOf(HtmlResponse::class, $result);
+
+ $body = (string) $result->generateHttpResponse(new Response())->getBody();
+ $this->assertStringContainsString('https://example.org/callback', $body);
+ $this->assertStringContainsString('abc123', $body);
+ $this->assertStringContainsString('xyz', $body);
+ $this->assertMatchesRegularExpression('/method=["\']post["\']/i', $body);
+ }
+}
diff --git a/tests/unit/src/Services/OpMetadataServiceTest.php b/tests/unit/src/Services/OpMetadataServiceTest.php
index f354b630..9247da12 100644
--- a/tests/unit/src/Services/OpMetadataServiceTest.php
+++ b/tests/unit/src/Services/OpMetadataServiceTest.php
@@ -142,6 +142,7 @@ public function testItReturnsExpectedMetadata(): void
'acr_values_supported' => ['1'],
'backchannel_logout_supported' => true,
'backchannel_logout_session_supported' => true,
+ 'response_modes_supported' => ['query', 'fragment', 'form_post'],
],
$this->sut()->getMetadata(),
);
|