Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4316 from klieber/bugfix/oauth2-auth-server-autoconfig

Browse Source 
* pr/4316:
  Polish contribution
  Add missing properties to OAuth2AutorizationServer
This commit is contained in:
Stephane Nicoll
2015-10-29 11:10:52 +01:00
parent 6578239f67 10a079fb07
commit c98d3208b2
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java
View File

@@ -92,6 +92,16 @@ public class OAuth2AuthorizationServerConfiguration
AuthorityUtils.authorityListToSet(this.details.getAuthorities())
.toArray(new String[0]))
.scopes(this.details.getScope().toArray(new String[0]));
if (this.details.getAutoApproveScopes() != null) {
builder.autoApprove(this.details.getAutoApproveScopes().toArray(new String[0]));
}
if (this.details.getAccessTokenValiditySeconds() != null) {
builder.accessTokenValiditySeconds(this.details.getAccessTokenValiditySeconds());
}
if (this.details.getRefreshTokenValiditySeconds() != null) {
builder.refreshTokenValiditySeconds(this.details.getRefreshTokenValiditySeconds());
}
if (this.details.getRegisteredRedirectUri() != null) {
builder.redirectUris(
this.details.getRegisteredRedirectUri().toArray(new String[0]));

11
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java
View File

@@ -143,13 +143,22 @@ public class OAuth2AutoConfigurationTests {
this.context = new AnnotationConfigEmbeddedWebApplicationContext();
EnvironmentTestUtils.addEnvironment(this.context,
"security.oauth2.client.clientId:myclientid",
"security.oauth2.client.clientSecret:mysecret");
"security.oauth2.client.clientSecret:mysecret",
"security.oauth2.client.autoApproveScopes:read,write",
"security.oauth2.client.accessTokenValiditySeconds:40",
"security.oauth2.client.refreshTokenValiditySeconds:80"
);
this.context.register(AuthorizationAndResourceServerConfiguration.class,
MinimalSecureWebApplication.class);
this.context.refresh();
ClientDetails config = this.context.getBean(ClientDetails.class);
assertThat(config.getClientId(), equalTo("myclientid"));
assertThat(config.getClientSecret(), equalTo("mysecret"));
assertThat(config.isAutoApprove("read"), equalTo(true));
assertThat(config.isAutoApprove("write"), equalTo(true));
assertThat(config.isAutoApprove("foo"), equalTo(false));
assertThat(config.getAccessTokenValiditySeconds(), equalTo(40));
assertThat(config.getRefreshTokenValiditySeconds(), equalTo(80));
verifyAuthentication(config);
}