YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

do not logout when trying to reconnect to the server since the session should still be valid

Browse source
This commit is contained in:
axolotle 2023-12-29 17:53:53 +01:00
parent 8db7691fe2
commit 1d892350cd
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/api/api.js
View file

@ -217,12 +217,12 @@ export default {
const api = this const api = this
function reconnect(n) { function reconnect(n) {
api store
.get('logout', {}, { key: 'reconnecting' }) .dispatch('GET_YUNOHOST_INFOS')
.then(resolve) .then(resolve)
.catch((err) => { .catch((err) => {
if (err.name === 'APIUnauthorizedError') { if (err.name === 'APIUnauthorizedError') {
resolve() reject(err)
} else if (n < 1) { } else if (n < 1) {
reject(err) reject(err)
} else { } else {

2
app/src/i18n/locales/en.json
View file

@ -31,7 +31,7 @@
"unknown": "Connection with the server has been closed for unknown reasons.", "unknown": "Connection with the server has been closed for unknown reasons.",
"upgrade_system": "Connection with the server has been closed due to YunoHost upgrade. Waiting for the server to be reachable again…" "upgrade_system": "Connection with the server has been closed due to YunoHost upgrade. Waiting for the server to be reachable again…"
}, },
"success": "The server is now reachable! You can try to login", "session_expired": "The server is now reachable! But it looks like your session expired, please login.",
"title": "Trying to communicate with the server…" "title": "Trying to communicate with the server…"
} }
}, },

3
app/src/store/info.js
View file

@ -179,10 +179,9 @@ export default {
return api.get('logout') return api.get('logout')
}, },
TRY_TO_RECONNECT({ commit, dispatch }, args = {}) { TRY_TO_RECONNECT({ commit }, args = {}) {
// FIXME This is very ugly arguments forwarding, will use proper component way of doing this when switching to Vue 3 (teleport) // FIXME This is very ugly arguments forwarding, will use proper component way of doing this when switching to Vue 3 (teleport)
commit('SET_RECONNECTING', args) commit('SET_RECONNECTING', args)
dispatch('RESET_CONNECTED')
}, },
GET_YUNOHOST_INFOS({ commit }) { GET_YUNOHOST_INFOS({ commit }) {

12
app/src/views/_partials/ReconnectingDisplay.vue
View file

@ -28,8 +28,8 @@
</div> </div>
</template> </template>
<template v-if="status === 'success'"> <template v-if="status === 'expired'">
<BAlert variant="success" v-t="'api.reconnecting.success'" /> <BAlert variant="success" v-t="'api.reconnecting.session_expired'" />
<LoginView force-reload /> <LoginView force-reload />
</template> </template>
@ -66,10 +66,14 @@ export default {
api api
.tryToReconnect({ ...this.reconnecting, initialDelay }) .tryToReconnect({ ...this.reconnecting, initialDelay })
.then(() => { .then(() => {
this.status = 'success' this.$store.commit('SET_RECONNECTING', null)
}) })
.catch(() => { .catch((err) => {
if (err.name === 'APIUnauthorizedError') {
this.status = 'expired'
} else {
this.status = 'failed' this.status = 'failed'
}
}) })
}, },
}, },