From 57bc456ad66643a2a1497de4afe50540653b8fcd Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 3 Jul 2019 16:18:02 -0500 Subject: [PATCH] Revert "Polish SCrypt Upgrade Support" This reverts commit 0d5392103990430787b0f322c2c9fc94494bb7e5. --- .../registration/ClientRegistration.java | 2 +- .../registration/ClientRegistrationTests.java | 23 ------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java index b17510ece7..f6170fad0b 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java @@ -486,7 +486,7 @@ public final class ClientRegistration implements Serializable { this.validateClientCredentialsGrantType(); } else if (AuthorizationGrantType.IMPLICIT.equals(this.authorizationGrantType)) { this.validateImplicitGrantType(); - } else if (AuthorizationGrantType.AUTHORIZATION_CODE.equals(this.authorizationGrantType)) { + } else { this.validateAuthorizationCodeGrantType(); } return this.create(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationTests.java index 208a6e63fa..23059d595b 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationTests.java @@ -535,27 +535,4 @@ public class ClientRegistrationTests { .build() ).isInstanceOf(IllegalArgumentException.class); } - - @Test - public void buildWhenCustomGrantAllAttributesProvidedThenAllAttributesAreSet() { - AuthorizationGrantType customGrantType = new AuthorizationGrantType("CUSTOM"); - ClientRegistration registration = ClientRegistration.withRegistrationId(REGISTRATION_ID) - .clientId(CLIENT_ID) - .clientSecret(CLIENT_SECRET) - .clientAuthenticationMethod(ClientAuthenticationMethod.BASIC) - .authorizationGrantType(customGrantType) - .scope(SCOPES.toArray(new String[0])) - .tokenUri(TOKEN_URI) - .clientName(CLIENT_NAME) - .build(); - - assertThat(registration.getRegistrationId()).isEqualTo(REGISTRATION_ID); - assertThat(registration.getClientId()).isEqualTo(CLIENT_ID); - assertThat(registration.getClientSecret()).isEqualTo(CLIENT_SECRET); - assertThat(registration.getClientAuthenticationMethod()).isEqualTo(ClientAuthenticationMethod.BASIC); - assertThat(registration.getAuthorizationGrantType()).isEqualTo(customGrantType); - assertThat(registration.getScopes()).isEqualTo(SCOPES); - assertThat(registration.getProviderDetails().getTokenUri()).isEqualTo(TOKEN_URI); - assertThat(registration.getClientName()).isEqualTo(CLIENT_NAME); - } }