Fix bug with change password (#16)

* Fix several bugs with changing passwords * Increase pom version
pavel-luhin · Apr 11, 2018 · 86baf8c · 86baf8c
1 parent 0c54d55
commit 86baf8c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>by.bsu.rfe</groupId>
   <artifactId>sms-server</artifactId>
-  <version>1.3.5</version>
+  <version>1.3.6</version>
 
   <packaging>war</packaging>
 

diff --git a/src/main/webapp/resources/sms-server/modal/change-password/change-password.controller.js b/src/main/webapp/resources/sms-server/modal/change-password/change-password.controller.js
@@ -11,8 +11,12 @@
         $scope.selected.credentials = {};
 
         $scope.changePassword = function (oldPassword, newPassword, anotherNewPassword) {
-            if (!oldPassword || !newPassword || !anotherNewPassword || newPassword != anotherNewPassword) {
-
+            if (!oldPassword ||
+                !newPassword ||
+                !anotherNewPassword ||
+                newPassword !== anotherNewPassword ||
+                newPassword === oldPassword
+            ) {
                 toaster.pop({
                     type: 'error',
                     title: 'Error',

diff --git a/src/main/webapp/resources/sms-server/modal/change-password/change-password.service.js b/src/main/webapp/resources/sms-server/modal/change-password/change-password.service.js
@@ -12,7 +12,7 @@
         };
 
         function changePassword(password) {
-            return $http.post(RestURLFactory.CHANGE_PASSWORD, passObj);
+            return $http.post(RestURLFactory.CHANGE_PASSWORD, password);
         }
     }
 })();