From b948f27692901a52398cb3eca01600bc690b2e8b Mon Sep 17 00:00:00 2001 From: printempw Date: Mon, 7 Aug 2017 14:46:03 +0800 Subject: [PATCH] Fix signing out after changing password --- resources/assets/src/js/user/profile.js | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/resources/assets/src/js/user/profile.js b/resources/assets/src/js/user/profile.js index 84720389..ccb82f8c 100644 --- a/resources/assets/src/js/user/profile.js +++ b/resources/assets/src/js/user/profile.js @@ -61,13 +61,11 @@ function changePassword() { return swal({ type: 'success', text: msg + }).then(() => logout()).catch(err => { + docCookies.removeItem('token') && console.warn(err); }).then(() => { - return logout(); - }).then(({ errno }) => { - if (errno == 0) { - window.location = url('auth/login'); - } - }).catch(showAjaxError); + window.location = url('auth/login'); + }); } else { return swal({ type: 'warning', text: msg }); } @@ -111,13 +109,11 @@ function changeEmail() { return swal({ type: 'success', text: msg + }).then(() => logout()).catch(err => { + docCookies.removeItem('token') && console.warn(err); }).then(() => { - return logout(); - }).then(({ errno }) => { - if (errno == 0) { - window.location = url('auth/login'); - } - }).catch(showAjaxError); + window.location = url('auth/login'); + }); } else { return swal({ type: 'warning', text: msg }); }