restore password detailed errors

Author: taleksashina

src/main/java/authentication/web/AuthenticationServlet.java

@@ -33,6 +33,7 @@
  * Error codes:
  * 1 - user already exists (during user registration, user with the same name or e-mail already exists)
  * 2 - incorrect old password (change password)
+ * 3 - user doesn't exists (in restore password)
  */
 public class AuthenticationServlet extends HttpServlet {
   /**
@@ -215,8 +216,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       try {
         userProfile = frameworkUserManager.getUserProfile(username);
         if (userProfile == null) {
-          response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "User profile "
-              + username + " not found");
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+            out.print("{\"code\" : \"3\", \"message\" : \"User doesn't exists\"}");
+            return;
         }
         // change password
         String password = new RandomStringGenerator().generateBasic(6);

src/main/webapp/i18n/resources-locale_en.json

@@ -1934,6 +1934,11 @@
         "value":"Incorrect old password",
         "description":"change password error: incorrect old password"
     },
+    {
+        "key":"_user-not-exists_",
+        "value":"User doesn't exists",
+        "description":"if user was not found by name, for example, in restore password dialog"
+    },
 
 
     {

src/main/webapp/i18n/resources-locale_ru.json

@@ -1932,6 +1932,11 @@
         "value":"Неверно указан старый пароль",
         "description":"change password error: incorrect old password"
     },
+    {
+        "key":"_user-not-exists_",
+        "value":"Пользователь с указанным именем не найден",
+        "description":"if user was not found by name, for example, in restore password dialog"
+    },
 
 
     {

src/main/webapp/js/login-controller.js

@@ -98,7 +98,11 @@ function LoginCtrl($scope, flash, AccountService, LoginService, ServerErrorRespo
                 flash.success = response.data.message;
             }, function(response) {
             	$scope.close('#modalRestorePassword');
-                flash.error = ServerErrorResponse.getMessage(response.status);
+                if (response.status==500 && response.data) {
+                    flash.error = AuthenticationErrorResponse.getMessage(parseInt(response.data.code));
+                } else {
+                    flash.error = ServerErrorResponse.getMessage(response.status);
+                }
             });
     };
 

src/main/webapp/js/services/services.js

@@ -213,6 +213,9 @@ module.factory('AuthenticationErrorResponse', function(localize) {
                 case 2:
                     errorText = localize.getLocalizedString("_incorrect-old-password-error_");
                     break;
+                case 3:
+                    errorText = localize.getLocalizedString("_user-not-exists_");
+                    break;
                 default:
                     errorText = code;
             };