Address an edge case where an admin user may be created unactivated a…

…nd approvals aren't necessary. Just set that user to activated.
Gab-Harmon · Aug 13, 2012 · d1c36e5 · d1c36e5
1 parent bcf602f
commit d1c36e5
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java b/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -730,7 +730,7 @@ public UserInfo createAdminUser(String username, String name, String email,
         user.setUsername(username);
         user.setName(name);
         user.setEmail(email);
-        user.setActivated(activated); // sdg - added
+        user.setActivated(activated);
         user.setConfirmed(!newAdminUsersRequireConfirmation()); // only
                                                                 // hardcoded
                                                                 // param now
@@ -1946,8 +1946,11 @@ public void startAdminUserActivationFlow(UserInfo user) throws Exception {
                 sendAdminUserConfirmationEmail(user);
             } else if (newAdminUsersNeedSysAdminApproval()) {
                 sendSysAdminRequestAdminActivationEmail(user);
+            } else {
+              // sdg: There seems to be a hole in the logic. The user has been created
+              // in an inactive state but nobody is being notified.
+              activateAdminUser(user.getUuid());
             }
-            // sdg: else... anything?
         }
     }