Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make AuthorizationGrantTypeConverter support custom grant type 

Closes gh-10155
This commit is contained in:
Rujun Chen 2021-08-06 16:58:06 +08:00 committed by Joe Grandja
parent d0fbe6b501
commit 9b4ddd7e0a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/jackson2/StdConverters.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -83,7 +83,7 @@ abstract class StdConverters {
if (AuthorizationGrantType.PASSWORD.getValue().equalsIgnoreCase(value)) { if (AuthorizationGrantType.PASSWORD.getValue().equalsIgnoreCase(value)) {
return AuthorizationGrantType.PASSWORD; return AuthorizationGrantType.PASSWORD;
} }
return null; return new AuthorizationGrantType(value);
} }
} }

4
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthorizedClientMixinTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -32,6 +32,7 @@ import org.springframework.security.jackson2.SecurityJackson2Modules;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClient; import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistration;
import org.springframework.security.oauth2.client.registration.TestClientRegistrations; import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.security.oauth2.core.OAuth2AccessToken; import org.springframework.security.oauth2.core.OAuth2AccessToken;
import org.springframework.security.oauth2.core.OAuth2RefreshToken; import org.springframework.security.oauth2.core.OAuth2RefreshToken;
import org.springframework.security.oauth2.core.TestOAuth2AccessTokens; import org.springframework.security.oauth2.core.TestOAuth2AccessTokens;
@ -69,6 +70,7 @@ public class OAuth2AuthorizedClientMixinTests {
providerConfigurationMetadata.put("config2", "value2"); providerConfigurationMetadata.put("config2", "value2");
// @formatter:off // @formatter:off
this.clientRegistrationBuilder = TestClientRegistrations.clientRegistration() this.clientRegistrationBuilder = TestClientRegistrations.clientRegistration()
.authorizationGrantType(new AuthorizationGrantType("custom-grant"))
.scope("read", "write") .scope("read", "write")
.providerConfigurationMetadata(providerConfigurationMetadata); .providerConfigurationMetadata(providerConfigurationMetadata);
// @formatter:on // @formatter:on