Fix confrimation aborting, when no code or from path mismatch

leaderboardsgg · Nov 23, 2023 · 5fe11d3 · 5fe11d3
1 parent b99f833
commit 5fe11d3
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/middleware/confirm-account.ts b/middleware/confirm-account.ts
@@ -3,11 +3,14 @@ import { useModalAlert } from 'composables/useModalAlert'
 
 export default defineNuxtRouteMiddleware((_to, from) => {
   const route = useRoute()
-  const confirmationCode = route.query.code as string
+  const confirmationCode = route.query?.code as string
   const modalAlertState = useModalAlert().value
 
-  if (from !== `/confirm-account?code=${confirmationCode}`) {
-    navigateTo('/', { replace: true })
+  if (
+    !confirmationCode ||
+    from?.fullPath !== `/confirm-account?code=${confirmationCode}`
+  ) {
+    return navigateTo('/', { replace: true })
   }
 
   useConfirmAccount(confirmationCode, {