replaced router with navigateTo

manchenkoff · Sep 21, 2023 · f47002e · f47002e
1 parent e0c33a2
commit f47002e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/runtime/composables/useSanctumAuth.ts b/src/runtime/composables/useSanctumAuth.ts
@@ -1,7 +1,7 @@
 import { computed } from 'vue';
 import { useSanctumClient } from './useSanctumClient';
 import { useSanctumUser } from './useSanctumUser';
-import { useRoute, useRouter, useRuntimeConfig } from '#app';
+import { navigateTo, useRoute, useRuntimeConfig } from '#app';
 import { SanctumOptions } from '~/src/types';
 
 /**
@@ -12,7 +12,6 @@ import { SanctumOptions } from '~/src/types';
 export const useSanctumAuth = <T>() => {
     const user = useSanctumUser<T>();
     const client = useSanctumClient();
-    const router = useRouter();
     const options = useRuntimeConfig().public.sanctum as SanctumOptions;
 
     const isAuthenticated = computed(() => {
@@ -45,14 +44,12 @@ export const useSanctumAuth = <T>() => {
             const requestedRoute = route.query.redirect as string | undefined;
 
             if (requestedRoute) {
-                await router.push(requestedRoute);
-
-                return;
+                return await navigateTo(requestedRoute);
             }
         }
 
         if (options.redirect.onLogin) {
-            await router.push(options.redirect.onLogin);
+            return await navigateTo(options.redirect.onLogin);
         }
     }
 
@@ -69,7 +66,7 @@ export const useSanctumAuth = <T>() => {
         user.value = null;
 
         if (options.redirect.onLogout) {
-            await router.push(options.redirect.onLogout);
+            return await navigateTo(options.redirect.onLogout);
         }
     }
 

diff --git a/src/runtime/httpFactory.ts b/src/runtime/httpFactory.ts
@@ -5,8 +5,8 @@ import {
     useCookie,
     useRequestEvent,
     useRequestHeaders,
-    useRouter,
     useRuntimeConfig,
+    navigateTo,
 } from '#app';
 import { SanctumOptions } from '../types';
 
@@ -15,7 +15,6 @@ export const SECURE_METHODS = new Set(['post', 'delete', 'put', 'patch']);
 export function createHttpClient(): $Fetch {
     const options = useRuntimeConfig().public.sanctum as SanctumOptions;
     const event = useRequestEvent();
-    const router = useRouter();
 
     /**
      * Request a new CSRF cookie from the API and pass it to the headers collection
@@ -107,7 +106,7 @@ export function createHttpClient(): $Fetch {
 
             // follow redirects on client
             if (response.redirected) {
-                await router.push(response.url);
+                await navigateTo(response.url);
             }
         },
     };