Merge pull request pencilblue#1126 from pencilblue/issue1109

fixes pencilblue#1109 - reset password in angular
techxbase · Aug 17, 2016 · 1e97d4d · 1e97d4d
2 parents a7692f4 + 133154b
commit 1e97d4d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/plugins/pencilblue/controllers/user/change_password.js b/plugins/pencilblue/controllers/user/change_password.js
@@ -61,10 +61,11 @@ module.exports = function (pb) {
                 return self.redirect('/', cb);
             }
 
-
-            var uiEntities = ClientJs.getAngularObjects(ChangePasswordFormController.gatherNavData(self.ls));
+            var uiEntities = ChangePasswordFormController.gatherNavData(self.ls);
+            uiEntities.resetPassword = self.session.authentication.reset_password || false;
+            var angularObjects = ClientJs.getAngularObjects(uiEntities);
             self.setPageName(self.ls.g('users.CHANGE_PASSWORD'));
-            self.ts.registerLocal('angular_objects', new pb.TemplateValue(uiEntities, false));
+            self.ts.registerLocal('angular_objects', new pb.TemplateValue(angularObjects, false));
             self.ts.load('user/change_password', function(err, result) {
 
                 cb({content: result});

diff --git a/plugins/pencilblue/templates/angular/user/change_password.html b/plugins/pencilblue/templates/angular/user/change_password.html
@@ -2,30 +2,30 @@
 <script type="text/javascript" src="/js/angular/services/password.js"></script>
 <script type="text/javascript">
 angular.module('pencilblueApp', ['validation', 'password'])
-.controller('PencilBlueController', function($scope, $http, validationService, passwordService) {
+.controller('PencilBlueController', function($scope, $http, $window, validationService, passwordService) {
   ^angular_objects^
   ^tmp_angular=admin=elements=is_field_valid^
 
   $scope.userPassword = {};
 
   $scope.checkPasswordMatch = function() {
     $scope.passwordMatch = passwordService.checkPasswordMatch($scope.userPassword.new_password, $scope.userPassword.confirm_password);
-  }
+  };
 
   $scope.generatePassword = function() {
     $scope.passwordGenerated = true;
     $scope.userPassword.new_password = passwordService.generatePassword();
     $scope.userPassword.confirm_password = $scope.userPassword.new_password.toString();
     $scope.checkPasswordMatch();
-  }
+  };
 
   $scope.resetPasswordGenerated = function() {
     $scope.passwordGenerated = false;
-  }
+  };
 
   $scope.getPasswordInputType = function() {
     return $scope.passwordGenerated ? 'text' : 'password';
-  }
+  };
 
   $scope.savePassword = function() {
     $scope.formSubmitted = true;
@@ -42,6 +42,9 @@
       $scope.saving = false;
       $scope.formSubmitted = false;
       $scope.userPassword = {};
+      if ($scope.resetPassword) {
+        $window.location = '/actions/logout';
+      }
     })
     .error(function(error, status) {
       $scope.errorMessage = error.message;

diff --git a/plugins/pencilblue/templates/user/change_password.html b/plugins/pencilblue/templates/user/change_password.html
@@ -7,7 +7,7 @@
       <fieldset>
         <div class="tab-content">
           <div class="tab-pane active" id="password">
-            <div class="form-group" ng-class="{'has-error': !isFieldValid(changePasswordForm.current_password)}">
+            <div class="form-group" ng-class="{'has-error': !isFieldValid(changePasswordForm.current_password)}" ng-if="!resetPassword">
               <label>^loc_CURRENT_PASSWORD^</label>
               <input type="password" name="current_password" class="form-control" ng-model="userPassword.current_password" required></input>
               <div class="form_error" ng-if="!isFieldValid(changePasswordForm.current_password)">^loc_REQUIRED_FIELD^</div>