diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/b2c/implementation/AADB2CConditions.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/b2c/implementation/AADB2CConditions.java index 7a0faf983085..db221e36af01 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/b2c/implementation/AADB2CConditions.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/b2c/implementation/AADB2CConditions.java @@ -117,7 +117,7 @@ public ConditionOutcome getMatchOutcome(final ConditionContext context, */ private static AADB2CProperties getAADB2CProperties(ConditionContext context) { return Binder.get(context.getEnvironment()) - .bind("azure.activedirectory.b2c", AADB2CProperties.class) + .bind("spring.cloud.azure.active-directory.b2c", AADB2CProperties.class) .orElse(null); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/b2c/implementation/AADB2CProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/b2c/implementation/AADB2CProperties.java index a66dc5c4b9db..95de256b41c0 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/b2c/implementation/AADB2CProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/b2c/implementation/AADB2CProperties.java @@ -29,7 +29,7 @@ public class AADB2CProperties implements InitializingBean { public static final String DEFAULT_LOGOUT_SUCCESS_URL = "http://localhost:8080/login"; - public static final String PREFIX = "azure.activedirectory.b2c"; + public static final String PREFIX = "spring.cloud.azure.active-directory.b2c"; private static final String TENANT_NAME_PART_REGEX = "([A-Za-z0-9]+\\.)"; @@ -188,7 +188,7 @@ public void setTenant(String tenant) { */ @DeprecatedConfigurationProperty( reason = "Configuration updated to baseUri", - replacement = "azure.activedirectory.b2c.base-uri") + replacement = "spring.cloud.azure.active-directory.b2c.base-uri") public String getTenant() { if (StringUtils.hasText(baseUri)) { Matcher matcher = Pattern.compile(TENANT_NAME_PART_REGEX).matcher(baseUri); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ClientRegistrationCondition.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ClientRegistrationCondition.java index 2fa00c293be3..cb3344d67ca4 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ClientRegistrationCondition.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ClientRegistrationCondition.java @@ -27,15 +27,15 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM ConditionMessage.Builder message = ConditionMessage.forCondition("AAD Application Client Condition"); AADAuthenticationProperties properties = Binder.get(context.getEnvironment()) - .bind("azure.activedirectory", AADAuthenticationProperties.class) + .bind("spring.cloud.azure.active-directory", AADAuthenticationProperties.class) .orElse(null); if (properties == null) { return ConditionOutcome.noMatch( - message.notAvailable("AAD authorization properties(azure.activedirectory" + ".xxx)")); + message.notAvailable("AAD authorization properties(spring.cloud.azure.active-directory" + ".xxx)")); } if (!StringUtils.hasText(properties.getClientId())) { - return ConditionOutcome.noMatch(message.didNotFind("azure.activedirectory.client-id").atAll()); + return ConditionOutcome.noMatch(message.didNotFind("spring.cloud.azure.active-directory.client-id").atAll()); } // Bind properties will not execute AADAuthenticationProperties#afterPropertiesSet() @@ -46,6 +46,6 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM message.because("Resource server does not need client registration.")); } return ConditionOutcome.match( - message.foundExactly("azure.activedirectory.application-type=" + applicationType)); + message.foundExactly("spring.cloud.azure.active-directory.application-type=" + applicationType)); } } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ResourceServerCondition.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ResourceServerCondition.java index 5739a60630dd..18326559f5ed 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ResourceServerCondition.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ResourceServerCondition.java @@ -26,7 +26,7 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM ConditionMessage.Builder message = ConditionMessage.forCondition("AAD Resource Server Condition"); AADAuthenticationProperties properties = Binder.get(context.getEnvironment()) - .bind("azure.activedirectory", AADAuthenticationProperties.class) + .bind("spring.cloud.azure.active-directory", AADAuthenticationProperties.class) .orElse(null); if (properties == null) { return ConditionOutcome.noMatch(message.notAvailable("aad authorization properties")); @@ -37,9 +37,9 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM .orElseGet(AADApplicationType::inferApplicationTypeByDependencies); if (applicationType == null || applicationType == WEB_APPLICATION) { return ConditionOutcome.noMatch( - message.because("azure.activedirectory.application-type=" + applicationType)); + message.because("spring.cloud.azure.active-directory.application-type=" + applicationType)); } return ConditionOutcome.match( - message.foundExactly("azure.activedirectory.application-type=" + applicationType)); + message.foundExactly("spring.cloud.azure.active-directory.application-type=" + applicationType)); } } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/WebApplicationCondition.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/WebApplicationCondition.java index 2604d0b13fef..4c29728bebd8 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/WebApplicationCondition.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/WebApplicationCondition.java @@ -28,7 +28,7 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM ConditionMessage.Builder message = ConditionMessage.forCondition("AAD Web Application Condition"); AADAuthenticationProperties properties = Binder.get(context.getEnvironment()) - .bind("azure.activedirectory", AADAuthenticationProperties.class) + .bind("spring.cloud.azure.active-directory", AADAuthenticationProperties.class) .orElse(null); if (properties == null) { return ConditionOutcome.noMatch(message.notAvailable("aad authorization properties")); @@ -45,9 +45,9 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM || applicationType == RESOURCE_SERVER || applicationType == RESOURCE_SERVER_WITH_OBO) { return ConditionOutcome.noMatch( - message.because("azure.activedirectory.application-type=" + applicationType)); + message.because("spring.cloud.azure.active-directory.application-type=" + applicationType)); } return ConditionOutcome.match( - message.foundExactly("azure.activedirectory.application-type=" + applicationType)); + message.foundExactly("spring.cloud.azure.active-directory.application-type=" + applicationType)); } } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/AADAuthenticationFilterAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/AADAuthenticationFilterAutoConfiguration.java index d51afe773ce0..1741397915ef 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/AADAuthenticationFilterAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/AADAuthenticationFilterAutoConfiguration.java @@ -27,10 +27,10 @@ /** * {@link EnableAutoConfiguration Auto-configuration} for Azure Active Authentication filters. *

- * The configuration will not be activated if no {@literal azure.activedirectory.client-id} property provided. + * The configuration will not be activated if no {@literal spring.cloud.azure.active-directory.client-id} property provided. *

* A stateless filter {@link AADAppRoleStatelessAuthenticationFilter} will be auto-configured by specifying {@literal - * azure.activedirectory.session-stateless=true}. Otherwise, {@link AADAuthenticationFilter} will be configured. + * spring.cloud.azure.active-directory.session-stateless=true}. Otherwise, {@link AADAuthenticationFilter} will be configured. */ @Configuration @ConditionalOnWebApplication @@ -39,7 +39,7 @@ @ConditionalOnProperty(prefix = AADAuthenticationFilterAutoConfiguration.PROPERTY_PREFIX, value = { "client-id" }) @EnableConfigurationProperties({ AADAuthenticationProperties.class }) public class AADAuthenticationFilterAutoConfiguration { - public static final String PROPERTY_PREFIX = "azure.activedirectory"; + public static final String PROPERTY_PREFIX = "spring.cloud.azure.active-directory"; private static final Logger LOG = LoggerFactory.getLogger(AADAuthenticationProperties.class); private final AADAuthenticationProperties properties; @@ -57,7 +57,7 @@ public AADAuthenticationFilterAutoConfiguration(AADAuthenticationProperties prop */ @Bean @ConditionalOnMissingBean(AADAuthenticationFilter.class) - @ConditionalOnExpression("${azure.activedirectory.session-stateless:false} == false") + @ConditionalOnExpression("${spring.cloud.azure.active-directory.session-stateless:false} == false") // client-id and client-secret used to: get graphApiToken -> groups @ConditionalOnProperty(prefix = PROPERTY_PREFIX, value = { "client-id", "client-secret" }) public AADAuthenticationFilter azureADJwtTokenFilter() { @@ -72,7 +72,7 @@ public AADAuthenticationFilter azureADJwtTokenFilter() { @Bean @ConditionalOnMissingBean(AADAppRoleStatelessAuthenticationFilter.class) - @ConditionalOnExpression("${azure.activedirectory.session-stateless:false} == true") + @ConditionalOnExpression("${spring.cloud.azure.active-directory.session-stateless:false} == true") // client-id used to: userPrincipalManager.getValidator @ConditionalOnProperty(prefix = PROPERTY_PREFIX, value = { "client-id" }) public AADAppRoleStatelessAuthenticationFilter azureADStatelessAuthFilter(ResourceRetriever resourceRetriever) { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AADClientRegistrationRepository.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AADClientRegistrationRepository.java index d98fc5de484a..5e4121482055 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AADClientRegistrationRepository.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AADClientRegistrationRepository.java @@ -26,7 +26,7 @@ /** - * Manage all AAD OAuth2 clients configured by property "azure.activedirectory.xxx". + * Manage all AAD OAuth2 clients configured by property "spring.cloud.azure.active-directory.xxx". * Do extra works: * 1. Make "azure" client's scope contains all "azure_delegated" clients' scope. * This scope is used to request authorize code. diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/properties/AADAuthenticationProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/properties/AADAuthenticationProperties.java index 3a8fc01cc326..91dbf0f97080 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/properties/AADAuthenticationProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/properties/AADAuthenticationProperties.java @@ -38,7 +38,7 @@ * Configuration properties for Azure Active Directory Authentication. */ @Validated -@ConfigurationProperties("azure.activedirectory") +@ConfigurationProperties("spring.cloud.azure.active-directory") public class AADAuthenticationProperties implements InitializingBean { private static final Logger LOGGER = LoggerFactory.getLogger(AADAuthenticationProperties.class); @@ -145,7 +145,7 @@ public void setApplicationType(AADApplicationType applicationType) { @DeprecatedConfigurationProperty( reason = "Configuration moved to UserGroup class to keep UserGroup properties together", - replacement = "azure.activedirectory.user-group.allowed-group-names") + replacement = "spring.cloud.azure.active-directory.user-group.allowed-group-names") public List getActiveDirectoryGroups() { return userGroup.getAllowedGroups(); } @@ -202,8 +202,8 @@ public Boolean getEnableFullList() { @Deprecated public void setEnableFullList(Boolean enableFullList) { - logger.warn(" 'azure.activedirectory.user-group.enable-full-list' property detected! " - + "Use 'azure.activedirectory.user-group.allowed-group-ids: all' instead!"); + logger.warn(" 'spring.cloud.azure.active-directory.user-group.enable-full-list' property detected! " + + "Use 'spring.cloud.azure.active-directory.user-group.allowed-group-ids: all' instead!"); this.enableFullList = enableFullList; } @@ -211,14 +211,14 @@ public void setEnableFullList(Boolean enableFullList) { @DeprecatedConfigurationProperty( reason = "In order to distinguish between allowed-group-ids and allowed-group-names, set allowed-groups " + "deprecated.", - replacement = "azure.activedirectory.user-group.allowed-group-names") + replacement = "spring.cloud.azure.active-directory.user-group.allowed-group-names") public List getAllowedGroups() { return allowedGroupNames; } @Deprecated public void setAllowedGroups(List allowedGroups) { - logger.warn(" 'azure.activedirectory.user-group.allowed-groups' property detected! " + " Use 'azure" + logger.warn(" 'spring.cloud.azure.active-directory.user-group.allowed-groups' property detected! " + " Use 'azure" + ".activedirectory.user-group.allowed-group-names' instead!"); this.allowedGroupNames = allowedGroups; } @@ -442,17 +442,17 @@ public void afterPropertiesSet() { } if (!graphMembershipUri.startsWith(graphBaseUri)) { - throw new IllegalStateException("azure.activedirectory.graph-base-uri should be " - + "the prefix of azure.activedirectory.graph-membership-uri. " - + "azure.activedirectory.graph-base-uri = " + graphBaseUri + ", " - + "azure.activedirectory.graph-membership-uri = " + graphMembershipUri + "."); + throw new IllegalStateException("spring.cloud.azure.active-directory.graph-base-uri should be " + + "the prefix of spring.cloud.azure.active-directory.graph-membership-uri. " + + "spring.cloud.azure.active-directory.graph-base-uri = " + graphBaseUri + ", " + + "spring.cloud.azure.active-directory.graph-membership-uri = " + graphMembershipUri + "."); } Set allowedGroupIds = userGroup.getAllowedGroupIds(); if (allowedGroupIds.size() > 1 && allowedGroupIds.contains("all")) { - throw new IllegalStateException("When azure.activedirectory.user-group.allowed-group-ids contains 'all', " + throw new IllegalStateException("When spring.cloud.azure.active-directory.user-group.allowed-group-ids contains 'all', " + "no other group ids can be configured. " - + "But actually azure.activedirectory.user-group.allowed-group-ids=" + + "But actually spring.cloud.azure.active-directory.user-group.allowed-group-ids=" + allowedGroupIds); } @@ -471,32 +471,32 @@ private void validateTenantId() { } if (isMultiTenantsApplication(tenantId) && !userGroup.getAllowedGroups().isEmpty()) { - throw new IllegalStateException("When azure.activedirectory.tenant-id is 'common/organizations/consumers', " - + "azure.activedirectory.user-group.allowed-groups/allowed-group-names should be empty. " - + "But actually azure.activedirectory.tenant-id=" + tenantId - + ", and azure.activedirectory.user-group.allowed-groups/allowed-group-names=" + throw new IllegalStateException("When spring.cloud.azure.active-directory.tenant-id is 'common/organizations/consumers', " + + "spring.cloud.azure.active-directory.user-group.allowed-groups/allowed-group-names should be empty. " + + "But actually spring.cloud.azure.active-directory.tenant-id=" + tenantId + + ", and spring.cloud.azure.active-directory.user-group.allowed-groups/allowed-group-names=" + userGroup.getAllowedGroups()); } if (isMultiTenantsApplication(tenantId) && !userGroup.getAllowedGroupIds().isEmpty()) { - throw new IllegalStateException("When azure.activedirectory.tenant-id is 'common/organizations/consumers', " - + "azure.activedirectory.user-group.allowed-group-ids should be empty. " - + "But actually azure.activedirectory.tenant-id=" + tenantId - + ", and azure.activedirectory.user-group.allowed-group-ids=" + userGroup.getAllowedGroupIds()); + throw new IllegalStateException("When spring.cloud.azure.active-directory.tenant-id is 'common/organizations/consumers', " + + "spring.cloud.azure.active-directory.user-group.allowed-group-ids should be empty. " + + "But actually spring.cloud.azure.active-directory.tenant-id=" + tenantId + + ", and spring.cloud.azure.active-directory.user-group.allowed-group-ids=" + userGroup.getAllowedGroupIds()); } } /** * Validate configured application type or set default value. * - * @throws IllegalStateException Invalid property 'azure.activedirectory.application-type' + * @throws IllegalStateException Invalid property 'spring.cloud.azure.active-directory.application-type' */ private void validateApplicationType() { AADApplicationType inferred = inferApplicationTypeByDependencies(); if (applicationType != null) { if (!isValidApplicationType(applicationType, inferred)) { throw new IllegalStateException( - "Invalid property 'azure.activedirectory.application-type', the configured value is '" + "Invalid property 'spring.cloud.azure.active-directory.application-type', the configured value is '" + applicationType.getValue() + "', " + "but the inferred value is '" + inferred.getValue() + "'."); } @@ -534,7 +534,7 @@ private void validateAuthorizationClientProperties(String registrationId, + "'on_behalf_of'.", registrationId); break; case WEB_APPLICATION_AND_RESOURCE_SERVER: - throw new IllegalStateException("azure.activedirectory.authorization-clients." + registrationId + throw new IllegalStateException("spring.cloud.azure.active-directory.authorization-clients." + registrationId + ".authorization-grant-grantType must be configured. "); default: throw new IllegalStateException("Unsupported authorization grantType " + applicationType.getValue()); @@ -544,48 +544,48 @@ private void validateAuthorizationClientProperties(String registrationId, switch (applicationType) { case WEB_APPLICATION: if (ON_BEHALF_OF.getValue().equals(grantType)) { - throw new IllegalStateException("When 'azure.activedirectory.application-type=web_application'," - + " 'azure.activedirectory.authorization-clients." + registrationId + throw new IllegalStateException("When 'spring.cloud.azure.active-directory.application-type=web_application'," + + " 'spring.cloud.azure.active-directory.authorization-clients." + registrationId + ".authorization-grant-type' can not be 'on_behalf_of'."); } break; case RESOURCE_SERVER: if (AUTHORIZATION_CODE.getValue().equals(grantType)) { - throw new IllegalStateException("When 'azure.activedirectory.application-type=resource_server'," - + " 'azure.activedirectory.authorization-clients." + registrationId + throw new IllegalStateException("When 'spring.cloud.azure.active-directory.application-type=resource_server'," + + " 'spring.cloud.azure.active-directory.authorization-clients." + registrationId + ".authorization-grant-type' can not be 'authorization_code'."); } if (ON_BEHALF_OF.getValue().equals(grantType)) { - throw new IllegalStateException("When 'azure.activedirectory.application-type=resource_server'," - + " 'azure.activedirectory.authorization-clients." + registrationId + throw new IllegalStateException("When 'spring.cloud.azure.active-directory.application-type=resource_server'," + + " 'spring.cloud.azure.active-directory.authorization-clients." + registrationId + ".authorization-grant-type' can not be 'on_behalf_of'."); } break; case RESOURCE_SERVER_WITH_OBO: if (AUTHORIZATION_CODE.getValue().equals(grantType)) { - throw new IllegalStateException("When 'azure.activedirectory" + throw new IllegalStateException("When 'spring.cloud.azure.active-directory" + ".application-type=resource_server_with_obo'," - + " 'azure.activedirectory.authorization-clients." + registrationId + + " 'spring.cloud.azure.active-directory.authorization-clients." + registrationId + ".authorization-grant-type' can not be 'authorization_code'."); } break; case WEB_APPLICATION_AND_RESOURCE_SERVER: default: - LOGGER.debug("'azure.activedirectory.authorization-clients." + registrationId + LOGGER.debug("'spring.cloud.azure.active-directory.authorization-clients." + registrationId + ".authorization-grant-type' is valid."); } if (properties.isOnDemand() && !AUTHORIZATION_CODE.getValue().equals(grantType)) { throw new IllegalStateException("onDemand only support authorization_code grant grantType. Please set " - + "'azure.activedirectory.authorization-clients." + registrationId + + "'spring.cloud.azure.active-directory.authorization-clients." + registrationId + ".authorization-grant-grantType=authorization_code'" - + " or 'azure.activedirectory.authorization-clients." + registrationId + ".on-demand=false'."); + + " or 'spring.cloud.azure.active-directory.authorization-clients." + registrationId + ".on-demand=false'."); } if (AZURE_CLIENT_REGISTRATION_ID.equals(registrationId) && !AUTHORIZATION_CODE.equals(properties.getAuthorizationGrantType())) { - throw new IllegalStateException("azure.activedirectory.authorization-clients." + throw new IllegalStateException("spring.cloud.azure.active-directory.authorization-clients." + AZURE_CLIENT_REGISTRATION_ID + ".authorization-grant-grantType must be configured to 'authorization_code'."); } @@ -595,7 +595,7 @@ private void validateAuthorizationClientProperties(String registrationId, List scopes = properties.getScopes(); if (scopes == null || scopes.isEmpty()) { throw new IllegalStateException( - "'azure.activedirectory.authorization-clients." + registrationId + ".scopes' must be configured"); + "'spring.cloud.azure.active-directory.authorization-clients." + registrationId + ".scopes' must be configured"); } // Add necessary scopes for authorization_code clients. // https://docs.microsoft.com/en-us/graph/permissions-reference#remarks-17 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/properties/AADResourceServerProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/properties/AADResourceServerProperties.java index 6bfa56b78f36..81763c78e69e 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/properties/AADResourceServerProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/properties/AADResourceServerProperties.java @@ -16,7 +16,7 @@ /** * Configuration properties for Azure Active Directory B2C. */ -@ConfigurationProperties("azure.activedirectory.resource-server") +@ConfigurationProperties("spring.cloud.azure.active-directory.resource-server") public class AADResourceServerProperties implements InitializingBean { public static final Map DEFAULT_CLAIM_TO_AUTHORITY_PREFIX_MAP; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapi/AADResourceServerConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapi/AADResourceServerConfiguration.java index d32e4bc92429..1b4dfc5f4409 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapi/AADResourceServerConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapi/AADResourceServerConfiguration.java @@ -85,7 +85,7 @@ public List> createDefaultValidator() { @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) @ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class) - @ConditionalOnExpression("!'${azure.activedirectory.application-type}'.equalsIgnoreCase('web_application_and_resource_server')") + @ConditionalOnExpression("!'${spring.cloud.azure.active-directory.application-type}'.equalsIgnoreCase('web_application_and_resource_server')") public static class DefaultAADResourceServerWebSecurityConfigurerAdapter extends AADResourceServerWebSecurityConfigurerAdapter { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AADWebApplicationConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AADWebApplicationConfiguration.java index c172327be1be..6646ba557fcb 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AADWebApplicationConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AADWebApplicationConfiguration.java @@ -42,7 +42,7 @@ public OAuth2UserService oidcUserService(AADAuthentic @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) @ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class) - @ConditionalOnExpression("!'${azure.activedirectory.application-type}'.equalsIgnoreCase('web_application_and_resource_server')") + @ConditionalOnExpression("!'${spring.cloud.azure.active-directory.application-type}'.equalsIgnoreCase('web_application_and_resource_server')") public static class DefaultAADWebSecurityConfigurerAdapter extends AADWebSecurityConfigurerAdapter { @Override diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/WebApplicationContextRunnerUtils.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/WebApplicationContextRunnerUtils.java index ff13cc82e205..bfe01055e6eb 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/WebApplicationContextRunnerUtils.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/WebApplicationContextRunnerUtils.java @@ -58,14 +58,14 @@ public static MultiValueMap toMultiValueMap(RequestEntity ent public static String[] withWebApplicationOrResourceServerWithOboPropertyValues() { return new String[] { - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.client-secret = fake-client-secret", - "azure.activedirectory.tenant-id = fake-tenant-id"}; + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.client-secret = fake-client-secret", + "spring.cloud.azure.active-directory.tenant-id = fake-tenant-id"}; } public static String[] withResourceServerPropertyValues() { return new String[] { - "azure.activedirectory.tenant-id=fake-tenant-id", - "azure.activedirectory.app-id-uri=fake-app-id-uri"}; + "spring.cloud.azure.active-directory.tenant-id=fake-tenant-id", + "spring.cloud.azure.active-directory.app-id-uri=fake-app-id-uri"}; } } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ClientRegistrationConditionTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ClientRegistrationConditionTest.java index f100a6afa5d7..9df0e55f5e1a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ClientRegistrationConditionTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ClientRegistrationConditionTest.java @@ -16,7 +16,7 @@ class ClientRegistrationConditionTest extends AbstractCondition { void testClientConditionWhenApplicationTypeIsEmpty() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id") + "spring.cloud.azure.active-directory.client-id = fake-client-id") .withUserConfiguration(ClientRegistrationConditionConfig.class) .run(assertConditionMatch(true)); } @@ -24,7 +24,7 @@ void testClientConditionWhenApplicationTypeIsEmpty() { @Test void testClientConditionWhenNoOAuth2ClientDependency() { this.contextRunner - .withPropertyValues("azure.activedirectory.client-id = fake-client-id") + .withPropertyValues("spring.cloud.azure.active-directory.client-id = fake-client-id") .withClassLoader(new FilteredClassLoader(ClientRegistration.class)) .withUserConfiguration(ClientRegistrationConditionConfig.class) .run(assertConditionMatch(false)); @@ -34,8 +34,8 @@ void testClientConditionWhenNoOAuth2ClientDependency() { void testClientConditionWhenApplicationTypeIsWebApplication() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.application-type=web_application") + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.application-type=web_application") .withClassLoader(new FilteredClassLoader(BearerTokenAuthenticationToken.class)) .withUserConfiguration(ClientRegistrationConditionConfig.class) .run(assertConditionMatch(true)); @@ -45,8 +45,8 @@ void testClientConditionWhenApplicationTypeIsWebApplication() { void testClientConditionWhenApplicationTypeIsResourceServer() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.application-type=resource_server") + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.application-type=resource_server") .withUserConfiguration(ClientRegistrationConditionConfig.class) .run(assertConditionMatch(false)); } @@ -55,8 +55,8 @@ void testClientConditionWhenApplicationTypeIsResourceServer() { void testClientConditionWhenApplicationTypeIsResourceServerWithOBO() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.application-type=resource_server_with_obo") + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.application-type=resource_server_with_obo") .withUserConfiguration(ClientRegistrationConditionConfig.class) .run(assertConditionMatch(true)); } @@ -65,8 +65,8 @@ void testClientConditionWhenApplicationTypeIsResourceServerWithOBO() { void testClientConditionWhenApplicationTypeIsWebApplicationAndResourceServer() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.application-type=web_application_and_resource_server") + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.application-type=web_application_and_resource_server") .withUserConfiguration(ClientRegistrationConditionConfig.class) .run(assertConditionMatch(true)); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ResourceServerConditionTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ResourceServerConditionTest.java index 7c6c104b9f7a..f731ebb10647 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ResourceServerConditionTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/ResourceServerConditionTest.java @@ -15,7 +15,7 @@ class ResourceServerConditionTest extends AbstractCondition { void testResourceServerConditionWhenApplicationTypeIsEmpty() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id") + "spring.cloud.azure.active-directory.client-id = fake-client-id") .withUserConfiguration(ResourceServerConditionConfig.class) .run(assertConditionMatch(true)); } @@ -23,7 +23,7 @@ void testResourceServerConditionWhenApplicationTypeIsEmpty() { @Test void testResourceServerConditionWhenNoOAuth2ResourceDependency() { this.contextRunner - .withPropertyValues("azure.activedirectory.client-id = fake-client-id") + .withPropertyValues("spring.cloud.azure.active-directory.client-id = fake-client-id") .withClassLoader(new FilteredClassLoader(BearerTokenAuthenticationToken.class)) .withUserConfiguration(ResourceServerConditionConfig.class) .run(assertConditionMatch(false)); @@ -33,8 +33,8 @@ void testResourceServerConditionWhenNoOAuth2ResourceDependency() { void testResourceServerConditionWhenApplicationTypeIsWebApplication() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.application-type=web_application") + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.application-type=web_application") .withUserConfiguration(ResourceServerConditionConfig.class) .run(assertConditionMatch(false)); } @@ -43,8 +43,8 @@ void testResourceServerConditionWhenApplicationTypeIsWebApplication() { void testResourceServerConditionWhenApplicationTypeIsResourceServer() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.application-type=resource_server") + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.application-type=resource_server") .withUserConfiguration(ResourceServerConditionConfig.class) .run(assertConditionMatch(true)); } @@ -53,8 +53,8 @@ void testResourceServerConditionWhenApplicationTypeIsResourceServer() { void testResourceServerConditionWhenApplicationTypeIsResourceServerWithOBO() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.application-type=resource_server_with_obo") + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.application-type=resource_server_with_obo") .withUserConfiguration(ResourceServerConditionConfig.class) .run(assertConditionMatch(true)); } @@ -63,8 +63,8 @@ void testResourceServerConditionWhenApplicationTypeIsResourceServerWithOBO() { void testResourceServerConditionWhenApplicationTypeIsWebApplicationAndResourceServer() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.application-type=web_application_and_resource_server") + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.application-type=web_application_and_resource_server") .withUserConfiguration(ResourceServerConditionConfig.class) .run(assertConditionMatch(true)); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/WebApplicationConditionTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/WebApplicationConditionTest.java index 643083700034..c087aafcdb30 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/WebApplicationConditionTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/conditions/WebApplicationConditionTest.java @@ -16,7 +16,7 @@ class WebApplicationConditionTest extends AbstractCondition { void testWebApplicationConditionWhenApplicationTypeIsEmpty() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id") + "spring.cloud.azure.active-directory.client-id = fake-client-id") .withUserConfiguration(WebApplicationConditionConfig.class) .run(assertConditionMatch(false)); } @@ -24,7 +24,7 @@ void testWebApplicationConditionWhenApplicationTypeIsEmpty() { @Test void testWebAppConditionWhenNoOAuth2ResourceDependency() { this.contextRunner - .withPropertyValues("azure.activedirectory.client-id = fake-client-id") + .withPropertyValues("spring.cloud.azure.active-directory.client-id = fake-client-id") .withClassLoader(new FilteredClassLoader(BearerTokenAuthenticationToken.class)) .withUserConfiguration(WebApplicationConditionConfig.class) .run(assertConditionMatch(true)); @@ -33,7 +33,7 @@ void testWebAppConditionWhenNoOAuth2ResourceDependency() { @Test void testWebAppConditionWhenNoOAuth2ClientDependency() { this.contextRunner - .withPropertyValues("azure.activedirectory.client-id = fake-client-id") + .withPropertyValues("spring.cloud.azure.active-directory.client-id = fake-client-id") .withClassLoader(new FilteredClassLoader(ClientRegistration.class)) .withUserConfiguration(WebApplicationConditionConfig.class) .run(assertConditionMatch(false)); @@ -43,8 +43,8 @@ void testWebAppConditionWhenNoOAuth2ClientDependency() { void testWebAppConditionWhenApplicationTypeIsWebApplication() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.application-type=web_application") + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.application-type=web_application") .withUserConfiguration(WebApplicationConditionConfig.class) .run(assertConditionMatch(true)); } @@ -53,8 +53,8 @@ void testWebAppConditionWhenApplicationTypeIsWebApplication() { void testWebAppConditionWhenApplicationTypeIsResourceServer() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.application-type=resource_server") + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.application-type=resource_server") .withUserConfiguration(WebApplicationConditionConfig.class) .run(assertConditionMatch(false)); } @@ -63,8 +63,8 @@ void testWebAppConditionWhenApplicationTypeIsResourceServer() { void testWebAppConditionWhenApplicationTypeIsResourceServerWithOBO() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.application-type=resource_server_with_obo") + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.application-type=resource_server_with_obo") .withUserConfiguration(WebApplicationConditionConfig.class) .run(assertConditionMatch(false)); } @@ -73,8 +73,8 @@ void testWebAppConditionWhenApplicationTypeIsResourceServerWithOBO() { void testWebAppConditionWhenApplicationTypeIsWebApplicationAndResourceServer() { this.contextRunner .withPropertyValues( - "azure.activedirectory.client-id = fake-client-id", - "azure.activedirectory.application-type=web_application_and_resource_server") + "spring.cloud.azure.active-directory.client-id = fake-client-id", + "spring.cloud.azure.active-directory.application-type=web_application_and_resource_server") .withUserConfiguration(WebApplicationConditionConfig.class) .run(assertConditionMatch(true)); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/AADAuthenticationFilterPropertiesTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/AADAuthenticationFilterPropertiesTest.java index 7547a01da883..297032b3772d 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/AADAuthenticationFilterPropertiesTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/AADAuthenticationFilterPropertiesTest.java @@ -23,12 +23,12 @@ import static org.springframework.test.context.support.TestPropertySourceUtils.addInlinedPropertiesToEnvironment; @TestInstance(TestInstance.Lifecycle.PER_CLASS) -class AADAuthenticationFilterPropertiesTest { +public class AADAuthenticationFilterPropertiesTest { - private static final String AAD_PROPERTY_PREFIX = "azure.activedirectory."; + private static final String AAD_PROPERTY_PREFIX = "spring.cloud.azure.active-directory."; @Test - void canSetProperties() { + public void canSetProperties() { try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext()) { configureAllRequiredProperties(context); context.register(Config.class); @@ -57,9 +57,9 @@ private void configureAllRequiredProperties(AnnotationConfigApplicationContext c @Disabled @Test //TODO (wepa) clientId and clientSecret can also be configured in oauth2 config, test to be refactored - void emptySettingsNotAllowed() { - System.setProperty("azure.activedirectory.client-id", ""); - System.setProperty("azure.activedirectory.client-secret", ""); + public void emptySettingsNotAllowed() { + System.setProperty("spring.cloud.azure.active-directory.client-id", ""); + System.setProperty("spring.cloud.azure.active-directory.client-secret", ""); try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext()) { Exception exception = null; @@ -81,10 +81,10 @@ void emptySettingsNotAllowed() { final List errorStrings = errors.stream().map(ObjectError::toString).collect(Collectors.toList()); final List errorStringsExpected = Arrays.asList( - "Field error in object 'azure.activedirectory' on field 'activeDirectoryGroups': " + "Field error in object 'spring.cloud.azure.active-directory' on field 'activeDirectoryGroups': " + "rejected value [null];", - "Field error in object 'azure.activedirectory' on field 'clientId': rejected value [];", - "Field error in object 'azure.activedirectory' on field 'clientSecret': rejected value [];" + "Field error in object 'spring.cloud.azure.active-directory' on field 'clientId': rejected value [];", + "Field error in object 'spring.cloud.azure.active-directory' on field 'clientSecret': rejected value [];" ); Collections.sort(errorStrings); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/AADAuthenticationFilterTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/AADAuthenticationFilterTest.java index 83c1d571498c..b844598e5b0d 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/AADAuthenticationFilterTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/AADAuthenticationFilterTest.java @@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -class AADAuthenticationFilterTest { +public class AADAuthenticationFilterTest { private static final String TOKEN = "dummy-token"; private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(AADAuthenticationFilterAutoConfiguration.class)); @@ -41,7 +41,7 @@ class AADAuthenticationFilterTest { private final HttpServletResponse response; private final AADAuthenticationFilter filter; - AADAuthenticationFilterTest() { + public AADAuthenticationFilterTest() { userPrincipalManager = mock(UserPrincipalManager.class); request = mock(HttpServletRequest.class); response = mock(HttpServletResponse.class); @@ -55,10 +55,10 @@ class AADAuthenticationFilterTest { //TODO (Zhou Liu): current test case is out of date, a new test case need to cover here, do it later. @Test @Disabled - void doFilterInternal() { - this.contextRunner.withPropertyValues("azure.activedirectory.client-id", TestConstants.CLIENT_ID) - .withPropertyValues("azure.activedirectory.client-secret", TestConstants.CLIENT_SECRET) - .withPropertyValues("azure.activedirectory.client-secret", + public void doFilterInternal() { + this.contextRunner.withPropertyValues("spring.cloud.azure.active-directory.client-id", TestConstants.CLIENT_ID) + .withPropertyValues("spring.cloud.azure.active-directory.client-secret", TestConstants.CLIENT_SECRET) + .withPropertyValues("spring.cloud.azure.active-directory.client-secret", TestConstants.TARGETED_GROUPS.toString() .replace("[", "").replace("]", "")); @@ -98,7 +98,7 @@ void doFilterInternal() { } @Test - void testTokenNotIssuedByAAD() throws ServletException, IOException { + public void testTokenNotIssuedByAAD() throws ServletException, IOException { when(userPrincipalManager.isTokenIssuedByAAD(TOKEN)).thenReturn(false); final FilterChain filterChain = (request, response) -> { @@ -112,7 +112,7 @@ void testTokenNotIssuedByAAD() throws ServletException, IOException { } @Test - void testAlreadyAuthenticated() throws ServletException, IOException, ParseException, JOSEException, + public void testAlreadyAuthenticated() throws ServletException, IOException, ParseException, JOSEException, BadJOSEException { final Authentication authentication = mock(Authentication.class); when(authentication.isAuthenticated()).thenReturn(true); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/ResourceRetrieverTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/ResourceRetrieverTest.java index 59dcd764e9a2..824cf7cf8726 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/ResourceRetrieverTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/filter/ResourceRetrieverTest.java @@ -19,8 +19,8 @@ class ResourceRetrieverTest { .withConfiguration(AutoConfigurations.of(AADAuthenticationFilterAutoConfiguration.class)) .withClassLoader(new FilteredClassLoader(BearerTokenAuthenticationToken.class)) .withPropertyValues( - "azure.activedirectory.client-id=fake-client-id", - "azure.activedirectory.client-secret=fake-client-secret"); + "spring.cloud.azure.active-directory.client-id=fake-client-id", + "spring.cloud.azure.active-directory.client-secret=fake-client-secret"); @Test void resourceRetrieverDefaultConfig() { @@ -40,9 +40,9 @@ void resourceRetrieverDefaultConfig() { void resourceRetriverIsConfigurable() { this.contextRunner .withPropertyValues( - "azure.activedirectory.jwt-connect-timeout=1234", - "azure.activedirectory.jwt-read-timeout=1234", - "azure.activedirectory.jwt-size-limit=123400") + "spring.cloud.azure.active-directory.jwt-connect-timeout=1234", + "spring.cloud.azure.active-directory.jwt-read-timeout=1234", + "spring.cloud.azure.active-directory.jwt-size-limit=123400") .run(context -> { assertThat(context).hasSingleBean(ResourceRetriever.class); final ResourceRetriever retriever = context.getBean(ResourceRetriever.class); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AADClientRegistrationRepositoryTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AADClientRegistrationRepositoryTest.java index 3ec5bfe0b185..e65cf4236566 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AADClientRegistrationRepositoryTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AADClientRegistrationRepositoryTest.java @@ -57,7 +57,7 @@ void noClientsConfiguredTest() { void azureClientConfiguredTest() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.authorization-clients.azure.scopes = Azure.Scope" + "spring.cloud.azure.active-directory.authorization-clients.azure.scopes = Azure.Scope" ) .run(context -> { AADClientRegistrationRepository repository = @@ -79,7 +79,7 @@ void azureClientConfiguredTest() { void graphClientConfiguredTest() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.authorization-clients.graph.scopes = Graph.Scope" + "spring.cloud.azure.active-directory.authorization-clients.graph.scopes = Graph.Scope" ) .run(context -> { AADClientRegistrationRepository repository = @@ -105,8 +105,8 @@ void graphClientConfiguredTest() { void onDemandGraphClientConfiguredTest() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.authorization-clients.graph.scopes = Graph.Scope", - "azure.activedirectory.authorization-clients.graph.on-demand = true" + "spring.cloud.azure.active-directory.authorization-clients.graph.scopes = Graph.Scope", + "spring.cloud.azure.active-directory.authorization-clients.graph.on-demand = true" ) .run(context -> { AADClientRegistrationRepository repository = @@ -133,8 +133,8 @@ void onDemandGraphClientConfiguredTest() { void clientWithClientCredentialsPermissions() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.authorization-clients.graph.scopes = fakeValue:/.default", - "azure.activedirectory.authorization-clients.graph.authorizationGrantType = client_credentials" + "spring.cloud.azure.active-directory.authorization-clients.graph.scopes = fakeValue:/.default", + "spring.cloud.azure.active-directory.authorization-clients.graph.authorizationGrantType = client_credentials" ) .run(context -> { ClientRegistrationRepository repository = context.getBean(ClientRegistrationRepository.class); @@ -149,8 +149,8 @@ void clientWithClientCredentialsPermissions() { void clientWhichIsNotAuthorizationCodeButOnDemandExceptionTest() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.authorization-clients.graph.authorizationGrantType = client_credentials", - "azure.activedirectory.authorization-clients.graph.on-demand = true" + "spring.cloud.azure.active-directory.authorization-clients.graph.authorizationGrantType = client_credentials", + "spring.cloud.azure.active-directory.authorization-clients.graph.on-demand = true" ) .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class)) @@ -181,7 +181,7 @@ void azureClientEndpointTest() { void customizeUriTest() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.base-uri = http://localhost/" + "spring.cloud.azure.active-directory.base-uri = http://localhost/" ) .run(context -> { ClientRegistrationRepository repository = context.getBean(ClientRegistrationRepository.class); @@ -207,7 +207,7 @@ void testNoGroupIdAndGroupNameConfigured() { @Test void testGroupNameConfigured() { webApplicationContextRunner() - .withPropertyValues("azure.activedirectory.user-group.allowed-group-names = group1, group2") + .withPropertyValues("spring.cloud.azure.active-directory.user-group.allowed-group-names = group1, group2") .run(context -> { ClientRegistrationRepository repository = context.getBean(ClientRegistrationRepository.class); ClientRegistration azure = repository.findByRegistrationId(AZURE_CLIENT_REGISTRATION_ID); @@ -222,7 +222,7 @@ void testGroupNameConfigured() { void testGroupIdConfigured() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.user-group.allowed-group-ids = 7c3a5d22-9093-42d7-b2eb-e72d06bf3718") + "spring.cloud.azure.active-directory.user-group.allowed-group-ids = 7c3a5d22-9093-42d7-b2eb-e72d06bf3718") .run(context -> { ClientRegistrationRepository repository = context.getBean(ClientRegistrationRepository.class); ClientRegistration azure = repository.findByRegistrationId(AZURE_CLIENT_REGISTRATION_ID); @@ -237,8 +237,8 @@ void testGroupIdConfigured() { void testGroupNameAndGroupIdConfigured() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.user-group.allowed-group-names = group1, group2", - "azure.activedirectory.user-group.allowed-group-ids = 7c3a5d22-9093-42d7-b2eb-e72d06bf3718") + "spring.cloud.azure.active-directory.user-group.allowed-group-names = group1, group2", + "spring.cloud.azure.active-directory.user-group.allowed-group-ids = 7c3a5d22-9093-42d7-b2eb-e72d06bf3718") .run(context -> { ClientRegistrationRepository repository = context.getBean(ClientRegistrationRepository.class); ClientRegistration azure = repository.findByRegistrationId(AZURE_CLIENT_REGISTRATION_ID); @@ -253,9 +253,9 @@ void testGroupNameAndGroupIdConfigured() { void haveResourceServerScopeInAccessTokenWhenThereAreMultiResourceServerScopesInAuthCode() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.authorization-clients.office.scopes = " + "spring.cloud.azure.active-directory.authorization-clients.office.scopes = " + "https://manage.office.com/ActivityFeed.Read", - "azure.activedirectory.authorization-clients.arm.scopes = " + "spring.cloud.azure.active-directory.authorization-clients.arm.scopes = " + "https://management.core.windows.net/user_impersonation" ) .run(context -> { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AADOAuth2ClientConfigurationTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AADOAuth2ClientConfigurationTest.java index 896edc561864..926048a37398 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AADOAuth2ClientConfigurationTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AADOAuth2ClientConfigurationTest.java @@ -35,7 +35,7 @@ void testWithoutAnyPropertiesSet() { @Test void testWithRequiredPropertiesSet() { oauthClientAndResourceServerRunner() - .withPropertyValues("azure.activedirectory.client-id=fake-client-id") + .withPropertyValues("spring.cloud.azure.active-directory.client-id=fake-client-id") .run(context -> { assertThat(context).hasSingleBean(AADAuthenticationProperties.class); assertThat(context).hasSingleBean(ClientRegistrationRepository.class); @@ -62,7 +62,7 @@ void testResourceServer() { @Test void testResourceServerWithOboOnlyGraphClient() { resourceServerWithOboContextRunner() - .withPropertyValues("azure.activedirectory.authorization-clients.graph.scopes=" + .withPropertyValues("spring.cloud.azure.active-directory.authorization-clients.graph.scopes=" + "https://graph.microsoft.com/User.Read") .run(context -> { final AADClientRegistrationRepository oboRepo = context.getBean( @@ -83,7 +83,7 @@ void testResourceServerWithOboOnlyGraphClient() { @Test void testResourceServerWithOboInvalidGrantType1() { resourceServerWithOboContextRunner() - .withPropertyValues("azure.activedirectory.authorization-clients.graph.authorization-grant-type=" + .withPropertyValues("spring.cloud.azure.active-directory.authorization-clients.graph.authorization-grant-type=" + "authorization_code") .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class)) @@ -93,9 +93,9 @@ void testResourceServerWithOboInvalidGrantType1() { @Test void testResourceServerWithOboInvalidGrantType2() { resourceServerWithOboContextRunner() - .withPropertyValues("azure.activedirectory.authorization-clients.graph.authorization-grant-type=" + .withPropertyValues("spring.cloud.azure.active-directory.authorization-clients.graph.authorization-grant-type=" + "on_behalf_of") - .withPropertyValues("azure.activedirectory.authorization-clients.graph.on-demand = true") + .withPropertyValues("spring.cloud.azure.active-directory.authorization-clients.graph.on-demand = true") .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class)) ); @@ -104,9 +104,9 @@ void testResourceServerWithOboInvalidGrantType2() { @Test void testResourceServerWithOboExistCustomAndGraphClient() { resourceServerWithOboContextRunner() - .withPropertyValues("azure.activedirectory.authorization-clients.graph.scopes=" + .withPropertyValues("spring.cloud.azure.active-directory.authorization-clients.graph.scopes=" + "https://graph.microsoft.com/User.Read") - .withPropertyValues("azure.activedirectory.authorization-clients.custom.scopes=" + .withPropertyValues("spring.cloud.azure.active-directory.authorization-clients.custom.scopes=" + "api://52261059-e515-488e-84fd-a09a3f372814/File.Read") .run(context -> { final AADClientRegistrationRepository oboRepo = context.getBean( diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/properties/AADAuthenticationPropertiesTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/properties/AADAuthenticationPropertiesTest.java index 263c5a6a49db..aac252cca6d7 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/properties/AADAuthenticationPropertiesTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/properties/AADAuthenticationPropertiesTest.java @@ -18,7 +18,7 @@ class AADAuthenticationPropertiesTest { void webAppWithOboWithExceptionTest() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.authorization-clients.graph.authorizationGrantType = on_behalf_of") + "spring.cloud.azure.active-directory.authorization-clients.graph.authorizationGrantType = on_behalf_of") .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class))); } @@ -34,7 +34,7 @@ void graphUriConfigurationTest() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.graph-base-uri=https://microsoftgraph.chinacloudapi.cn" + "spring.cloud.azure.active-directory.graph-base-uri=https://microsoftgraph.chinacloudapi.cn" ) .run(context -> { AADAuthenticationProperties properties = context.getBean(AADAuthenticationProperties.class); @@ -45,7 +45,7 @@ void graphUriConfigurationTest() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.graph-base-uri=https://microsoftgraph.chinacloudapi.cn/" + "spring.cloud.azure.active-directory.graph-base-uri=https://microsoftgraph.chinacloudapi.cn/" ) .run(context -> { AADAuthenticationProperties properties = context.getBean(AADAuthenticationProperties.class); @@ -56,7 +56,7 @@ void graphUriConfigurationTest() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.graph-membership-uri=https://graph.microsoft.com/v1.0/me/memberOf" + "spring.cloud.azure.active-directory.graph-membership-uri=https://graph.microsoft.com/v1.0/me/memberOf" ) .run(context -> { AADAuthenticationProperties properties = context.getBean(AADAuthenticationProperties.class); @@ -66,8 +66,8 @@ void graphUriConfigurationTest() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.graph-base-uri=https://microsoftgraph.chinacloudapi.cn/", - "azure.activedirectory.graph-membership-uri=https://microsoftgraph.chinacloudapi.cn/v1.0/me/memberOf" + "spring.cloud.azure.active-directory.graph-base-uri=https://microsoftgraph.chinacloudapi.cn/", + "spring.cloud.azure.active-directory.graph-membership-uri=https://microsoftgraph.chinacloudapi.cn/v1.0/me/memberOf" ) .run(context -> { AADAuthenticationProperties properties = context.getBean(AADAuthenticationProperties.class); @@ -81,7 +81,7 @@ void graphUriConfigurationTest() { void graphUriConfigurationWithExceptionTest() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.graph-membership-uri=https://microsoftgraph.chinacloudapi.cn/v1.0/me/memberOf" + "spring.cloud.azure.active-directory.graph-membership-uri=https://microsoftgraph.chinacloudapi.cn/v1.0/me/memberOf" ) .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class)) @@ -92,8 +92,8 @@ void graphUriConfigurationWithExceptionTest() { void multiTenantWithAllowedGroupsConfiguredTest1() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.tenant-id=", - "azure.activedirectory.user-group.allowed-groups=group1,group2" + "spring.cloud.azure.active-directory.tenant-id=", + "spring.cloud.azure.active-directory.user-group.allowed-groups=group1,group2" ) .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class)) @@ -104,8 +104,8 @@ void multiTenantWithAllowedGroupsConfiguredTest1() { void multiTenantWithAllowedGroupsConfiguredTest2() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.tenant-id=common", - "azure.activedirectory.user-group.allowed-groups=group1,group2" + "spring.cloud.azure.active-directory.tenant-id=common", + "spring.cloud.azure.active-directory.user-group.allowed-groups=group1,group2" ) .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class)) @@ -116,8 +116,8 @@ void multiTenantWithAllowedGroupsConfiguredTest2() { void multiTenantWithAllowedGroupsConfiguredTest3() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.tenant-id=organizations", - "azure.activedirectory.user-group.allowed-groups=group1,group2" + "spring.cloud.azure.active-directory.tenant-id=organizations", + "spring.cloud.azure.active-directory.user-group.allowed-groups=group1,group2" ) .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class)) @@ -128,8 +128,8 @@ void multiTenantWithAllowedGroupsConfiguredTest3() { void multiTenantWithAllowedGroupsIdConfiguredTest1() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.tenant-id=", - "azure.activedirectory.user-group.allowed-group-ids = 7c3a5d22-9093-42d7-b2eb-e72d06bf3718," + "spring.cloud.azure.active-directory.tenant-id=", + "spring.cloud.azure.active-directory.user-group.allowed-group-ids = 7c3a5d22-9093-42d7-b2eb-e72d06bf3718," + "39087533-2593-4b5b-ad05-4a73a01ea6a9" ) .run(context -> @@ -141,8 +141,8 @@ void multiTenantWithAllowedGroupsIdConfiguredTest1() { void multiTenantWithAllowedGroupsIdConfiguredTest2() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.tenant-id=common", - "azure.activedirectory.user-group.allowed-group-ids = 7c3a5d22-9093-42d7-b2eb-e72d06bf3718," + "spring.cloud.azure.active-directory.tenant-id=common", + "spring.cloud.azure.active-directory.user-group.allowed-group-ids = 7c3a5d22-9093-42d7-b2eb-e72d06bf3718," + "39087533-2593-4b5b-ad05-4a73a01ea6a9" ) .run(context -> @@ -154,8 +154,8 @@ void multiTenantWithAllowedGroupsIdConfiguredTest2() { void multiTenantWithAllowedGroupsIdConfiguredTest3() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.tenant-id=organizations", - "azure.activedirectory.user-group.allowed-group-ids = 7c3a5d22-9093-42d7-b2eb-e72d06bf3718," + "spring.cloud.azure.active-directory.tenant-id=organizations", + "spring.cloud.azure.active-directory.user-group.allowed-group-ids = 7c3a5d22-9093-42d7-b2eb-e72d06bf3718," + "39087533-2593-4b5b-ad05-4a73a01ea6a9" ) .run(context -> @@ -167,8 +167,8 @@ void multiTenantWithAllowedGroupsIdConfiguredTest3() { void multiTenantWithAllowedGroupsIdConfiguredTest4() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.tenant-id=consumers", - "azure.activedirectory.user-group.allowed-group-ids = 7c3a5d22-9093-42d7-b2eb-e72d06bf3718," + "spring.cloud.azure.active-directory.tenant-id=consumers", + "spring.cloud.azure.active-directory.user-group.allowed-group-ids = 7c3a5d22-9093-42d7-b2eb-e72d06bf3718," + "39087533-2593-4b5b-ad05-4a73a01ea6a9" ) .run(context -> @@ -180,8 +180,8 @@ void multiTenantWithAllowedGroupsIdConfiguredTest4() { void multiTenantWithAllowedGroupsConfiguredTest4() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.tenant-id=consumers", - "azure.activedirectory.user-group.allowed-groups=group1,group2" + "spring.cloud.azure.active-directory.tenant-id=consumers", + "spring.cloud.azure.active-directory.user-group.allowed-groups=group1,group2" ) .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class)) @@ -197,14 +197,14 @@ void applicationTypeOfWebApplication() { }); webApplicationContextRunner() - .withPropertyValues("azure.activedirectory.application-type=web_application") + .withPropertyValues("spring.cloud.azure.active-directory.application-type=web_application") .run(context -> { AADAuthenticationProperties properties = context.getBean(AADAuthenticationProperties.class); assertEquals(properties.getApplicationType(), AADApplicationType.WEB_APPLICATION); }); resourceServerWithOboContextRunner() - .withPropertyValues("azure.activedirectory.application-type=web_application") + .withPropertyValues("spring.cloud.azure.active-directory.application-type=web_application") .run(context -> { AADAuthenticationProperties properties = context.getBean(AADAuthenticationProperties.class); assertEquals(properties.getApplicationType(), AADApplicationType.WEB_APPLICATION); @@ -220,14 +220,14 @@ void applicationTypeWithResourceServer() { }); resourceServerContextRunner() - .withPropertyValues("azure.activedirectory.application-type=resource_server") + .withPropertyValues("spring.cloud.azure.active-directory.application-type=resource_server") .run(context -> { AADAuthenticationProperties properties = context.getBean(AADAuthenticationProperties.class); assertEquals(properties.getApplicationType(), AADApplicationType.RESOURCE_SERVER); }); resourceServerWithOboContextRunner() - .withPropertyValues("azure.activedirectory.application-type=resource_server") + .withPropertyValues("spring.cloud.azure.active-directory.application-type=resource_server") .run(context -> { AADAuthenticationProperties properties = context.getBean(AADAuthenticationProperties.class); assertEquals(properties.getApplicationType(), AADApplicationType.RESOURCE_SERVER); @@ -243,7 +243,7 @@ void applicationTypeOfResourceServerWithOBO() { }); resourceServerWithOboContextRunner() - .withPropertyValues("azure.activedirectory.application-type=resource_server_with_obo") + .withPropertyValues("spring.cloud.azure.active-directory.application-type=resource_server_with_obo") .run(context -> { AADAuthenticationProperties properties = context.getBean(AADAuthenticationProperties.class); assertEquals(properties.getApplicationType(), AADApplicationType.RESOURCE_SERVER_WITH_OBO); @@ -253,7 +253,7 @@ void applicationTypeOfResourceServerWithOBO() { @Test void applicationTypeWithWebApplicationAndResourceServer() { resourceServerWithOboContextRunner() - .withPropertyValues("azure.activedirectory.application-type=web_application_and_resource_server") + .withPropertyValues("spring.cloud.azure.active-directory.application-type=web_application_and_resource_server") .run(context -> { AADAuthenticationProperties properties = context.getBean(AADAuthenticationProperties.class); assertEquals(properties.getApplicationType(), AADApplicationType.WEB_APPLICATION_AND_RESOURCE_SERVER); @@ -263,13 +263,13 @@ void applicationTypeWithWebApplicationAndResourceServer() { @Test void testInvalidApplicationType() { resourceServerContextRunner() - .withPropertyValues("azure.activedirectory.application-type=web_application") + .withPropertyValues("spring.cloud.azure.active-directory.application-type=web_application") .run(context -> { assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class)); }); webApplicationContextRunner() - .withPropertyValues("azure.activedirectory.application-type=resource_server") + .withPropertyValues("spring.cloud.azure.active-directory.application-type=resource_server") .run(context -> { assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class)); }); @@ -279,9 +279,9 @@ void testInvalidApplicationType() { void invalidAuthorizationCodeWhenOnDemandIsFalse() { webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.authorization-clients.graph.scopes = Graph.Scope", - "azure.activedirectory.authorization-clients.graph.on-demand = true", - "azure.activedirectory.authorization-clients.graph.authorizationGrantType = azure_delegated" + "spring.cloud.azure.active-directory.authorization-clients.graph.scopes = Graph.Scope", + "spring.cloud.azure.active-directory.authorization-clients.graph.on-demand = true", + "spring.cloud.azure.active-directory.authorization-clients.graph.authorizationGrantType = azure_delegated" ) .run(context -> { assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class)); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapi/AADResourceServerPropertiesTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapi/AADResourceServerPropertiesTest.java index 835c80e6645b..7a010239975e 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapi/AADResourceServerPropertiesTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapi/AADResourceServerPropertiesTest.java @@ -26,9 +26,9 @@ void testNoPropertiesConfigured() { void testPropertiesConfigured() { resourceServerContextRunner() .withPropertyValues( - "azure.activedirectory.resource-server.principal-claim-name=fake-claim-name", - "azure.activedirectory.resource-server.claim-to-authority-prefix-map.fake-key-1=fake-value-1", - "azure.activedirectory.resource-server.claim-to-authority-prefix-map.fake-key-2=fake-value-2") + "spring.cloud.azure.active-directory.resource-server.principal-claim-name=fake-claim-name", + "spring.cloud.azure.active-directory.resource-server.claim-to-authority-prefix-map.fake-key-1=fake-value-1", + "spring.cloud.azure.active-directory.resource-server.claim-to-authority-prefix-map.fake-key-2=fake-value-2") .run(context -> { AADResourceServerProperties properties = context.getBean(AADResourceServerProperties.class); assertEquals(properties.getPrincipalClaimName(), "fake-claim-name"); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AADAccessTokenGroupRolesExtractionTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AADAccessTokenGroupRolesExtractionTest.java index de482370f914..f3be478b6fb3 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AADAccessTokenGroupRolesExtractionTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AADAccessTokenGroupRolesExtractionTest.java @@ -187,7 +187,7 @@ void testIllegalGroupIdParam() { WebApplicationContextRunnerUtils .webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.user-group.allowed-group-ids = all," + GROUP_ID_1 + "spring.cloud.azure.active-directory.user-group.allowed-group-ids = all," + GROUP_ID_1 ) .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AADAuthenticationProperties.class))); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AADOAuth2AuthorizationCodeGrantRequestEntityConverterTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AADOAuth2AuthorizationCodeGrantRequestEntityConverterTest.java index 71eea86b8c5e..d50cc2c78c6d 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AADOAuth2AuthorizationCodeGrantRequestEntityConverterTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AADOAuth2AuthorizationCodeGrantRequestEntityConverterTest.java @@ -32,10 +32,10 @@ private WebApplicationContextRunner getContextRunner() { return WebApplicationContextRunnerUtils .webApplicationContextRunner() .withPropertyValues( - "azure.activedirectory.base-uri = fake-uri", - "azure.activedirectory.authorization-clients.graph.scopes = Graph.Scope", - "azure.activedirectory.authorization-clients.arm.scopes = Arm.Scope", - "azure.activedirectory.authorization-clients.arm.on-demand = true"); + "spring.cloud.azure.active-directory.base-uri = fake-uri", + "spring.cloud.azure.active-directory.authorization-clients.graph.scopes = Graph.Scope", + "spring.cloud.azure.active-directory.authorization-clients.arm.scopes = Arm.Scope", + "spring.cloud.azure.active-directory.authorization-clients.arm.on-demand = true"); } @Test diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/resources/aad-backend-oauth2-minimum.properties b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/resources/aad-backend-oauth2-minimum.properties index 9a3d72052a36..46b306980240 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/resources/aad-backend-oauth2-minimum.properties +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/resources/aad-backend-oauth2-minimum.properties @@ -1,4 +1,4 @@ -azure.activedirectory.tenant-id=xxxxxx-your-tenant-id-xxxxxx -azure.activedirectory.client-id=xxxxxx-your-client-id-xxxxxx -azure.activedirectory.client-secret=xxxxxx-your-client-secret-xxxxxx -azure.activedirectory.user-group.allowed-groups=my-aad-group1, my-aad-group2 +spring.cloud.azure.active-directory.tenant-id=xxxxxx-your-tenant-id-xxxxxx +spring.cloud.azure.active-directory.client-id=xxxxxx-your-client-id-xxxxxx +spring.cloud.azure.active-directory.client-secret=xxxxxx-your-client-secret-xxxxxx +spring.cloud.azure.active-directory.user-group.allowed-groups=my-aad-group1, my-aad-group2