From 30c17a5e49288899dfa6a0a2be5da7f0f528c7fe Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Wed, 4 May 2022 06:04:47 -0400 Subject: [PATCH] Use OAuth2ErrorCodes.INVALID_REDIRECT_URI Closes gh-727 --- .../OidcClientRegistrationAuthenticationProvider.java | 3 +-- .../OidcClientRegistrationAuthenticationProviderTests.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java index 9d9d1b59..9ad8f897 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java @@ -222,8 +222,7 @@ public final class OidcClientRegistrationAuthenticationProvider implements Authe checkScopeForRegistration(authorizedAccessToken); if (!isValidRedirectUris(clientRegistrationAuthentication.getClientRegistration().getRedirectUris())) { - // TODO Add OAuth2ErrorCodes.INVALID_REDIRECT_URI - throwInvalidClientRegistration("invalid_redirect_uri", OidcClientMetadataClaimNames.REDIRECT_URIS); + throwInvalidClientRegistration(OAuth2ErrorCodes.INVALID_REDIRECT_URI, OidcClientMetadataClaimNames.REDIRECT_URIS); } if (!isValidTokenEndpointAuthenticationMethod(clientRegistrationAuthentication.getClientRegistration())) { diff --git a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProviderTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProviderTests.java index a0a403b7..54a59a4e 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProviderTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProviderTests.java @@ -318,7 +318,7 @@ public class OidcClientRegistrationAuthenticationProviderTests { .isInstanceOf(OAuth2AuthenticationException.class) .extracting(ex -> ((OAuth2AuthenticationException) ex).getError()) .satisfies(error -> { - assertThat(error.getErrorCode()).isEqualTo("invalid_redirect_uri"); + assertThat(error.getErrorCode()).isEqualTo(OAuth2ErrorCodes.INVALID_REDIRECT_URI); assertThat(error.getDescription()).contains(OidcClientMetadataClaimNames.REDIRECT_URIS); }); verify(this.authorizationService).findByToken( @@ -353,7 +353,7 @@ public class OidcClientRegistrationAuthenticationProviderTests { .isInstanceOf(OAuth2AuthenticationException.class) .extracting(ex -> ((OAuth2AuthenticationException) ex).getError()) .satisfies(error -> { - assertThat(error.getErrorCode()).isEqualTo("invalid_redirect_uri"); + assertThat(error.getErrorCode()).isEqualTo(OAuth2ErrorCodes.INVALID_REDIRECT_URI); assertThat(error.getDescription()).contains(OidcClientMetadataClaimNames.REDIRECT_URIS); }); verify(this.authorizationService).findByToken(