Merge pull request #1371 from vitorbaptista/feature/show_admins_the_p…

…assword_reset_link Change: display user's password reset link to the admin when mail server disabled
getredash · Nov 20, 2016 · 3b7f167 · 3b7f167
2 parents a951034 + 3ca78be
commit 3b7f167
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/rd_ui/app/scripts/controllers/users.js b/rd_ui/app/scripts/controllers/users.js
@@ -302,9 +302,9 @@
 
     $scope.sendPasswordReset = function() {
       $scope.disablePasswordResetButton = true;
-      $http.post('api/users/' + $scope.user.id + '/reset_password').success(function(user) {
+      $http.post('api/users/' + $scope.user.id + '/reset_password').success(function(data) {
         $scope.disablePasswordResetButton = false;
-        growl.addSuccessMessage("The user should receive a link to reset his password by email soon.")
+        $scope.passwordResetLink = data.reset_link;
       });
     };
   };

diff --git a/rd_ui/app/views/users/show.html b/rd_ui/app/views/users/show.html
@@ -24,9 +24,22 @@ <h3 class="p-l-5">{{user.name}}</h3>
     </p>
     <div ng-if="currentUser.isAdmin">
       <hr/>
-      <button class="btn btn-default" ng-click="sendPasswordReset()" ng-disabled="disablePasswordResetButton">Send
-        Password Reset Email
-      </button>
+      <div class="form-group">
+        <button class="btn btn-default" ng-click="sendPasswordReset()" ng-disabled="disablePasswordResetButton">Send
+          Password Reset Email
+        </button>
+      </div>
+
+      <div ng-if="passwordResetLink" class="alert alert-success">
+        <p ng-if="!clientConfig.mailSettingMissing">
+          <strong>The user should receive a link to reset his password by email soon.</strong>
+        </p>
+        <p ng-if="clientConfig.mailSettingsMissing">
+          You don't have mail server configured, please send the following link
+          to {{user.name}} to reset their password:<br/>
+          <a ng-href="passwordResetLink">{{passwordResetLink}}</a>
+        </p>
+      </div>
     </div>
   </div>
   <div ng-show="selectedTab == 'apiKey'" class="p-10">

diff --git a/redash/handlers/users.py b/redash/handlers/users.py
@@ -74,6 +74,10 @@ def post(self, user_id):
         user = models.User.get_by_id_and_org(user_id, self.current_org)
         reset_link = send_password_reset_email(user)
 
+        return {
+            'reset_link': reset_link,
+        }
+
 
 class UserResource(BaseResource):
     def get(self, user_id):