Skip to content

Commit 467ea97

Browse files
committed
Merge with wip-version-7
1 parent 8442cc8 commit 467ea97

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

routing/routes/routes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
use SimpleSAML\Module\oidc\Controllers\EndSessionController;
1919
use SimpleSAML\Module\oidc\Controllers\Federation\EntityStatementController;
2020
use SimpleSAML\Module\oidc\Controllers\JwksController;
21-
use SimpleSAML\Module\oidc\Controllers\TokenIntrospectionController;
2221
use SimpleSAML\Module\oidc\Controllers\OAuth2\OAuth2ServerConfigurationController;
22+
use SimpleSAML\Module\oidc\Controllers\TokenIntrospectionController;
2323
use SimpleSAML\Module\oidc\Controllers\UserInfoController;
2424
use SimpleSAML\Module\oidc\Controllers\VerifiableCredentials\CredentialIssuerConfigurationController;
2525
use SimpleSAML\Module\oidc\Controllers\VerifiableCredentials\CredentialIssuerCredentialController;

src/Controllers/TokenIntrospectionController.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,22 @@ private function introspectToken(string $token): JsonResponse
131131
$receivedTokenIssuer = $payload['iss'];
132132
$expectedTokenIssuer = $this->moduleConfig->getIssuer();
133133
if ($receivedTokenIssuer !== $expectedTokenIssuer) {
134-
return new JsonResponse(['active' => false,
135-
'cause' => 'token issuer mismatch, expected: ' . $expectedTokenIssuer . ' actual: ' . $receivedTokenIssuer], 200);
134+
return new JsonResponse(
135+
[
136+
'active' => false,
137+
'cause' => 'token issuer mismatch, expected: ' . $expectedTokenIssuer . ' actual: ' .
138+
$receivedTokenIssuer,
139+
],
140+
200,
141+
);
136142
}
137143

138144
$introspectionResponse = [
139145
'active' => true,
140-
'scope' => implode(' ', array_map(static fn($scope) => $scope->getIdentifier(), $accessToken->getScopes())),
146+
'scope' => implode(
147+
' ',
148+
array_map(static fn($scope) => $scope->getIdentifier(), $accessToken->getScopes()),
149+
),
141150
'client_id' => $accessToken->getClient()->getIdentifier(),
142151
'username' => (string) $accessToken->getUserIdentifier(),
143152
'token_type' => 'Bearer',

0 commit comments

Comments
 (0)