Skip to content

Commit c594317

Browse files
committed
Do not attempt to create token store if not running in cloud environment
[#151232072] https://www.pivotaltracker.com/story/show/151232072 Signed-off-by: Filip Hanik <[email protected]> Signed-off-by: Mikhail Vyshegorodtsev <[email protected]>
1 parent b18e916 commit c594317

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

src/main/java/io/pivotal/spring/cloud/IssuerCheckConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.net.MalformedURLException;
1414

1515
@Configuration
16-
@ConditionalOnProperty({"ssoServiceUrl", "security.oauth2.resource.jwk.key-set-uri"})
16+
@ConditionalOnProperty({"sso.connector.cloud.available"})
1717
public class IssuerCheckConfiguration {
1818
@Value("${ssoServiceUrl}")
1919
private String ssoServiceUrl;

src/main/java/io/pivotal/spring/cloud/SsoServiceCredentialsListener.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
3535
map.put("security.oauth2.resource.userInfoUri", ssoServiceInfo.getAuthDomain() + "/userinfo");
3636
map.put("security.oauth2.resource.tokenInfoUri", ssoServiceInfo.getAuthDomain() + "/check_token");
3737
map.put("security.oauth2.resource.jwk.key-set-uri", ssoServiceInfo.getAuthDomain() + "/token_keys");
38+
map.put("sso.connector.cloud.available", "success");
3839
MapPropertySource mapPropertySource = new MapPropertySource("vcapPivotalSso", map);
3940

4041
event.getEnvironment().getPropertySources().addFirst(mapPropertySource);

src/test/java/io/pivotal/spring/cloud/IssuerCheckConfigurationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
@EnableAutoConfiguration
2020
@TestPropertySource(properties = {
2121
"ssoServiceUrl=https://cf-identity-eng-test1.login.run.pivotal.io",
22-
"security.oauth2.resource.jwk.key-set-uri=https://cf-identity-eng-test1.login.run.pivotal.io/token_keys"
22+
"security.oauth2.resource.jwk.key-set-uri=https://cf-identity-eng-test1.login.run.pivotal.io/token_keys",
23+
"sso.connector.cloud.available=success"
2324
})
2425
public class IssuerCheckConfigurationTest {
2526
@ClassRule

src/test/java/io/pivotal/spring/cloud/SsoServiceCredentialsListenerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,6 @@ public void addClientCredentials() {
4848
assertEquals("test-auth-domain/userinfo", environment.getProperty("security.oauth2.resource.userInfoUri"));
4949
assertEquals("test-auth-domain/check_token", environment.getProperty("security.oauth2.resource.tokenInfoUri"));
5050
assertEquals("test-auth-domain", environment.getProperty("ssoServiceUrl"));
51+
assertEquals("success", environment.getProperty("sso.connector.cloud.available"));
5152
}
5253
}

0 commit comments

Comments
 (0)