Skip to content

Commit f270af3

Browse files
authored
1 parent 3ec2094 commit f270af3

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/properties/AadAuthenticationProperties.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -664,8 +664,7 @@ private void validateAuthorizationGrantType(String registrationId, Authorization
664664
+ " is valid.", registrationId);
665665
}
666666

667-
if (AZURE_CLIENT_REGISTRATION_ID.equals(registrationId)
668-
&& AUTHORIZATION_CODE != grantType) {
667+
if (AZURE_CLIENT_REGISTRATION_ID.equals(registrationId) && !AUTHORIZATION_CODE.equals(grantType)) {
669668
throw new IllegalStateException("spring.cloud.azure.active-directory.authorization-clients."
670669
+ AZURE_CLIENT_REGISTRATION_ID
671670
+ ".authorization-grant-type must be configured to 'authorization_code'.");

sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/properties/AadAuthenticationPropertiesTests.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,29 @@ void applicationTypeWithWebApplicationAndResourceServer() {
377377
});
378378
}
379379

380+
@Test
381+
void applicationTypeWithWebApplicationAndResourceServerWithWrongAuthorizationGrantTypeConfigured() {
382+
resourceServerWithOboContextRunner()
383+
.withPropertyValues(
384+
"spring.cloud.azure.active-directory.application-type=web_application_and_resource_server",
385+
"spring.cloud.azure.active-directory.authorization-clients.azure.authorization-grant-type=client_credential"
386+
)
387+
.run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AadAuthenticationProperties.class)));
388+
}
389+
390+
@Test
391+
void applicationTypeWithWebApplicationAndResourceServerWithRightAuthorizationGrantTypeConfigured() {
392+
resourceServerWithOboContextRunner()
393+
.withPropertyValues(
394+
"spring.cloud.azure.active-directory.application-type=web_application_and_resource_server",
395+
"spring.cloud.azure.active-directory.authorization-clients.azure.authorization-grant-type=authorization_code"
396+
)
397+
.run(context -> {
398+
AadAuthenticationProperties properties = context.getBean(AadAuthenticationProperties.class);
399+
assertEquals(properties.getApplicationType(), AadApplicationType.WEB_APPLICATION_AND_RESOURCE_SERVER);
400+
});
401+
}
402+
380403
@Test
381404
void testInvalidApplicationType() {
382405
resourceServerContextRunner()

0 commit comments

Comments
 (0)