scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

client/general: refactor promises

Browse Source
This commit is contained in:
rr-
2016-04-09 23:41:56 +02:00
parent 2af8c9c1a4
commit 8f5890ab67
3 changed files with 33 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
client/js/controllers/auth_controller.js
View File

@ -34,7 +34,7 @@ class AuthController {
resolve();
page('/');
events.notify(events.Success, 'Logged in');
}).catch(errorMessage => {
}, errorMessage => {
reject(errorMessage);
events.notify(events.Error, errorMessage);
});
@ -63,18 +63,15 @@ class AuthController {
api.post('/password-reset/' + name, {token: token})
.then(response => {
const password = response.password;
api.login(name, password, false)
.then(() => {
page('/');
events.notify(
events.Success, 'New password: ' + password);
}).catch(errorMessage => {
page('/');
events.notify(events.Error, errorMessage);
});
}).catch(response => {
return api.login(name, password, false);
}, response => {
return Promise.reject(response.description);
}).then(() => {
page('/');
events.notify(events.Error, response.description);
events.notify(events.Success, 'New password: ' + password);
}, errorMessage => {
page('/');
events.notify(events.Error, errorMessage);
});
}
@ -89,7 +86,7 @@ class AuthController {
events.Success,
'E-mail has been sent. To finish the procedure, ' +
'please click the link it contains.');
}).catch(response => {
}, response => {
reject();
events.notify(events.Error, response.description);
});