♻️ Refactor authHook and guardsMiddleware, and update success message…

… in register.vue
MaloLebrin · Feb 29, 2024 · 4770111 · 4770111
1 parent c19ce14
commit 4770111
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/composables/authHook.ts b/composables/authHook.ts
@@ -107,8 +107,10 @@ export default function authHook() {
   }
 
   function getCookie() {
-    const cookie = useCookie('userToken', { secure: true, sameSite: true, path: '', maxAge: 604800 })
-    return cookie.value
+    const cookie = useCookie(
+      'userToken',
+      { secure: true, sameSite: true, path: '', maxAge: 604800 })
+    return cookie
   }
 
   return {

diff --git a/middleware/guardsMiddleware.ts b/middleware/guardsMiddleware.ts
@@ -14,9 +14,9 @@ export default defineNuxtRouteMiddleware(async to => {
   }
 
   if (to.meta.isAuth && !authStore.getIsLoggedIn) {
-    if (cookieToken) {
-      setToken(cookieToken)
-      const { payload } = useJwt(cookieToken)
+    if (cookieToken.value) {
+      setToken(cookieToken.value)
+      const { payload } = useJwt(cookieToken.value)
 
       if (payload.value) {
         setJWTasUser(payload.value)

diff --git a/pages/register.vue b/pages/register.vue
@@ -189,7 +189,7 @@ async function submitregister(form: VeeValidateValues) {
         if (decode.value) {
           setJWTasUser(decode.value)
         }
-        $toast.success(`Heureux de vous revoir ${getUserfullName(user)}`)
+        $toast.success(`Bienvenue ${getUserfullName(user)}`)
         router.replace({
           name: 'evenement',
         })