@djangocfg/api 2.1.263 → 2.1.266

package/src/auth/hooks/useTwoFactorStatus.ts

@@ -3,6 +3,7 @@
 import { useCallback, useState } from 'react';
 
 import { apiTotp } from '../../clients';
+import { APIError } from '../../_api/generated/cfg_totp';
 import { authLogger } from '../utils/logger';
 
 export interface TwoFactorDevice {
@@ -48,6 +49,18 @@ export interface UseTwoFactorStatusReturn {
  * }
  * ```
  */
+/** Extract a human-readable message from a thrown error. */
+function extractErrorMessage(err: unknown, fallback: string): string {
+  if (err instanceof APIError) {
+    const body = err.response as Record<string, unknown> | null;
+    if (typeof body?.error === 'string') return body.error;
+    if (typeof body?.detail === 'string') return body.detail;
+    return err.message;
+  }
+  if (err instanceof Error) return err.message;
+  return fallback;
+}
+
 export const useTwoFactorStatus = (): UseTwoFactorStatusReturn => {
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -68,13 +81,10 @@ export const useTwoFactorStatus = (): UseTwoFactorStatusReturn => {
     try {
       authLogger.info('Fetching 2FA status...');
 
-      const response = await apiTotp.totp_management.totpDevicesList();
+      // API returns { devices: [...], has_2fa_enabled: bool }
+      const response = await apiTotp.totp_management.totpDevicesRetrieve();
 
-      // Map devices to our format
-
-      // Join all devices into a single array
-      const devices = response.results.flatMap((device) => device.devices);
-      const mappedDevices: TwoFactorDevice[] = devices.map((device) => ({
+      const mappedDevices: TwoFactorDevice[] = response.devices.map((device) => ({
         id: device.id,
         name: device.name,
         createdAt: device.created_at,
@@ -83,15 +93,12 @@ export const useTwoFactorStatus = (): UseTwoFactorStatusReturn => {
       }));
 
       setDevices(mappedDevices);
-      
-      // 2FA is enabled if there are any devices
-      const enabled = mappedDevices.length > 0;
-      setHas2FAEnabled(enabled);
+      setHas2FAEnabled(response.has_2fa_enabled);
 
-      authLogger.info('2FA status:', enabled ? 'enabled' : 'disabled');
+      authLogger.info('2FA status:', response.has_2fa_enabled ? 'enabled' : 'disabled');
 
     } catch (err) {
-      const errorMessage = err instanceof Error ? err.message : 'Failed to fetch 2FA status';
+      const errorMessage = extractErrorMessage(err, 'Failed to fetch 2FA status');
       authLogger.error('Failed to fetch 2FA status:', err);
       setError(errorMessage);
     } finally {
@@ -122,8 +129,8 @@ export const useTwoFactorStatus = (): UseTwoFactorStatusReturn => {
       authLogger.info('2FA disabled successfully');
       return true;
 
-    } catch (err) {
-      const errorMessage = err instanceof Error ? err.message : 'Invalid verification code';
+    } catch (err: unknown) {
+      const errorMessage = extractErrorMessage(err, 'Invalid verification code');
       authLogger.error('Failed to disable 2FA:', err);
       setError(errorMessage);
       return false;

package/src/_api/generated/cfg_totp/_utils/schemas/PaginatedDeviceListResponseList.schema.ts

@@ -1,24 +0,0 @@
-/**
- * Zod schema for PaginatedDeviceListResponseList
- *
- * This schema provides runtime validation and type inference.
- *  */
-import { z } from 'zod'
-import { DeviceListResponseSchema } from './DeviceListResponse.schema'
-
-export const PaginatedDeviceListResponseListSchema = z.object({
-  count: z.number().int(),
-  page: z.number().int(),
-  pages: z.number().int(),
-  page_size: z.number().int(),
-  has_next: z.boolean(),
-  has_previous: z.boolean(),
-  next_page: z.number().int().nullable().optional(),
-  previous_page: z.number().int().nullable().optional(),
-  results: z.array(DeviceListResponseSchema),
-})
-
-/**
- * Infer TypeScript type from Zod schema
- */
-export type PaginatedDeviceListResponseList = z.infer<typeof PaginatedDeviceListResponseListSchema>