|
11 | 11 | vm.$stateParams = $stateParams;
|
12 | 12 | vm.passwordReset = false;
|
13 | 13 | vm.currentPasswordDefaultPlaceholder = "Password";
|
14 |
| - vm.loginErrors = {}; |
| 14 | + vm.loginErrors = { |
| 15 | + USERNAME_NONEXISTANT: false, |
| 16 | + WRONG_PASSWORD: false, |
| 17 | + SOCIAL_LOGIN_ERROR: false |
| 18 | + }; |
15 | 19 |
|
16 | 20 | vm.login = login;
|
17 | 21 | vm.socialLogin = socialLogin;
|
|
28 | 32 | }
|
29 | 33 |
|
30 | 34 | function login() {
|
31 |
| - vm.loginErrors['username-nonexistant'] = false; |
32 |
| - vm.loginErrors['wrong-password'] = false; |
| 35 | + vm.loginErrors.USERNAME_NONEXISTANT = false; |
| 36 | + vm.loginErrors.WRONG_PASSWORD = false; |
33 | 37 |
|
34 | 38 | // TODO ideally it should be done by dedicated directive to handle all outside clicks
|
35 | 39 | mainVm.menuVisible = false;
|
|
44 | 48 | UserService.validateUserEmail(vm.username).then(function(data) {
|
45 | 49 | if (data.valid) {
|
46 | 50 | // email doesn't exist
|
47 |
| - vm.loginErrors['username-nonexistant'] = true; |
| 51 | + vm.loginErrors.USERNAME_NONEXISTANT = true; |
48 | 52 | } else {
|
49 | 53 | _doLogin(vm.username, vm.currentPassword);
|
50 | 54 | }
|
51 | 55 | }).catch(function(resp) {
|
52 | 56 | // TODO handle error
|
53 | 57 | // assume email exists, login would in any case if it didn't
|
54 |
| - vm.loginErrors['username-nonexistant'] = false; |
| 58 | + vm.loginErrors.USERNAME_NONEXISTANT = false; |
55 | 59 | _doLogin(vm.username, vm.currentPassword);
|
56 | 60 | });
|
57 | 61 | } else {
|
|
62 | 66 | UserService.validateUserHandle(vm.username).then(function(data) {
|
63 | 67 | if (data.valid) {
|
64 | 68 | // username doesn't exist
|
65 |
| - vm.loginErrors['username-nonexistant'] = true; |
| 69 | + vm.loginErrors.USERNAME_NONEXISTANT = true; |
66 | 70 | } else {
|
67 | 71 | _doLogin(vm.username, vm.currentPassword);
|
68 | 72 | }
|
|
92 | 96 | break;
|
93 | 97 | case "UNKNOWN_ERROR":
|
94 | 98 | default:
|
95 |
| - vm.loginErrors['wrong-password'] = true; |
| 99 | + vm.loginErrors.WRONG_PASSWORD = true; |
96 | 100 | vm.password = '';
|
97 | 101 | }
|
98 | 102 | });
|
|
120 | 124 | case "USER_NOT_REGISTERED":
|
121 | 125 | default:
|
122 | 126 | vm.socialLoginError = 401;
|
123 |
| - vm.loginErrors['social-login-error'] = true; |
| 127 | + vm.loginErrors.SOCIAL_LOGIN_ERROR = true; |
124 | 128 | break;
|
125 | 129 | }
|
126 | 130 | });
|
|
0 commit comments