fix: App loses auth after update #220

akdasa-studios · May 20, 2023 · 973d1de · 973d1de
1 parent de6c83f
commit 973d1de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/app/settings/stores/useSettingsStore.ts b/src/app/settings/stores/useSettingsStore.ts
@@ -59,7 +59,8 @@ export const useSettingsStore = defineStore('settings', () => {
     collectionId: '',
     sessionId: '',
     strategy: '',
-    refreshedAt: 0
+    refreshedAt: 0,
+    expiresAt: 0
   })
 
 
@@ -97,11 +98,12 @@ export const useSettingsStore = defineStore('settings', () => {
       welcome.value.done = loadedWelcome.done
     }
     if (loadedAuth) {
-      auth.value.collectionId = loadedAuth.database
+      auth.value.collectionId = loadedAuth.collectionId
       auth.value.token = loadedAuth.token
-      auth.value.sessionId = loadedAuth.session
+      auth.value.sessionId = loadedAuth.sessionId
       auth.value.strategy = loadedAuth.strategy
       auth.value.refreshedAt = loadedAuth.refreshedAt
+      auth.value.expiresAt = loadedAuth.expiresAt
     }
   }
 

diff --git a/src/app/shared/composables/useEnv.ts b/src/app/shared/composables/useEnv.ts
@@ -25,7 +25,7 @@ export function useEnv() {
   }
 
   function isDevelopment() {
-    return MODE === 'dev' || MODE === 'testing' || MODE === 'testing:dev' || MODE === 'testing:prod'
+    return ['dev', 'development', 'testing', 'testing:dev', 'testing:prod'].includes(MODE)
   }
 
   function getHost() {