From 4aae2d83562b6675612201ed83a75e887cc190df Mon Sep 17 00:00:00 2001
From: Braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Thu, 7 Jul 2022 12:34:30 +0200
Subject: [PATCH] refactor(gui-v2): change token and user type to accept null
 value

Signed-off-by: Braks <78412429+bcakmakoglu@users.noreply.github.com>
---
 packages/nc-gui-v2/composables/useGlobalState.ts |  6 +++---
 packages/nc-gui-v2/lib/types.ts                  | 10 ++++++----
 packages/nc-gui-v2/pages/signin.vue              |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useGlobalState.ts b/packages/nc-gui-v2/composables/useGlobalState.ts
index 51597fcf45..2681ea5cd1 100644
--- a/packages/nc-gui-v2/composables/useGlobalState.ts
+++ b/packages/nc-gui-v2/composables/useGlobalState.ts
@@ -11,7 +11,7 @@ export const useGlobalState = (): GlobalState => {
   const preferredLanguages = $(usePreferredLanguages())
   const darkMode = $(usePreferredDark())
 
-  const initialState = { token: undefined, user: undefined, lang: preferredLanguages[0] || 'en', darkMode }
+  const initialState = { token: null, user: null, lang: preferredLanguages[0] || 'en', darkMode }
 
   const storage = useStorage<State>(storageKey, initialState)
 
@@ -20,8 +20,8 @@ export const useGlobalState = (): GlobalState => {
 
   // actions
   function signOut() {
-    storage.value.token = undefined
-    storage.value.user = undefined
+    storage.value.token = null
+    storage.value.user = null
   }
 
   return { ...toRefs(storage.value), signedIn, signOut }
diff --git a/packages/nc-gui-v2/lib/types.ts b/packages/nc-gui-v2/lib/types.ts
index 16cd8ee500..9a51be772e 100644
--- a/packages/nc-gui-v2/lib/types.ts
+++ b/packages/nc-gui-v2/lib/types.ts
@@ -1,10 +1,12 @@
 import type { ComputedRef, ToRefs } from 'vue'
 
+export interface User {
+  email: string
+}
+
 export interface State {
-  token?: string
-  user?: {
-    email?: string
-  }
+  token: string | null
+  user: User | null
   lang: string
   darkMode: boolean
 }
diff --git a/packages/nc-gui-v2/pages/signin.vue b/packages/nc-gui-v2/pages/signin.vue
index b09764b9d7..be4cf3ca52 100644
--- a/packages/nc-gui-v2/pages/signin.vue
+++ b/packages/nc-gui-v2/pages/signin.vue
@@ -51,8 +51,8 @@ const signIn = async () => {
   try {
     const { token } = await $api.auth.signin(form)
 
-    $state.token = token
-    $state.user = { email: form.email }
+    $state.token.value = token!
+    $state.user.value = { email: form.email }
 
     await navigateTo('/projects')
   } catch (e: any) {