Fix group icon not displaying when validating groups (#141)

jenkinsci · Jun 15, 2021 · 34c2c5a · 34c2c5a
1 parent cb4560c
commit 34c2c5a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/com/microsoft/jenkins/azuread/AzureSecurityRealm.java b/src/main/java/com/microsoft/jenkins/azuread/AzureSecurityRealm.java
@@ -498,7 +498,7 @@ public SecurityComponents createSecurityComponents() {
             });
 
             if (azureAdUser == null) {
-                throw new UserMayOrMayNotExistException2("Cannot find user: " + username);
+                throw new UsernameNotFoundException("Cannot find user: " + username);
             }
 
             return azureAdUser;
@@ -510,6 +510,10 @@ public SecurityComponents createSecurityComponents() {
      */
     @Override
     public GroupDetails loadGroupByGroupname2(String groupName, boolean fetchMembers) {
+        if (isDisableGraphIntegration()) {
+            throw new UserMayOrMayNotExistException2("Can't lookup a group if graph integration is disabled");
+        }
+
         GraphServiceClient<Request> azureClient = getAzureClient();
 
         String groupId = ObjId2FullSidMap.extractObjectId(groupName);