diff options
| author | Alexander Filippov <a.filippov@yadro.com> | 2018-03-20 10:42:26 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-27 12:10:56 +0000 |
| commit | 0e480f5591bbd87c6c2db97308d97f6bfdba39f5 (patch) | |
| tree | ff9598cca696622658796bbd7eb594a9135bae94 /app/common/services | |
| parent | 74b05409417c71855edb2692b429465507ba0a64 (diff) | |
| download | phosphor-webui-0e480f5591bbd87c6c2db97308d97f6bfdba39f5.tar.gz phosphor-webui-0e480f5591bbd87c6c2db97308d97f6bfdba39f5.zip | |
Show error message received from server side
When an error occurs during authorization, display the error message
received from server side instead hardcoded message.
Partially resolves openbmc/openbmc#2974
Resolves openbmc/openbmc#3024
Tested: Enter invalid username or password and verify error message
Change-Id: I91ca29d5a69e12e12ce490ce3206173de7d41f09
Signed-off-by: Alexander Filippov <a.filippov@yadro.com>
Diffstat (limited to 'app/common/services')
| -rw-r--r-- | app/common/services/userModel.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/common/services/userModel.js b/app/common/services/userModel.js index f82c1f1..43437c5 100644 --- a/app/common/services/userModel.js +++ b/app/common/services/userModel.js @@ -22,8 +22,15 @@ window.angular && (function (angular) { || response.status === undefined)){ sessionStorage.setItem('LOGIN_ID', username); callback(true); + }else if(response && response.data && response.data.data + && response.data.data.description){ + callback(false, response.data.data.description); + }else if(response && response.message){ + callback(false, response.message); + }else if(error){ + callback(false, 'Server unreachable'); }else{ - callback(false, error); + callback(false, 'Internal error'); } }); }, |
