@djangocfg/layouts 1.4.29 → 1.4.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@djangocfg/layouts",
-  "version": "1.4.29",
+  "version": "1.4.30",
   "description": "Pre-built dashboard layouts, authentication pages, and admin templates for Next.js applications with Tailwind CSS",
   "keywords": [
     "layouts",
@@ -85,9 +85,9 @@
     "check": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@djangocfg/api": "^1.4.29",
-    "@djangocfg/og-image": "^1.4.29",
-    "@djangocfg/ui": "^1.4.29",
+    "@djangocfg/api": "^1.4.30",
+    "@djangocfg/og-image": "^1.4.30",
+    "@djangocfg/ui": "^1.4.30",
     "@hookform/resolvers": "^5.2.0",
     "consola": "^3.4.2",
     "lucide-react": "^0.468.0",
@@ -109,7 +109,7 @@
     "vidstack": "next"
   },
   "devDependencies": {
-    "@djangocfg/typescript-config": "^1.4.29",
+    "@djangocfg/typescript-config": "^1.4.30",
     "@types/node": "^24.7.2",
     "@types/react": "19.2.2",
     "@types/react-dom": "19.2.1",

package/src/auth/context/AuthContext.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 'use client';
 
-import { useRouter } from 'next/navigation';
+import { useRouter, usePathname, useSearchParams } from 'next/navigation';
 import React, {
     createContext, ReactNode, useCallback, useContext, useEffect, useMemo, useRef, useState
 } from 'react';
@@ -51,6 +51,8 @@ const AuthProviderInternal: React.FC<AuthProviderProps> = ({ children, config })
 
   const [initialized, setInitialized] = useState(false);
   const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
 
   // Use localStorage hooks for email, phone, and redirect
   const [storedEmail, setStoredEmail, clearStoredEmail] = useLocalStorage<string | null>(EMAIL_STORAGE_KEY, null);
@@ -229,15 +231,16 @@ const AuthProviderInternal: React.FC<AuthProviderProps> = ({ children, config })
     // Consider authenticated if we have valid tokens, even without profile
     const isAuthenticated = api.isAuthenticated();
     const authRoute = config?.routes?.auth || defaultRoutes.auth;
-    const isAuthPage = router.pathname === authRoute;
+    const isAuthPage = pathname === authRoute;
+    const flowParam = searchParams?.get('flow');
 
     // Only redirect authenticated users away from auth page if they're not in a flow
     // This prevents interference with OTP verification flow
-    if (isAuthenticated && isAuthPage && !router.query.flow) {
+    if (isAuthenticated && isAuthPage && !flowParam) {
       const callbackUrl = config?.routes?.defaultCallback || defaultRoutes.defaultCallback;
       window.location.href = callbackUrl;
     }
-  }, [initialized, router.pathname, config?.routes, router.query.flow]);
+  }, [initialized, pathname, searchParams, config?.routes]);
 
   const pushToDefaultCallbackUrl = useCallback(() => {
     const callbackUrl = config?.routes?.defaultCallback || defaultRoutes.defaultCallback;