Completes the support for oauth2 scopes (#344)

pivotal-cf · Mar 9, 2023 · aa5e068 · aa5e068
1 parent 4c49301
commit aa5e068
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.../java/io/pivotal/spring/cloud/config/client/ConfigClientOAuth2BootstrapConfiguration.java b/.../java/io/pivotal/spring/cloud/config/client/ConfigClientOAuth2BootstrapConfiguration.java
@@ -42,6 +42,7 @@ public ConfigServicePropertySourceLocator configServicePropertySourceLocator(
  ClientRegistration clientRegistration = ClientRegistration.withRegistrationId("config-client")
  .clientId(configClientOAuth2Properties.getClientId())
  .clientSecret(configClientOAuth2Properties.getClientSecret())
+ .scope(configClientOAuth2Properties.getScope())
  .tokenUri(configClientOAuth2Properties.getAccessTokenUri())
  .authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS).build();
  RestTemplate restTemplate = new RestTemplate();

diff --git a/...c/main/java/io/pivotal/spring/cloud/config/client/VaultTokenRenewalAutoConfiguration.java b/...c/main/java/io/pivotal/spring/cloud/config/client/VaultTokenRenewalAutoConfiguration.java
@@ -76,6 +76,7 @@ public VaultTokenRefresher vaultTokenRefresher(ConfigClientProperties configClie
  .authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS)
  .clientId(configClientOAuth2Properties.getClientId())
  .clientSecret(configClientOAuth2Properties.getClientSecret())
+ .scope(configClientOAuth2Properties.getScope())
  .tokenUri(configClientOAuth2Properties.getAccessTokenUri()).build();
  restTemplate.getInterceptors().add(new OAuth2AuthorizedClientHttpRequestInterceptor(clientRegistration));
  String obscuredToken = vaultToken.substring(0, 4) + "[*]" + vaultToken.substring(vaultToken.length() - 4);