commit 3e88cb1a4853a23463523b446306a9920d1fc566
author Michael Russo <mrusso@apigee.com> Tue Sep 06 18:53:38 2016 -0700
committer Michael Russo <mrusso@apigee.com> Tue Sep 06 18:53:38 2016 -0700
tree eabfccc7e63ac6e6358557eb730e9e04ce908d36
parent aa6e5dbafec41c7a5a2bbb6909b85f63b1b5c09c

Fix issue with admin user confirmation flag not working when trying to disable emails.

stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java

diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index 21c6983..84b573b 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -2647,14 +2647,16 @@
 
 
     public void sendAdminUserConfirmationEmail( UUID organizationId, UserInfo user ) throws Exception {
-        String token = getConfirmationTokenForAdminUser(user.getUuid(), 0, organizationId);
-        OrganizationConfig orgConfig = organizationId != null ?
+        if (properties.newAdminUsersRequireConfirmation()) {
+            String token = getConfirmationTokenForAdminUser(user.getUuid(), 0, organizationId);
+            OrganizationConfig orgConfig = organizationId != null ?
                 getOrganizationConfigByUuid(organizationId) : getOrganizationConfigForUserInfo(user);
-        String confirmation_url = orgConfig.getFullUrl(WorkflowUrl.ADMIN_CONFIRMATION_URL, user.getUuid().toString()) +
+            String confirmation_url = orgConfig.getFullUrl(WorkflowUrl.ADMIN_CONFIRMATION_URL, user.getUuid().toString()) +
                 "?token=" + token;
-        sendAdminUserEmail( user, "User Account Confirmation: " + user.getEmail(),
-                emailMsg( hashMap( "confirm_email", user.getEmail() ).map( "confirmation_url", confirmation_url ),
-                        PROPERTIES_EMAIL_ADMIN_CONFIRMATION ) );
+            sendAdminUserEmail(user, "User Account Confirmation: " + user.getEmail(),
+                emailMsg(hashMap("confirm_email", user.getEmail()).map("confirmation_url", confirmation_url),
+                    PROPERTIES_EMAIL_ADMIN_CONFIRMATION));
+        }
     }