commit 173be8a4b968eda617f73a3baf05fa7870594657
author Mike Dunker <mdunker@google.com> Fri Sep 22 14:51:55 2017 -0700
committer Mike Dunker <mdunker@google.com> Tue Sep 26 08:09:04 2017 -0700
tree 2d5e64afb5686783490fff2a8a6bc055457a18e8
parent 7f40d685401397b44e2026ac6bd3af446c02ddbd

add reset_url as field in admin confirmation email

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 2302d8d..ab93563 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
@@ -2680,10 +2680,17 @@
             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()) + "?token=" + token;
+            String confirmation_url = orgConfig.getFullUrl(WorkflowUrl.ADMIN_CONFIRMATION_URL, user.getUuid().toString()) +
+                "?token=" + token;
+
+            String reset_token = getPasswordResetTokenForAdminUser( user.getUuid(), 0, organizationId );
+            String resetPropertyUrl = orgConfig.getFullUrlTemplate(WorkflowUrl.ADMIN_RESETPW_URL);
+            String reset_url = String.format(resetPropertyUrl, user.getUuid().toString())
+                + "?token=" + reset_token;
+
             sendAdminUserEmail(user, "User Account Confirmation: " + user.getEmail(),
-                emailMsg(hashMap("confirm_email", user.getEmail()).map("confirmation_url", confirmation_url),
+                emailMsg(hashMap("confirm_email", user.getEmail()).map("confirmation_url", confirmation_url)
+                    .map("reset_url", reset_url),
                     PROPERTIES_EMAIL_ADMIN_CONFIRMATION));
     }