- rename method (Azure#18163)

luishiga · Dec 16, 2020 · 879fde7 · 879fde7
1 parent 9346994
commit 879fde7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/...pring-boot/src/main/java/com/azure/spring/aad/webapp/AzureAuthorizedClientRepository.java b/...pring-boot/src/main/java/com/azure/spring/aad/webapp/AzureAuthorizedClientRepository.java
@@ -49,7 +49,7 @@ public <T extends OAuth2AuthorizedClient> T loadAuthorizedClient(String id,
             return (T) result;
         }
 
-        if (repo.isAuthzClient(id)) {
+        if (repo.isClientNeedConsentWhenLogin(id)) {
             OAuth2AuthorizedClient client = loadAuthorizedClient(defaultClientRegistrationId(), principal, request);
             return (T) createInitAuthzClient(client, id, principal);
         }

diff --git a/...ing-boot/src/main/java/com/azure/spring/aad/webapp/AzureClientRegistrationRepository.java b/...ing-boot/src/main/java/com/azure/spring/aad/webapp/AzureClientRegistrationRepository.java
@@ -57,15 +57,15 @@ public AzureClientRegistration getAzureClient() {
         return azureClient;
     }
 
-    public boolean isAuthzClient(ClientRegistration client) {
+    public boolean isClientNeedConsentWhenLogin(ClientRegistration client) {
         return otherClients.contains(client)
             && properties.getAuthorization().get(client.getClientName()) != null
             && !properties.getAuthorization().get(client.getClientName()).isOnDemand();
     }
 
-    public boolean isAuthzClient(String id) {
+    public boolean isClientNeedConsentWhenLogin(String id) {
         ClientRegistration client = findByRegistrationId(id);
-        return client != null && isAuthzClient(client);
+        return client != null && isClientNeedConsentWhenLogin(client);
     }
 
 }
diff --git a/...boot/src/test/java/com/azure/spring/aad/webapp/AzureActiveDirectoryConfigurationTest.java b/...boot/src/test/java/com/azure/spring/aad/webapp/AzureActiveDirectoryConfigurationTest.java
@@ -138,10 +138,10 @@ public void aadAwareClientRepository() {
                 );
                 assertEquals(clientRepo.getAzureClient().getClient(), azure);
 
-                assertFalse(clientRepo.isAuthzClient(azure));
-                assertTrue(clientRepo.isAuthzClient(graph));
-                assertFalse(clientRepo.isAuthzClient("azure"));
-                assertTrue(clientRepo.isAuthzClient("graph"));
+                assertFalse(clientRepo.isClientNeedConsentWhenLogin(azure));
+                assertTrue(clientRepo.isClientNeedConsentWhenLogin(graph));
+                assertFalse(clientRepo.isClientNeedConsentWhenLogin("azure"));
+                assertTrue(clientRepo.isClientNeedConsentWhenLogin("graph"));
 
                 List<ClientRegistration> clients = collectClients(clientRepo);
                 assertEquals(2, clients.size());
@@ -217,10 +217,10 @@ public void clientRequiresOnDemandPermissions() {
                     "offline_access",
                     "https://management.core.windows.net/user_impersonation");
 
-                assertFalse(repo.isAuthzClient(graph));
-                assertTrue(repo.isAuthzClient(arm));
-                assertFalse(repo.isAuthzClient("graph"));
-                assertTrue(repo.isAuthzClient("arm"));
+                assertFalse(repo.isClientNeedConsentWhenLogin(graph));
+                assertTrue(repo.isClientNeedConsentWhenLogin(arm));
+                assertFalse(repo.isClientNeedConsentWhenLogin("graph"));
+                assertTrue(repo.isClientNeedConsentWhenLogin("arm"));
             });
     }