RED-49 fix invalid token bug.... for the moment

sombriks · Jan 4, 2024 · 1d07188 · 1d07188
1 parent 4096d79
commit 1d07188
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/web-app-vue/src/components/movimentacao/lista-movimentacoes.vue b/web-app-vue/src/components/movimentacao/lista-movimentacoes.vue
@@ -180,7 +180,7 @@ const filtro = reactive({
   limit: 1000
 })
 
-const movimentacoes = computed(() => movimentacaoStore.store?.movimentacoes.map((m) => m) || [])
+const movimentacoes = computed(() => movimentacaoStore.store?.movimentacoes || [])
 
 const saldo = computed(() => movimentacaoStore.saldo())
 

diff --git a/web-app-vue/src/services/api.js b/web-app-vue/src/services/api.js
@@ -8,14 +8,13 @@ const uriParams = ({ uri, params }) =>
     .join('&')}`
 
 const req = async ({ method = 'POST', uri, payload }) => {
-  const token = useUserStore().store.token
-  const { router } = await import('./router')
+  const userStore = useUserStore()
   const url = `${import.meta.env.VITE_API_URL}${uri}`
   const headers = {
     'Content-Type': 'application/json',
     Accept: 'application/json'
   }
-  if (token) headers['Authorization'] = `Bearer ${token}`
+  if (userStore.store.token) headers['Authorization'] = `Bearer ${userStore.store.token}`
   try {
     const result = await fetch(url, {
       body: JSON.stringify(payload),
@@ -29,7 +28,7 @@ const req = async ({ method = 'POST', uri, payload }) => {
     }
   } catch (e) {
     if(e.status === 401) {
-      router.push('/auth')
+      await userStore.logout()
     }
     throw new Error(`${e.status} - ${await e.text()}`)
   }

diff --git a/web-app-vue/src/stores/movimentacaoStore.js b/web-app-vue/src/stores/movimentacaoStore.js
@@ -65,7 +65,7 @@ export const useMovimentacaoStore = defineStore('movimentacao-store', () => {
     setRedLine({ ...redLine, ...store })
   }
 
-  const getMovimentacao = id => store.movimentacoes?.find(m => m.id == id)
+  const getMovimentacao = (id) => store.movimentacoes?.find((m) => m.id == id)
 
   const calcula = (m) => {
     const v = parseFloat(m.valor)
@@ -74,7 +74,8 @@ export const useMovimentacaoStore = defineStore('movimentacao-store', () => {
   }
 
   const saldo = () => {
-    return store.movimentacoes.reduce(
+    if (!store.movimentacoes || !store.movimentacoes.length) return 0
+    return store.movimentacoes?.reduce(
       (p, c) => {
         return { valor: calcula(p) + calcula(c), tipo_movimentacao_id: 1 }
       },

diff --git a/web-app-vue/src/stores/userStore.js b/web-app-vue/src/stores/userStore.js
@@ -23,9 +23,11 @@ export const useUserStore = defineStore("user-store", () => {
 
   const doLogin = ({email, senha}) => login({email, senha})
 
-  const logout = () => {
+  const logout = async () => {
+    const { router } = await import('../services/router')
     store.token = null;
     clearRedLine();
+    router.push('/auth')
   };
 
   const deleteAccount = async ({ email, senha }) => {