@djangocfg/api 2.1.37 → 2.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@djangocfg/api",
-  "version": "2.1.37",
+  "version": "2.1.38",
   "description": "Auto-generated TypeScript API client with React hooks, SWR integration, and Zod validation for Django REST Framework backends",
   "keywords": [
     "django",
@@ -74,7 +74,7 @@
     "check": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@djangocfg/ui-nextjs": "^2.1.37",
+    "@djangocfg/ui-nextjs": "^2.1.38",
     "consola": "^3.4.2",
     "next": "^14 || ^15",
     "p-retry": "^7.0.0",
@@ -85,7 +85,7 @@
   "devDependencies": {
     "@types/node": "^24.7.2",
     "@types/react": "^19.0.0",
-    "@djangocfg/typescript-config": "^2.1.37",
+    "@djangocfg/typescript-config": "^2.1.38",
     "next": "^15.0.0",
     "react": "^19.0.0",
     "tsup": "^8.5.0",

package/src/auth/context/AuthContext.tsx

@@ -27,7 +27,6 @@ const AuthContext = createContext<AuthContextType | undefined>(undefined);
 // Constants
 const EMAIL_STORAGE_KEY = 'auth_email';
 const PHONE_STORAGE_KEY = 'auth_phone';
-const AUTH_REDIRECT_KEY = 'auth_redirect_url';
 
 const hasValidTokens = (): boolean => {
   if (typeof window === 'undefined') return false;
@@ -54,10 +53,9 @@ const AuthProviderInternal: React.FC<AuthProviderProps> = ({ children, config })
   const pathname = usePathname();
   const queryParams = useQueryParams();
 
-  // Use localStorage hooks for email, phone, and redirect
+  // Use localStorage hooks for email and phone
   const [storedEmail, setStoredEmail, clearStoredEmail] = useLocalStorage<string | null>(EMAIL_STORAGE_KEY, null);
   const [storedPhone, setStoredPhone, clearStoredPhone] = useLocalStorage<string | null>(PHONE_STORAGE_KEY, null);
-  const [redirectUrl, setRedirectUrl, clearRedirectUrl] = useLocalStorage<string | null>(AUTH_REDIRECT_KEY, null);
 
   // Map AccountsContext profile to UserProfile
   const user = accounts.profile as UserProfile | null;
@@ -317,10 +315,10 @@ const AuthProviderInternal: React.FC<AuthProviderProps> = ({ children, config })
   );
 
   const verifyOTP = useCallback(
-    async (identifier: string, otpCode: string, channel?: 'email' | 'phone', sourceUrl?: string): Promise<{ success: boolean; message: string; user?: UserProfile }> => {
+    async (identifier: string, otpCode: string, channel?: 'email' | 'phone', sourceUrl?: string, redirectUrl?: string): Promise<{ success: boolean; message: string; user?: UserProfile }> => {
       try {
-        const channelValue = channel === 'phone' 
-          ? Enums.OTPVerifyRequestChannel.PHONE 
+        const channelValue = channel === 'phone'
+          ? Enums.OTPVerifyRequestChannel.PHONE
           : Enums.OTPVerifyRequestChannel.EMAIL;
         // AccountsContext automatically saves tokens and refreshes profile
         const result = await accounts.verifyOTP({
@@ -361,16 +359,10 @@ const AuthProviderInternal: React.FC<AuthProviderProps> = ({ children, config })
           Analytics.setUser(String(result.user.id));
         }
 
-        // Handle redirect logic here
+        // Handle redirect logic - use provided redirectUrl or fallback to config
         // Use hardPush for full page reload - ensures all React contexts reinitialize
-        const defaultCallback = config?.routes?.defaultCallback || defaultRoutes.defaultCallback;
-
-        if (redirectUrl && redirectUrl !== defaultCallback) {
-          clearRedirectUrl();
-          router.hardPush(redirectUrl);
-        } else {
-          router.hardPush(defaultCallback);
-        }
+        const finalRedirectUrl = redirectUrl || config?.routes?.defaultCallback || defaultRoutes.defaultCallback;
+        router.hardPush(finalRedirectUrl);
 
         return {
           success: true,
@@ -392,7 +384,7 @@ const AuthProviderInternal: React.FC<AuthProviderProps> = ({ children, config })
         };
       }
     },
-    [setStoredEmail, setStoredPhone, clearStoredEmail, clearStoredPhone, redirectUrl, clearRedirectUrl, config?.routes?.defaultCallback, accounts],
+    [setStoredEmail, setStoredPhone, clearStoredEmail, clearStoredPhone, config?.routes?.defaultCallback, accounts, router],
   );
 
   const refreshToken = useCallback(async (): Promise<{ success: boolean; message: string }> => {
@@ -439,18 +431,6 @@ const AuthProviderInternal: React.FC<AuthProviderProps> = ({ children, config })
     }
   }, [clearAuthState, accounts]);
 
-  const clearRedirect = useCallback((): void => {
-    clearRedirectUrl();
-  }, [clearRedirectUrl]);
-
-  // Save current URL for redirect after authentication
-  const saveCurrentUrlForRedirect = useCallback((): void => {
-    if (typeof window !== 'undefined') {
-      const currentUrl = window.location.pathname + window.location.search;
-      setRedirectUrl(currentUrl);
-    }
-  }, [setRedirectUrl]);
-
   const logout = useCallback(async (): Promise<void> => {
     const performLogout = () => {
       // Track logout
@@ -489,37 +469,6 @@ const AuthProviderInternal: React.FC<AuthProviderProps> = ({ children, config })
     }
   }, [accounts, config?.routes?.defaultAuthCallback, router]);
 
-  // Redirect URL methods
-  const getSavedRedirectUrl = useCallback((): string | null => {
-    if (typeof window !== 'undefined') {
-      return sessionStorage.getItem(AUTH_REDIRECT_KEY);
-    }
-    return null;
-  }, []);
-
-  const saveRedirectUrl = useCallback((url: string): void => {
-    if (typeof window !== 'undefined') {
-      sessionStorage.setItem(AUTH_REDIRECT_KEY, url);
-    }
-  }, []);
-
-  const clearSavedRedirectUrl = useCallback((): void => {
-    if (typeof window !== 'undefined') {
-      sessionStorage.removeItem(AUTH_REDIRECT_KEY);
-    }
-  }, []);
-
-  const getFinalRedirectUrl = useCallback((): string => {
-    const savedUrl = getSavedRedirectUrl();
-    return savedUrl || (config?.routes?.defaultCallback || defaultRoutes.defaultCallback);
-  }, [getSavedRedirectUrl, config?.routes?.defaultCallback]);
-
-  const useAndClearRedirectUrl = useCallback((): string => {
-    const finalUrl = getFinalRedirectUrl();
-    clearSavedRedirectUrl();
-    return finalUrl;
-  }, [getFinalRedirectUrl, clearSavedRedirectUrl]);
-
   // Computed: Is admin user (staff or superuser)
   const isAdminUser = useMemo(() => {
     return Boolean(user?.is_staff || user?.is_superuser);
@@ -547,12 +496,6 @@ const AuthProviderInternal: React.FC<AuthProviderProps> = ({ children, config })
       verifyOTP,
       refreshToken,
       logout,
-      getSavedRedirectUrl,
-      saveRedirectUrl,
-      clearSavedRedirectUrl,
-      getFinalRedirectUrl,
-      useAndClearRedirectUrl,
-      saveCurrentUrlForRedirect,
     }),
     [
       user,
@@ -570,12 +513,6 @@ const AuthProviderInternal: React.FC<AuthProviderProps> = ({ children, config })
       verifyOTP,
       refreshToken,
       logout,
-      getSavedRedirectUrl,
-      saveRedirectUrl,
-      clearSavedRedirectUrl,
-      getFinalRedirectUrl,
-      useAndClearRedirectUrl,
-      saveCurrentUrlForRedirect,
     ],
   );
 

package/src/auth/context/types.ts

@@ -48,17 +48,9 @@ export interface AuthContextType {
 
   // OTP Methods - Multi-channel support
   requestOTP: (identifier: string, channel?: 'email' | 'phone', sourceUrl?: string) => Promise<{ success: boolean; message: string }>;
-  verifyOTP: (identifier: string, otpCode: string, channel?: 'email' | 'phone', sourceUrl?: string) => Promise<{ success: boolean; message: string; user?: UserProfile }>;
+  verifyOTP: (identifier: string, otpCode: string, channel?: 'email' | 'phone', sourceUrl?: string, redirectUrl?: string) => Promise<{ success: boolean; message: string; user?: UserProfile }>;
   refreshToken: () => Promise<{ success: boolean; message: string }>;
   logout: () => Promise<void>;
-
-  // Redirect Methods
-  getSavedRedirectUrl: () => string | null;
-  saveRedirectUrl: (url: string) => void;
-  clearSavedRedirectUrl: () => void;
-  getFinalRedirectUrl: () => string;
-  useAndClearRedirectUrl: () => string;
-  saveCurrentUrlForRedirect: () => void;
 }
 
 // Provider props

package/src/auth/hooks/useAuthForm.ts

@@ -39,10 +39,14 @@ export interface UseAuthFormOptions {
   onOTPSuccess?: () => void;
   onError?: (message: string) => void;
   sourceUrl: string;
+  /** URL to redirect after successful OTP verification */
+  redirectUrl?: string;
+  /** If true, user must accept terms before submitting. Default: false */
+  requireTermsAcceptance?: boolean;
 }
 
 export const useAuthForm = (options: UseAuthFormOptions): AuthFormState & AuthFormHandlers => {
-  const { onIdentifierSuccess, onOTPSuccess, onError, sourceUrl } = options;
+  const { onIdentifierSuccess, onOTPSuccess, onError, sourceUrl, redirectUrl, requireTermsAcceptance = false } = options;
   
   // Form state
   const [identifier, setIdentifier] = useState('');
@@ -147,7 +151,7 @@ export const useAuthForm = (options: UseAuthFormOptions): AuthFormState & AuthFo
       return;
     }
 
-    if (!acceptedTerms) {
+    if (requireTermsAcceptance && !acceptedTerms) {
       const message = 'Please accept the Terms of Service and Privacy Policy';
       setError(message);
       onError?.(message);
@@ -187,7 +191,7 @@ export const useAuthForm = (options: UseAuthFormOptions): AuthFormState & AuthFo
 
   const handleOTPSubmit = useCallback(async (e: React.FormEvent) => {
     e.preventDefault();
-    
+
     if (!otp || otp.length < 6) {
       const message = 'Please enter the 6-digit verification code';
       setError(message);
@@ -197,10 +201,10 @@ export const useAuthForm = (options: UseAuthFormOptions): AuthFormState & AuthFo
 
     setIsLoading(true);
     clearError();
-    
+
     try {
-      const result = await verifyOTP(identifier, otp, channel, sourceUrl);
-      
+      const result = await verifyOTP(identifier, otp, channel, sourceUrl, redirectUrl);
+
       if (result.success) {
         // Save identifier on successful login, clear opposite channel
         if (channel === 'email') {
@@ -222,7 +226,7 @@ export const useAuthForm = (options: UseAuthFormOptions): AuthFormState & AuthFo
     } finally {
       setIsLoading(false);
     }
-  }, [identifier, otp, channel, verifyOTP, clearError, setSavedEmail, onOTPSuccess, onError, sourceUrl]);
+  }, [identifier, otp, channel, verifyOTP, clearError, setSavedEmail, onOTPSuccess, onError, sourceUrl, redirectUrl]);
 
   const handleResendOTP = useCallback(async () => {
     setIsLoading(true);