From d1c36e50c4e706c420c5a1c3c4ae2fc730c7cf90 Mon Sep 17 00:00:00 2001
From: Scott Ganyo <sganyo@apigee.com>
Date: Mon, 13 Aug 2012 09:10:49 -0700
Subject: [PATCH] Address an edge case where an admin user may be created
 unactivated and approvals aren't necessary. Just set that user to activated.

---
 .../management/cassandra/ManagementServiceImpl.java        | 7 +++++--
 1 file changed, 5 insertions(+), 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
index e40c3ddce..661e27a32 100644
--- 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?
         }
     }