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

Test that client-id can be hyphen or camel-cased

Browse Source
This commit is contained in:
Dave Syer
2015-10-28 11:50:31 +00:00
parent 954d137210
commit 5c0ef308aa
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,7 +115,7 @@ public class OAuth2ResourceServerConfiguration {
RelaxedPropertyResolver resolver = new RelaxedPropertyResolver(environment,
"security.oauth2.resource.");
String client = environment
.resolvePlaceholders("${security.oauth2.client.clientId:}");
.resolvePlaceholders("${security.oauth2.client.client-id:}");
if (StringUtils.hasText(client)) {
return ConditionOutcome.match("found client id");
}

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

@@ -21,7 +21,6 @@ import java.util.Map;
import org.junit.After;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -122,9 +121,9 @@ public class ResourceServerTokenServicesConfigurationTests {
}
@Test
public void userInfoNoClient() {
public void userInfoWithClient() {
EnvironmentTestUtils.addEnvironment(this.environment,
"security.oauth2.client.clientId=acme",
"security.oauth2.client.client-id=acme",
"security.oauth2.resource.userInfoUri:http://example.com",
"server.port=-1", "debug=true");
this.context = new SpringApplicationBuilder(ResourceNoClientConfiguration.class)