- fix: authenticate_withUser mancava su alcuni...

- fix: '/signin' non riproponeva il login nel caso il token fosse invalido
This commit is contained in:
Surya Paolo
2025-03-14 12:52:38 +01:00
parent d190d4800e
commit 564a621aad
17 changed files with 61 additions and 35 deletions

View File

@@ -1550,32 +1550,39 @@ export const useUserStore = defineStore('UserStore', {
await globalStore.checkUpdates()
}
const isok = await globalStore.loadLoginSite(router)
const { isok, stop, code } = await globalStore.loadLoginSite(router)
this.isLogged = isok && isLogged
this.isLogged = isok && isLogged && !stop
await globalStore.loadAfterLogin()
if (!stop) {
// console.log('this.isLogged', this.isLogged, 'isok', isok, 'isLogged', isLogged)
if (globalStore.site.confpages && globalStore.site.confpages.enableTodos)
await todos.dbLoad({ checkPending: true })
await globalStore.loadAfterLogin()
if (globalStore.site.confpages?.enableProj)
await projects.dbLoad({ checkPending: true, onlyiffirsttime: true })
// console.log('this.isLogged', this.isLogged, 'isok', isok, 'isLogged', isLogged)
globalStore.addDynamicPages(router)
if (globalStore.site.confpages && globalStore.site.confpages.enableTodos)
await todos.dbLoad({ checkPending: true })
static_data.lang_available = globalStore.getLangAvailable()
if (globalStore.site.confpages?.enableProj)
await projects.dbLoad({ checkPending: true, onlyiffirsttime: true })
static_data.arrLangUsed = tools.getLangUsed()
globalStore.addDynamicPages(router)
// console.log('$router', $router)
static_data.lang_available = globalStore.getLangAvailable()
static_data.arrLangUsed = tools.getLangUsed()
// console.log('$router', $router)
// document.dispatchEvent(new Event('custom-post-render-event'))
}
globalStore.finishLoading = true
if (tools.isDebug()) console.log('finishLoading', globalStore.finishLoading)
// document.dispatchEvent(new Event('custom-post-render-event'))
return { code }
} catch (e) {
console.error('Error', e)
globalStore.finishLoading = true
@@ -1623,13 +1630,13 @@ export const useUserStore = defineStore('UserStore', {
return await this.setGlobal(router, isLogged)
.then((loadstorage: any) => {
// console.log('RISULT setGlobal:', loadstorage)
if (loadstorage) {
if (loadstorage.code === 200) {
globalroutines('loadapp', '')
// Create Subscription to Push Notification
globalStore.createPushSubscription()
}
return loadstorage
})
} catch (e: any) {