davidangel/frontend
1
0
Fork 0
forked from vikunja/frontend
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(user): fix flickering of default settings

Browse Source
This commit is contained in:
kolaente 2023-06-12 16:18:01 +02:00
parent 68597c9709
commit f0c3980700
Signed by untrusted user: konrad
GPG Key ID: F40E70337AB24C9B
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/stores/auth.ts
View File

@ -69,12 +69,12 @@ export const useAuthStore = defineStore('auth', () => {
isLoadingGeneralSettings.value = isLoading isLoadingGeneralSettings.value = isLoading
} }
function setUser(newUser: IUser | null) { function setUser(newUser: IUser | null, saveSettings: boolean = true) {
info.value = newUser info.value = newUser
if (newUser !== null) { if (newUser !== null) {
reloadAvatar() reloadAvatar()
if (newUser.settings) { if (saveSettings && newUser.settings) {
loadSettings(newUser.settings) loadSettings(newUser.settings)
} }
@ -101,7 +101,7 @@ export const useAuthStore = defineStore('auth', () => {
...newSettings.frontendSettings, ...newSettings.frontendSettings,
} }
}) })
console.log('settings from auth store', {...settings.value.frontendSettings}) // console.log('settings from auth store', {...settings.value.frontendSettings})
} }
function setAuthenticated(newAuthenticated: boolean) { function setAuthenticated(newAuthenticated: boolean) {
@ -233,7 +233,8 @@ export const useAuthStore = defineStore('auth', () => {
const info = new UserModel(JSON.parse(atob(base64))) const info = new UserModel(JSON.parse(atob(base64)))
const ts = Math.round((new Date()).getTime() / MILLISECONDS_A_SECOND) const ts = Math.round((new Date()).getTime() / MILLISECONDS_A_SECOND)
isAuthenticated = info.exp >= ts isAuthenticated = info.exp >= ts
setUser(info) // Settings should only be loaded from the api request, not via the jwt
setUser(info, false)
if (isAuthenticated) { if (isAuthenticated) {
await refreshUserInfo() await refreshUserInfo()