Add fallback support for currentRoute.value.fullPath

frontegg · Jan 23, 2024 · a005c58 · a005c58
1 parent 47d091e
commit a005c58
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/packages/vue/src/auth/mapAuthState.ts b/packages/vue/src/auth/mapAuthState.ts
@@ -173,7 +173,7 @@ export const useLoadEntitlements = () => {
 };
 
 /**
- * @returns user state 
+ * @returns user state
  */
 const useGetUserState = () => {
   const authState = inject(authStateKey) as AuthState;
@@ -216,7 +216,8 @@ export const useFrontegg = () => {
 
   const loginWithRedirect = () => {
     // @ts-ignore
-    if (!fronteggAuth.router?.currentRoute.path.startsWith(authState.routes.hostedLoginRedirectUrl)) {
+    const path = fronteggAuth.router?.currentRoute?.path ?? fronteggAuth.router?.currentRoute?.value?.fullPath ?? "/";
+    if (!path.startsWith(authState.routes.hostedLoginRedirectUrl)) {
       fronteggStore.dispatch({ type: 'auth/setState', payload: { isLoading: true } });
       fronteggAuth.loginActions.requestHostedLoginAuthorize();
     }
@@ -252,7 +253,11 @@ export const useFronteggAuthGuard = (options?: FronteggAuthGuardOptions) => {
   };
 
   const checkGuard = () => {
-    if (!isAuthRoutes(fronteggAuth.router?.currentRoute.path!) && !authState.isAuthenticated && !authState.isLoading) {
+
+    // @ts-ignore
+    const route = fronteggAuth.router?.currentRoute?.path ?? fronteggAuth.router?.currentRoute?.value?.fullPath ?? "/";
+
+    if (!isAuthRoutes(route) && !authState.isAuthenticated && !authState.isLoading) {
       if (fronteggOptions.hostedLoginBox) {
         fronteggStore.dispatch({ type: 'auth/setState', payload: { isLoading: true } });
         if (redirectUrl) {