fix: query redirect param

Author: davidstackio

src/runtime/middleware/authPublic.ts

@@ -1,12 +1,12 @@
 import { getCurrentUser } from 'vuefire'
 import { defineNuxtRouteMiddleware, navigateTo } from '#imports'
 
-export default defineNuxtRouteMiddleware(async () => {
+export default defineNuxtRouteMiddleware(async (to) => {
   const currentUser = await getCurrentUser()
 
-  // redirect the user to the home page
-  // if the user is already signed in
+  // Redirect if the user is already signed in
   if (currentUser) {
-    return navigateTo({ path: '/' })
+    const redirect = to.query.redirect as string | undefined
+    return navigateTo(redirect || '/')
   }
 })

src/runtime/pages/SignIn.vue

@@ -20,10 +20,12 @@ import {
   definePageMeta,
   useSeoMeta,
   navigateTo,
+  useRoute,
 } from '#imports'
 
 // App state
 const nuxtifyConfig = useNuxtifyConfig()
+const route = useRoute()
 const { xs } = useDisplay()
 const errorMessage = useErrorMessage()
 
@@ -69,7 +71,8 @@ async function submitForm() {
     await signInWithEmailAndPassword(auth, email.value, password.value)
 
     // Redirect
-    navigateTo('/')
+    const redirect = route.query.redirect as string | undefined
+    navigateTo(redirect || '/')
   }
   catch (error) {
     let message = 'An unexpected error occurred.'
@@ -153,7 +156,11 @@ async function signinWithGoogle() {
   }
   if (import.meta.dev) {
     // Use this with localhost, still might need to refresh or manually update address bar
-    signInWithPopup(auth, googleProvider)
+    await signInWithPopup(auth, googleProvider)
+
+    // Redirect
+    const redirect = route.query.redirect as string | undefined
+    navigateTo(redirect || '/')
   }
   else {
     // Doesn't work on localhost

src/runtime/pages/SignUp.vue

@@ -19,10 +19,12 @@ import {
   definePageMeta,
   useSeoMeta,
   navigateTo,
+  useRoute,
 } from '#imports'
 
 // App state
 const nuxtifyConfig = useNuxtifyConfig()
+const route = useRoute()
 const { xs } = useDisplay()
 const errorMessage = useErrorMessage()
 
@@ -66,7 +68,8 @@ async function submitForm() {
     await createUserWithEmailAndPassword(auth, email.value, password.value)
 
     // Redirect
-    navigateTo('/')
+    const redirect = route.query.redirect as string | undefined
+    navigateTo(redirect || '/')
   }
   catch (error) {
     let message = 'An unexpected error occurred.'
@@ -106,7 +109,11 @@ async function signinWithGoogle() {
   }
   if (import.meta.dev) {
     // Use this with localhost, still might need to refresh or manually update address bar
-    signInWithPopup(auth, googleProvider)
+    await signInWithPopup(auth, googleProvider)
+
+    // Redirect
+    const redirect = route.query.redirect as string | undefined
+    navigateTo(redirect || '/')
   }
   else {
     // Doesn't work on localhost