fix token refresh

openlibraryenvironment · Oct 14, 2024 · 6823b7c · 6823b7c
1 parent 6f75df9
commit 6823b7c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/src/app.vue b/src/app.vue
@@ -415,7 +415,7 @@
 
                 this.globalSearchItems.push(res)
               } else {
-                console.log('Not Adding item..')
+                log.debug('Not Adding item..')
               }
             })
           }
@@ -493,7 +493,7 @@
 
           this.groups = result.data.data.curatoryGroups
 
-          console.log("Loading groups!")
+          log.debug("Loading groups!")
 
           if (this.groups.length > 0) {
             this.activeGroup = accountModel.activeGroup() || this.groups[0]

diff --git a/src/shared/models/token-model/token-model.js b/src/shared/models/token-model/token-model.js
@@ -8,7 +8,7 @@ const api = (browserStorage) => {
 
   return {
     isPersistent () {
-      return localStorage.get(PERSISTENCE_KEY, true) === "true"
+      return localStorage.get(PERSISTENCE_KEY, true) === true
     },
     removeToken () {
       localStorage.remove(TOKEN_KEY)
@@ -17,11 +17,14 @@ const api = (browserStorage) => {
       localStorage.remove(PERSISTENCE_KEY)
     },
     needsRefresh () {
-      return !!localStorage.get(EXPIRATION_KEY, true) && !!this.getToken() && !/^\d+$/.test(localStorage.get(EXPIRATION_KEY, true)) && (Date.now() > (parseInt(localStorage.get(EXPIRATION_KEY, true) - 300000)))
+      return Date.now() > (localStorage.get(EXPIRATION_KEY, true) - 600000)
     },
     isExpired () {
       return !localStorage.get(EXPIRATION_KEY, true) || !/^\d+$/.test(localStorage.get(EXPIRATION_KEY, true)) || (!!this.getToken() && Date.now() > parseInt(localStorage.get(EXPIRATION_KEY, true)))
     },
+    existsToken () {
+      return !!this.getToken()
+    },
     getToken () {
       return localStorage.get(TOKEN_KEY)
     },

diff --git a/src/shared/services/base-services/base-services.js b/src/shared/services/base-services/base-services.js
@@ -35,6 +35,7 @@ const api = (http, log, utils, tokenModel, accountModel) => ({
           const refresh_resp = await this.refreshAuth()
 
           if (refresh_resp?.status === 200) {
+            log.debug("Successfully refreshed token ..")
           } else {
             log.debug("Unable to refresh token .. logging out")
             accountModel.default.logout()

diff --git a/src/shared/utils/logger/logger.js b/src/shared/utils/logger/logger.js
@@ -1,6 +1,6 @@
 const api = (console, utils) => {
   const isProduction = !utils.isDevelopment()
-  const loggerFunction = level => (...optionalParams) => !isProduction && console[level](...optionalParams)
+  const loggerFunction = level => (...optionalParams) => !isProduction ? console[level](...optionalParams) : console.info(...optionalParams)
 
   const api = {
     LOG_LEVEL: ['log', 'info', 'debug', 'trace', 'warn', 'error', 'assert'],

diff --git a/src/shared/utils/utils/utils.js b/src/shared/utils/utils/utils.js
@@ -11,7 +11,7 @@ const api = {
   },
 
   isDevelopment () {
-    return import.meta.env.NODE_ENV === 'development'
+    return import.meta.env.DEV
   },
 
   asYesNo (value) {

diff --git a/src/views/edit/edit-tipp-view.vue b/src/views/edit/edit-tipp-view.vue
@@ -951,8 +951,6 @@
           instance: this
         })
 
-        console.log(result)
-
         if (result?.status === 200) {
           this.mapRecord(result.data)
         } else if (result?.status === 401) {