Skip to content

Fix error in AzureActiveDirectoryConfiguration.allScopes() #17840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenrujun merged 2 commits into from
Nov 27, 2020
Merged

Fix error in AzureActiveDirectoryConfiguration.allScopes() #17840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09d4680
Fix error in AzureActiveDirectoryConfiguration.allScopes()
rujche Nov 26, 2020
714a012
Fix test failure.
rujche Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions .../test/java/com/azure/spring/aad/implementation/AzureActiveDirectoryConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,17 @@ public void clientRegistered() {
assertEquals("fake-client-secret", azure.getClientSecret());

AuthorizationServerEndpoints endpoints = new AuthorizationServerEndpoints();
assertEquals(endpoints.authorizationEndpoint("fake-tenant-id"), azure.getProviderDetails().getAuthorizationUri());
assertEquals(endpoints.authorizationEndpoint("fake-tenant-id"),
azure.getProviderDetails().getAuthorizationUri());
assertEquals(endpoints.tokenEndpoint("fake-tenant-id"), azure.getProviderDetails().getTokenUri());
assertEquals(endpoints.jwkSetEndpoint("fake-tenant-id"), azure.getProviderDetails().getJwkSetUri());
assertEquals("{baseUrl}/login/oauth2/code/{registrationId}", azure.getRedirectUriTemplate());
assertDefaultScopes(azure, "openid", "profile");
assertDefaultScopes(
azure,
"openid",
"profile",
"https://graph.microsoft.com/Directory.AccessAsUser.All",
"https://graph.microsoft.com/User.Read");
}
}

Expand All @@ -50,7 +56,14 @@ public void clientRequiresPermissionRegistered() {
ClientRegistration graph = repo.findByRegistrationId("graph");

assertNotNull(azure);
assertDefaultScopes(azure, "openid", "profile", "offline_access", "Calendars.Read");
assertDefaultScopes(
azure,
"openid",
"profile",
"https://graph.microsoft.com/Directory.AccessAsUser.All",
"https://graph.microsoft.com/User.Read",
"offline_access",
"Calendars.Read");

assertNotNull(graph);
assertDefaultScopes(graph, "Calendars.Read");
Expand All @@ -73,6 +86,8 @@ public void clientRequiresMultiPermissions() {
azure,
"openid",
"profile",
"https://graph.microsoft.com/Directory.AccessAsUser.All",
"https://graph.microsoft.com/User.Read",
"offline_access",
"Calendars.Read",
"https://management.core.windows.net/user_impersonation");
Expand All @@ -92,7 +107,14 @@ public void clientRequiresPermissionInDefaultClient() {
ClientRegistration azure = repo.findByRegistrationId("azure");

assertNotNull(azure);
assertDefaultScopes(azure, "openid", "profile", "offline_access", "Calendars.Read");
assertDefaultScopes(
azure,
"openid",
"profile",
"https://graph.microsoft.com/Directory.AccessAsUser.All",
"https://graph.microsoft.com/User.Read",
"offline_access",
"Calendars.Read");
}
}

Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/azure/spring/aad/implementation/AzureActiveDirectoryConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ private AzureClientRegistration createDefaultClient() {
}

private Set<String> allScopes() {
Set<String> result = openidScopes();
Set<String> result = accessTokenScopes();
for (AuthorizationProperties authProperties : properties.getAuthorization().values()) {
result.addAll(authProperties.getScopes());
}
Expand Down