From aa5e0686cd4b27efef32d0be23b16268113ca774 Mon Sep 17 00:00:00 2001 From: Kaveh Shamsi Date: Thu, 9 Mar 2023 11:53:06 +0100 Subject: [PATCH] Completes the support for oauth2 scopes (#344) --- .../config/client/ConfigClientOAuth2BootstrapConfiguration.java | 1 + .../cloud/config/client/VaultTokenRenewalAutoConfiguration.java | 1 + 2 files changed, 2 insertions(+) diff --git a/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/ConfigClientOAuth2BootstrapConfiguration.java b/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/ConfigClientOAuth2BootstrapConfiguration.java index 5a485f1c..0db835a4 100644 --- a/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/ConfigClientOAuth2BootstrapConfiguration.java +++ b/spring-cloud-services-config-client-autoconfigure/src/main/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/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/VaultTokenRenewalAutoConfiguration.java b/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/VaultTokenRenewalAutoConfiguration.java index ad237391..ddbd3457 100644 --- a/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/VaultTokenRenewalAutoConfiguration.java +++ b/spring-cloud-services-config-client-autoconfigure/src/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);