- aggiornamento refreshtoken (parte 1)

- PCB: fix listino

src/store/UserStore.ts

@@ -196,6 +196,7 @@ export const useUserStore = defineStore('UserStore', {
     servercode: 0,
     resStatus: 0,
     x_auth_token: '',
+    refreshToken: '', 
     isLogged: false,
     isAdmin: false,
     isManager: false,
@@ -803,6 +804,7 @@ export const useUserStore = defineStore('UserStore', {
       this.resStatus = 0
       this.isLogged = false
       this.x_auth_token = ''
+      this.refreshToken = ''
 
       return true
     },
@@ -1115,7 +1117,7 @@ export const useUserStore = defineStore('UserStore', {
 
         this.my.tokens = []
         this.resetArrToken(this.my.tokens)
-        this.my.tokens.push({ access: 'auth', token: this.x_auth_token, data_login: tools.getDateNow() })
+        this.my.tokens.push({ access: 'auth', token: this.x_auth_token, refreshToken: this.refreshToken, data_login: tools.getDateNow() })
 
       } catch (e) {
         console.log('Error authUser: ' + e)
@@ -1139,6 +1141,7 @@ export const useUserStore = defineStore('UserStore', {
       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))
@@ -1200,6 +1203,7 @@ export const useUserStore = defineStore('UserStore', {
                 tools.localStSetItem(toolsext.localStorage.name, newuser.name)
                 tools.localStSetItem(toolsext.localStorage.surname, newuser.surname)
                 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.verified_email, String(false))
                 tools.localStSetItem(toolsext.localStorage.verified_by_aportador, String(false))
@@ -1223,12 +1227,13 @@ export const useUserStore = defineStore('UserStore', {
         })
     },
 
-    UpdatePwd(x_auth_token: string) {
+    UpdatePwd(x_auth_token: string, refreshToken: string) {
       this.x_auth_token = x_auth_token
+      this.refreshToken = refreshToken
       if (!this.my.tokens) {
         this.my.tokens = []
       }
-      this.my.tokens.push({ access: 'auth', token: x_auth_token, data_login: tools.getDateNow() })
+      this.my.tokens.push({ access: 'auth', token: x_auth_token, refreshToken, data_login: tools.getDateNow() })
     },
 
     setServerCode(num: number) {
@@ -1239,8 +1244,9 @@ export const useUserStore = defineStore('UserStore', {
       this.resStatus = status
     },
 
-    setAuth(x_auth_token: string) {
+    setAuth(x_auth_token: string, refreshToken: string) {
       this.x_auth_token = x_auth_token
+      this.refreshToken = refreshToken
     },
 
     resetArrToken(arrtokens: IToken[]) {
@@ -1297,7 +1303,7 @@ export const useUserStore = defineStore('UserStore', {
     },
 
     async signin(router: Router, authData: ISigninOptions) {
-      console.log('LOGIN signin')
+      // console.log('LOGIN signin')
       const globalStore = useGlobalStore()
 
       const options = {
@@ -1324,7 +1330,7 @@ export const useUserStore = defineStore('UserStore', {
 
       let myres: any
 
-      console.log('executing login...')
+      // console.log('executing login...')
 
       return await Api.SendReq('/users/login', 'POST', usertosend, true)
         .then((res) => {
@@ -1435,7 +1441,7 @@ export const useUserStore = defineStore('UserStore', {
 
         this.isLogged = isok && isLogged
 
-        // console.log('this.isLogged', this.isLogged, 'isok', isok, 'isLogged', isLogged)
+        console.log('this.isLogged', this.isLogged, 'isok', isok, 'isLogged', isLogged)
 
         if (globalStore.site.confpages && globalStore.site.confpages.enableTodos)
           await todos.dbLoad({ checkPending: true })
@@ -1476,17 +1482,20 @@ export const useUserStore = defineStore('UserStore', {
         this.lang = tools.getItemLS(toolsext.localStorage.lang)
 
         const token = localStorage.getItem(toolsext.localStorage.token)
+        let refreshToken = localStorage.getItem(toolsext.localStorage.refreshToken)
+        if (!refreshToken)
+          refreshToken = ''
 
         if (token) {
-          const expirationDateStr = localStorage.getItem(toolsext.localStorage.expirationDate)
-          const expirationDate = new Date(String(expirationDateStr))
-          const now = tools.getDateNow()
-          if (now < expirationDate) {
-            this.setAuth(token)
-            isLogged = true
-
-          } else {
-            // ++ ?? che fare qui
+          this.setAuth(token, refreshToken)
+          if (globalStore.site.confpages.enableTokenExpired) {
+            if (token && refreshToken) {
+              isLogged = true
+            } else {
+              if (token) {
+                isLogged = true
+              }
+            }
           }
         } else {
           isLogged = tools.isLogged()