@djangocfg/api 2.1.580 → 2.1.582

package/src/auth/types/form.ts

@@ -15,7 +15,7 @@ export type { WebmailLink };
 // Step Types
 // ─────────────────────────────────────────────────────────────────────────────
 
-export type AuthStep = 'identifier' | 'otp' | '2fa' | '2fa-setup' | 'success';
+export type AuthStep = 'identifier' | 'otp' | 'success';
 
 // ─────────────────────────────────────────────────────────────────────────────
 // OTP Result Types
@@ -28,6 +28,8 @@ export interface OTPRequestResult {
   retryAfter?: number;
   /** Webmail deep-link for the recipient's provider, or null if unknown. */
   webmail?: WebmailLink | null;
+  /** Seconds until a new code may be requested. */
+  resendIn?: number;
 }
 
 /**
@@ -103,20 +105,16 @@ export interface AuthFormState {
   step: AuthStep;
   /** Error message */
   error: string;
-  /** 2FA session ID from OTP/OAuth verification */
-  twoFactorSessionId: string | null;
-  /** Whether user should be prompted to enable 2FA */
-  shouldPrompt2FA: boolean;
-  /** 2FA code input */
-  twoFactorCode: string;
-  /** Using backup code instead of TOTP */
-  useBackupCode: boolean;
   /** Seconds remaining until rate limit lifts (0 = not rate limited) */
   rateLimitSeconds: number;
   /** True when rateLimitSeconds > 0 — submit should be disabled */
   isRateLimited: boolean;
   /** Formatted countdown label, e.g. "19:00" or "42s" */
   rateLimitLabel: string;
+  /** Seconds until another code may be requested (0 = may resend now) */
+  resendSeconds: number;
+  /** Formatted resend countdown, e.g. "28s" */
+  resendLabel: string;
   /** Webmail deep-link for the current identifier's provider (null = no button). */
   webmail: WebmailLink | null;
 }
@@ -136,12 +134,10 @@ export interface AuthFormStateHandlers {
   clearError: () => void;
   setStep: (step: AuthStep) => void;
   setIsLoading: (loading: boolean) => void;
-  setTwoFactorSessionId: (sessionId: string | null) => void;
-  setShouldPrompt2FA: (prompt: boolean) => void;
-  setTwoFactorCode: (code: string) => void;
-  setUseBackupCode: (useBackup: boolean) => void;
   /** Start a countdown timer that disables submit for `seconds` seconds */
   startRateLimitCountdown: (seconds: number) => void;
+  /** Start the countdown before another code may be requested */
+  startResendCountdown: (seconds: number) => void;
   /** Set (or clear) the webmail deep-link for the current identifier */
   setWebmail: (webmail: WebmailLink | null) => void;
 }
@@ -154,12 +150,6 @@ export interface AuthFormSubmitHandlers {
   handleResendOTP: () => Promise<void>;
   handleBackToIdentifier: () => void;
   forceOTPStep: () => void;
-  /** Handle 2FA TOTP/backup code verification */
-  handle2FASubmit: (e: React.FormEvent) => Promise<void>;
-  /** Switch to backup code input */
-  handleUseBackupCode: () => void;
-  /** Switch back to TOTP input */
-  handleUseTOTP: () => void;
 }
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -180,19 +170,6 @@ export interface AuthFormAutoSubmit {
   isAutoSubmittingFromUrl: MutableRefObject<boolean>;
 }
 
-// ─────────────────────────────────────────────────────────────────────────────
-// 2FA State (from useTwoFactor hook)
-// ─────────────────────────────────────────────────────────────────────────────
-
-export interface AuthForm2FAState {
-  /** Loading state for 2FA verification */
-  is2FALoading: boolean;
-  /** Warning message from 2FA (e.g., low backup codes) */
-  twoFactorWarning: string | null;
-  /** Remaining attempts before 2FA lockout (null = unknown) */
-  twoFactorAttemptsRemaining: number | null;
-}
-
 // ─────────────────────────────────────────────────────────────────────────────
 // Combined Form Interface
 // ─────────────────────────────────────────────────────────────────────────────
@@ -202,8 +179,7 @@ export interface AuthFormReturn extends
   AuthFormStateHandlers,
   AuthFormSubmitHandlers,
   AuthFormValidation,
-  AuthFormAutoSubmit,
-  AuthForm2FAState {}
+  AuthFormAutoSubmit {}
 
 // ─────────────────────────────────────────────────────────────────────────────
 // Hook Options

package/src/auth/__tests__/useAuthForm.2fa.test.ts

@@ -1,106 +0,0 @@
-/**
- * Tests for useAuthForm 2FA behavior.
- *
- * The sign-in flow only *verifies* an existing 2FA challenge — it never
- * prompts the user to *set up* 2FA (that lives in ProfileLayout). These tests
- * cover the step machine and the shouldPrompt2FA state that the verification
- * branch relies on.
- */
-
-// @vitest-environment jsdom
-import { act, renderHook } from '@testing-library/react';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { useAuthForm } from '../hooks/useAuthForm';
-
-// useAuthForm pulls in useAutoAuth → useCfgRouter → next/navigation, which
-// throws outside an app-router provider. Stub the navigation surface it uses.
-vi.mock('next/navigation', () => ({
-  useRouter: () => ({ push: vi.fn(), replace: vi.fn(), prefetch: vi.fn(), back: vi.fn() }),
-  usePathname: () => '/auth',
-  useSearchParams: () => new URLSearchParams(),
-}));
-
-// Mock dependencies (migrated from Jest → Vitest)
-vi.mock('../context', () => ({
-  useAuth: () => ({
-    requestOTP: vi.fn().mockResolvedValue({ success: true }),
-    verifyOTP: vi.fn(),
-    getSavedEmail: vi.fn().mockReturnValue(null),
-    saveEmail: vi.fn(),
-    clearSavedEmail: vi.fn(),
-    getSavedPhone: vi.fn().mockReturnValue(null),
-    savePhone: vi.fn(),
-    clearSavedPhone: vi.fn(),
-  }),
-}));
-
-vi.mock('../hooks/useTwoFactorVerify', () => ({
-  useTwoFactorVerify: () => ({
-    isLoading: false,
-    warning: null,
-    verifyTOTP: vi.fn(),
-    verifyBackupCode: vi.fn(),
-  }),
-}));
-
-vi.mock('../utils/logger', () => ({
-  authLogger: {
-    info: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-
-describe('useAuthForm - 2FA', () => {
-  const defaultOptions = {
-    sourceUrl: 'http://localhost',
-    redirectUrl: '/dashboard',
-  };
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  describe('step transitions', () => {
-    it('should start on the identifier step', () => {
-      const { result } = renderHook(() => useAuthForm(defaultOptions));
-
-      expect(result.current.step).toBe('identifier');
-    });
-
-    it('should expose a setStep handler', () => {
-      const { result } = renderHook(() => useAuthForm(defaultOptions));
-
-      expect(typeof result.current.setStep).toBe('function');
-    });
-
-    it('should be able to transition to the success step', () => {
-      const { result } = renderHook(() => useAuthForm(defaultOptions));
-
-      act(() => {
-        result.current.setStep('success');
-      });
-
-      expect(result.current.step).toBe('success');
-    });
-  });
-
-  describe('shouldPrompt2FA state', () => {
-    it('should initialize shouldPrompt2FA as false', () => {
-      const { result } = renderHook(() => useAuthForm(defaultOptions));
-
-      expect(result.current.shouldPrompt2FA).toBe(false);
-    });
-
-    it('should be able to set shouldPrompt2FA', () => {
-      const { result } = renderHook(() => useAuthForm(defaultOptions));
-
-      act(() => {
-        result.current.setShouldPrompt2FA(true);
-      });
-
-      expect(result.current.shouldPrompt2FA).toBe(true);
-    });
-  });
-});