From 8794741878aabc3ca357ed097c2a35eef4ac2e0b Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Mon, 25 Sep 2023 11:51:20 +0200 Subject: [PATCH 1/3] [qa] refactor code --- src/lib/auth.js | 16 ++++++---------- src/store/modules/login.js | 10 +++++----- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/lib/auth.js b/src/lib/auth.js index 4773501122..dedc602478 100644 --- a/src/lib/auth.js +++ b/src/lib/auth.js @@ -36,7 +36,7 @@ const auth = { } else { if (res.body.login) { const user = res.body.user - store.commit(DATA_LOADING_START, {}) + store.commit(DATA_LOADING_START) callback(null, user) } else { store.commit(USER_LOGIN_FAIL) @@ -117,21 +117,17 @@ const auth = { if (!store.state.user.isAuthenticated) { store .dispatch('getOrganisation') - .then(() => { - next({ - path: '/login', - query: { redirect: to.fullPath } - }) - }) .catch(err => { console.error(err) + }) + .finally(() => { next({ - path: '/login', + name: 'login', query: { redirect: to.fullPath } }) }) } else { - store.commit(DATA_LOADING_START, {}) + store.commit(DATA_LOADING_START) next() } } @@ -140,7 +136,7 @@ const auth = { auth.isServerLoggedIn(err => { if (err) { next({ - path: '/server-down', + name: 'server-down', query: { redirect: to.fullPath } }) } else { diff --git a/src/store/modules/login.js b/src/store/modules/login.js index 358bf81658..99fe239c15 100644 --- a/src/store/modules/login.js +++ b/src/store/modules/login.js @@ -108,22 +108,22 @@ const mutations = { state.isLoginError = false }, - [LOGIN_SUCCESS](state, email) { + [LOGIN_SUCCESS](state) { state.isLoginLoading = false state.isLoginError = false }, - [LOGIN_FAILURE](state, email) { + [LOGIN_FAILURE](state) { state.isLoginLoading = false state.isLoginError = true }, - [LOGOUT_SUCCESS](state, email) { + [LOGOUT_SUCCESS](state) { state.isLoginLoading = false state.isLoginError = false }, - [DATA_LOADING_START](state, payload) { + [DATA_LOADING_START](state) { state.isDataLoading = true }, @@ -131,7 +131,7 @@ const mutations = { state.isDataLoading = false }, - [RESET_ALL](state, email) { + [RESET_ALL](state) { Object.assign(state, { ...initialState }) } } From 70ad26fc2698b977013a57e332561b6ef638c22c Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Mon, 25 Sep 2023 12:01:25 +0200 Subject: [PATCH 2/3] [login] handle 5xx server errors --- src/components/pages/Login.vue | 13 ++++++++++++- src/lib/auth.js | 35 +++++++++++++++++++--------------- src/locales/en.js | 1 + 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/components/pages/Login.vue b/src/components/pages/Login.vue index d372313966..603e76c998 100644 --- a/src/components/pages/Login.vue +++ b/src/components/pages/Login.vue @@ -69,7 +69,10 @@ {{ $t('login.login') }}

-

+

+ {{ $t('login.login_server_failed') }} +

+

{{ $t('login.too_many_failed_login_attemps') }}

{ @@ -159,6 +164,8 @@ export default { this.isMissingOTP = true this.preferredTwoFA = err.preferred_two_factor_authentication this.TwoFAsEnabled = err.two_factor_authentication_enabled + } else if (err.server_error) { + this.isServerError = true } else { console.error(err) } @@ -236,6 +243,10 @@ export default { padding: 0.25em; } +.error { + text-align: center; +} + @media (max-width: 1600px) { .box { margin-top: 4em; diff --git a/src/lib/auth.js b/src/lib/auth.js index dedc602478..220ac519d2 100644 --- a/src/lib/auth.js +++ b/src/lib/auth.js @@ -15,22 +15,27 @@ const auth = { .send(payload) .end((err, res) => { if (err) { - if (res.body.default_password) { - err.default_password = res.body.default_password - err.token = res.body.token + if (res?.body) { + if (res.body.default_password) { + err.default_password = res.body.default_password + err.token = res.body.token + } + if (res.body.too_many_failed_login_attemps) { + err.too_many_failed_login_attemps = true + } + if (res.body.wrong_OTP) { + err.wrong_OTP = true + } + if (res.body.missing_OTP) { + err.missing_OTP = true + err.preferred_two_factor_authentication = + res.body.preferred_two_factor_authentication + err.two_factor_authentication_enabled = + res.body.two_factor_authentication_enabled + } } - if (res.body.too_many_failed_login_attemps) { - err.too_many_failed_login_attemps = true - } - if (res.body.wrong_OTP) { - err.wrong_OTP = true - } - if (res.body.missing_OTP) { - err.missing_OTP = true - err.preferred_two_factor_authentication = - res.body.preferred_two_factor_authentication - err.two_factor_authentication_enabled = - res.body.two_factor_authentication_enabled + if (!res || err.status >= 500) { + err.server_error = true } callback(err) } else { diff --git a/src/locales/en.js b/src/locales/en.js index 1c22b5afeb..8c27c08568 100644 --- a/src/locales/en.js +++ b/src/locales/en.js @@ -323,6 +323,7 @@ export default { information_recovery_code: 'If you are unable to use any other two-factor authentication, enter one of your recovery codes to verify your identity.', login: 'Log in', login_failed: 'Login failed, please verify your credentials.', + login_server_failed: 'A server error occurred while logging in.', login_page: 'Cancel', redirecting: 'Redirecting in {secondsLeft} seconds...', reset_change_password: 'Change password', From 8c4f5a35c8b348d91473dc48810ab07d0614b383 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Mon, 25 Sep 2023 12:10:26 +0200 Subject: [PATCH 3/3] [server-down] fix invalid redirection --- src/components/pages/ServerDown.vue | 7 ++----- src/components/pages/WrongBrowser.vue | 13 +------------ 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/components/pages/ServerDown.vue b/src/components/pages/ServerDown.vue index 80e8307179..b6992d7785 100644 --- a/src/components/pages/ServerDown.vue +++ b/src/components/pages/ServerDown.vue @@ -11,7 +11,7 @@ - -