fix(middleware session): fix middleware session

menthorlabs · Oct 9, 2023 · e4ddd63 · e4ddd63
1 parent 217181d
commit e4ddd63
Show file tree

Hide file tree

Showing 6 changed files with 1,201 additions and 12 deletions.
diff --git a/apps/app/components/molecules/TopBar.vue b/apps/app/components/molecules/TopBar.vue
@@ -61,7 +61,7 @@ const defaultAsideStore = useDefaultAsideStore();
         </VDropdown>
       </div>
       <div v-else>
-        <NuxtLink to="/sign-in" @click="sessionStore.signOut()">
+        <NuxtLink to="/sign-in">
           <MButton text="Fazer login" variant="outline" size="sm" />
         </NuxtLink>
       </div>

diff --git a/apps/app/middleware/session.global.ts b/apps/app/middleware/session.global.ts
@@ -1,5 +1,5 @@
-export default defineNuxtRouteMiddleware(async (to) => {
-  if (to.meta.ignoreMiddleware) return;
+export default defineNuxtRouteMiddleware(async (to, from) => {
+  if (from.meta.ignoreMiddleware) return;
 
   const userStore = useUserStore();
   const serverUser = useCookie("m-user");
@@ -10,15 +10,14 @@ export default defineNuxtRouteMiddleware(async (to) => {
 
   if (to.query.oauth) return;
 
-  const router = useRouter();
   const sessionStore = useSessionStore();
   const serverHasSession = !!serverUser.value || sessionStore.hasSession();
 
   if (["profile"].includes(String(to.name)) && !serverHasSession) {
-    router.push("/sign-in");
+    navigateTo("/sign-in");
   }
   if (["sign-in", "sign-up"].includes(String(to.name)) && serverHasSession) {
-    router.push("/");
+    navigateTo("/");
   }
   sessionStore.cleared = false;
 });
diff --git a/apps/app/pages/sign-in.vue b/apps/app/pages/sign-in.vue
@@ -18,6 +18,7 @@ const runtimeConfig = useRuntimeConfig();
 const route = useRoute();
 
 onMounted(async () => {
+  await sessionStore.signOut();
   sessionStore.cleared = false;
 
   if (route.query?.error) {

diff --git a/apps/app/pages/sign-out.vue b/apps/app/pages/sign-out.vue
@@ -6,8 +6,8 @@ definePageMeta({
 const sessionStore = useSessionStore();
 const router = useRouter();
 
-onMounted(() => {
-  sessionStore.signOut();
+onMounted(async () => {
+  await sessionStore.signOut();
   router.push("/sign-in");
 });
 </script>

diff --git a/apps/app/stores/clerk/session.ts b/apps/app/stores/clerk/session.ts
@@ -38,12 +38,11 @@ export const useSessionStore = defineStore("session", {
       }
     },
     async signOut() {
+      this.cleared = true;
       const clerkToken = useCookies([]);
       const userCookie = useCookies([]);
-      userCookie.remove("m-user");
-      clerkToken.remove("__session");
-      this.cleared = true;
-
+      await userCookie.remove("m-user");
+      await clerkToken.remove("__session");
       await this.$clerk.signOut();
     },
   },