bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-13 06:43:35 +00:00
Code Issues Releases Wiki Activity

misc fixes

Browse Source
This commit is contained in:
Kyle Spearrin
2017-07-12 13:38:06 -04:00
parent 13fbfc43f9
commit 81ad214f2f
6 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/services/loginService.js
View File

@@ -383,7 +383,7 @@ function initLoginService() {
});
},
function (response) {
handleError(response, deferred);
handleErrorMessage(response, deferred);
});
});
};
@@ -435,7 +435,7 @@ function initLoginService() {
deferred.resolve();
});
}, function (response) {
handleError(response, deferred);
handleErrorMessage(response, deferred);
});
return deferred.promise;
@@ -444,4 +444,20 @@ function initLoginService() {
function handleError(error, deferred) {
deferred.reject(error);
}
function handleErrorMessage(error, deferred) {
if (error.validationErrors) {
for (var key in error.validationErrors) {
if (!error.validationErrors.hasOwnProperty(key)) {
continue;
}
if (error.validationErrors[key].length) {
deferred.reject(error.validationErrors[key][0]);
return;
}
}
}
deferred.reject(error.message);
return;
}
};