Gestione Refresh Token Completata !
This commit is contained in:
@@ -196,7 +196,7 @@ export const useUserStore = defineStore('UserStore', {
|
||||
servercode: 0,
|
||||
resStatus: 0,
|
||||
x_auth_token: '',
|
||||
refreshToken: '',
|
||||
refreshToken: '',
|
||||
isLogged: false,
|
||||
isAdmin: false,
|
||||
isManager: false,
|
||||
@@ -1126,29 +1126,34 @@ export const useUserStore = defineStore('UserStore', {
|
||||
},
|
||||
|
||||
updateLocalStorage(myuser: IUserFields) {
|
||||
const globalStore = useGlobalStore()
|
||||
try {
|
||||
const globalStore = useGlobalStore()
|
||||
|
||||
const now = tools.getDateNow()
|
||||
const now = tools.getDateNow()
|
||||
|
||||
// const expirationDate = new Date(now.getTime() + myres.data.expiresIn * 1000);
|
||||
const expirationDate = new Date(now.getTime() * 1000)
|
||||
tools.localStSetItem(toolsext.localStorage.lang, this.lang)
|
||||
tools.localStSetItem(toolsext.localStorage.userId, myuser._id)
|
||||
tools.localStSetItem(toolsext.localStorage.username, myuser.username)
|
||||
tools.localStSetItem(toolsext.localStorage.name, myuser.name)
|
||||
tools.localStSetItem(toolsext.localStorage.surname, myuser.surname)
|
||||
tools.localStSetItem(toolsext.localStorage.perm, String(myuser.perm) || '')
|
||||
if (myuser.profile !== undefined) tools.localStSetItem(toolsext.localStorage.img, (myuser.profile.img) ? String(myuser.profile.img) || '' : '')
|
||||
else tools.localStSetItem(toolsext.localStorage.img, '')
|
||||
localStorage.setItem(toolsext.localStorage.token, this.x_auth_token)
|
||||
localStorage.setItem(toolsext.localStorage.refreshToken, this.refreshToken)
|
||||
localStorage.setItem(toolsext.localStorage.expirationDate, expirationDate.toString())
|
||||
tools.localStSetItem(toolsext.localStorage.isLogged, String(true))
|
||||
tools.localStSetItem(toolsext.localStorage.verified_email, String(myuser.verified_email))
|
||||
tools.localStSetItem(toolsext.localStorage.verified_by_aportador, String(myuser.verified_by_aportador))
|
||||
tools.localStSetItem(toolsext.localStorage.teleg_id, String(myuser.profile.teleg_id))
|
||||
tools.localStSetItem(toolsext.localStorage.made_gift, String(myuser.made_gift))
|
||||
tools.localStSetItem(toolsext.localStorage.wasAlreadySubOnDb, String(globalStore.wasAlreadySubOnDb))
|
||||
// const expirationDate = new Date(now.getTime() + myres.data.expiresIn * 1000);
|
||||
const expirationDate = new Date(now.getTime() * 1000)
|
||||
tools.localStSetItem(toolsext.localStorage.lang, this.lang)
|
||||
tools.localStSetItem(toolsext.localStorage.userId, myuser._id)
|
||||
tools.localStSetItem(toolsext.localStorage.username, myuser.username)
|
||||
tools.localStSetItem(toolsext.localStorage.name, myuser.name)
|
||||
tools.localStSetItem(toolsext.localStorage.surname, myuser.surname)
|
||||
tools.localStSetItem(toolsext.localStorage.perm, String(myuser.perm) || '')
|
||||
if (myuser.profile !== undefined) tools.localStSetItem(toolsext.localStorage.img, (myuser.profile.img) ? String(myuser.profile.img) || '' : '')
|
||||
else tools.localStSetItem(toolsext.localStorage.img, '')
|
||||
localStorage.setItem(toolsext.localStorage.token, this.x_auth_token)
|
||||
console.log('updateLocalStorage: salva refreshtoken', this.refreshToken)
|
||||
localStorage.setItem(toolsext.localStorage.refreshToken, this.refreshToken)
|
||||
localStorage.setItem(toolsext.localStorage.expirationDate, expirationDate.toString())
|
||||
tools.localStSetItem(toolsext.localStorage.isLogged, String(true))
|
||||
tools.localStSetItem(toolsext.localStorage.verified_email, String(myuser.verified_email))
|
||||
tools.localStSetItem(toolsext.localStorage.verified_by_aportador, String(myuser.verified_by_aportador))
|
||||
tools.localStSetItem(toolsext.localStorage.teleg_id, String(myuser.profile.teleg_id))
|
||||
tools.localStSetItem(toolsext.localStorage.made_gift, String(myuser.made_gift))
|
||||
tools.localStSetItem(toolsext.localStorage.wasAlreadySubOnDb, String(globalStore.wasAlreadySubOnDb))
|
||||
} catch (e) {
|
||||
console.error('updateLocalStorage', e)
|
||||
}
|
||||
},
|
||||
|
||||
setusersList(usersList: IUserFields[]) {
|
||||
@@ -1244,9 +1249,15 @@ export const useUserStore = defineStore('UserStore', {
|
||||
this.resStatus = status
|
||||
},
|
||||
|
||||
setRefreshToken(refreshToken: string) {
|
||||
this.refreshToken = refreshToken
|
||||
localStorage.setItem(toolsext.localStorage.refreshToken, refreshToken)
|
||||
console.log('setRefreshToken', refreshToken)
|
||||
},
|
||||
|
||||
setAuth(x_auth_token: string, refreshToken: string) {
|
||||
this.x_auth_token = x_auth_token
|
||||
this.refreshToken = refreshToken
|
||||
this.setRefreshToken(refreshToken)
|
||||
},
|
||||
|
||||
resetArrToken(arrtokens: IToken[]) {
|
||||
@@ -1434,7 +1445,7 @@ export const useUserStore = defineStore('UserStore', {
|
||||
globalStore.setleftDrawerOpen(localStorage.getItem(toolsext.localStorage.leftDrawerOpen) === 'true')
|
||||
globalStore.setCategorySel(localStorage.getItem(toolsext.localStorage.categorySel))
|
||||
|
||||
globalStore.checkUpdates()
|
||||
await globalStore.checkUpdates()
|
||||
}
|
||||
|
||||
const isok = await globalStore.loadAfterLogin()
|
||||
@@ -1496,6 +1507,10 @@ export const useUserStore = defineStore('UserStore', {
|
||||
isLogged = true
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (token) {
|
||||
isLogged = true
|
||||
}
|
||||
}
|
||||
} else {
|
||||
isLogged = tools.isLogged()
|
||||
|
||||
Reference in New Issue
Block a user