root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2016-11-06 11:25:44 +01:00
parent 01e66ecbd5 32950bfec1
commit b51f92d9a4
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 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.
@ -246,7 +246,7 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware {
if (ResourceServerProperties.this.tokenInfoUri != null if (ResourceServerProperties.this.tokenInfoUri != null
&& ResourceServerProperties.this.tokenInfoUri && ResourceServerProperties.this.tokenInfoUri
.endsWith("/check_token")) { .endsWith("/check_token")) {
return ResourceServerProperties.this.userInfoUri.replace("/check_token", return ResourceServerProperties.this.tokenInfoUri.replace("/check_token",
"/token_key"); "/token_key");
} }
return null; return null;

13
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerPropertiesTests.java
View File

@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link ResourceServerProperties}. * Tests for {@link ResourceServerProperties}.
* *
* @author Dave Syer * @author Dave Syer
* @author Vedran Pavic
*/ */
public class ResourceServerPropertiesTests { public class ResourceServerPropertiesTests {
@ -45,9 +46,17 @@ public class ResourceServerPropertiesTests {
} }
@Test @Test
public void tokenKeyDerived() throws Exception { public void tokenKeyDerivedFromUserInfoUri() throws Exception {
this.properties.setUserInfoUri("http://example.com/userinfo"); this.properties.setUserInfoUri("http://example.com/userinfo");
assertThat(this.properties.getJwt().getKeyUri()).isNotNull(); assertThat(this.properties.getJwt().getKeyUri())
.isEqualTo("http://example.com/token_key");
}
@Test
public void tokenKeyDerivedFromTokenInfoUri() throws Exception {
this.properties.setTokenInfoUri("http://example.com/check_token");
assertThat(this.properties.getJwt().getKeyUri())
.isEqualTo("http://example.com/token_key");
} }
} }