snuffster/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client/api: fix reporting errors for bad logins

Browse source
This commit is contained in:
rr- 2016-09-24 08:49:07 +02:00
parent d1cad99e87
commit 01fadd8f8c
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
client/js/api.js
View file

@ -80,16 +80,24 @@ class Api extends events.EventTarget {
req.attach(key, files[key] || new Blob());
}
}
if (this.userName && this.userPassword) {
req.auth(this.userName, this.userPassword);
try {
if (this.userName && this.userPassword) {
req.auth(
this.userName,
this.userPassword);
}
} catch (e) {
reject({
title: 'Authentication error',
description: 'Malformed credentials'});
}
req.set('Accept', 'application/json')
.end((error, response) => {
nprogress.done();
if (error) {
reject(response && response.body ? response.body : {
'title': 'Networking error',
'description': error.message});
title: 'Networking error',
description: error.message});
} else {
resolve(response.body);
}
@ -152,7 +160,7 @@ class Api extends events.EventTarget {
resolve();
this.dispatchEvent(new CustomEvent('login'));
}, response => {
reject(response.description);
reject(response.description || response || 'Unknown error');
this.logout();
});
});