apiClient

frontend/src/settings/usePasskeys.ts

@@ -6,12 +6,12 @@ import {
   preparePublicKeyCreationOptions,
   serializeRegistrationCredential,
 } from '../utils/webauthn';
-
-type ApiClient = {
-  get: (path: string) => Promise<{ data: unknown }>;
-  post: (path: string, body?: unknown) => Promise<{ data: unknown }>;
-  delete: (path: string) => Promise<{ data: unknown }>;
-};
+import {
+  deletePasskey,
+  finishPasskeyRegistration,
+  listPasskeys,
+  startPasskeyRegistration,
+} from '../lib/apiClient';
 
 type StatusMessageFn = (message: string, variant?: string) => void;
 type NotifyApiErrorFn = (error: unknown, message: string) => void;
@@ -69,7 +69,6 @@ export type RevokePasskeyResult =
   | { ok: false; reason: RevokePasskeyFailureReason; message?: string };
 
 interface UsePasskeysArgs {
-  api: ApiClient;
   notifyApiError: NotifyApiErrorFn;
   setStatusMessage: StatusMessageFn;
   token?: string | null;
@@ -89,7 +88,7 @@ interface UsePasskeysResult {
   ) => Promise<RevokePasskeyResult>;
 }
 
-const usePasskeys = ({ api, notifyApiError, setStatusMessage, token }: UsePasskeysArgs): UsePasskeysResult => {
+const usePasskeys = ({ notifyApiError, setStatusMessage, token }: UsePasskeysArgs): UsePasskeysResult => {
   const [passkeys, setPasskeys] = useState<PasskeyRecord[]>([]);
   const [passkeysSupported, setPasskeysSupported] = useState<boolean | null>(null);
   const [passkeysLoading, setPasskeysLoading] = useState(false);
@@ -102,8 +101,7 @@ const usePasskeys = ({ api, notifyApiError, setStatusMessage, token }: UsePasske
     }
     setPasskeysLoading(true);
     try {
-      const { data } = await api.get('/profile/passkeys');
-      const passkeyData = Array.isArray(data) ? (data as PasskeyRecord[]) : [];
+      const passkeyData = await listPasskeys();
       setPasskeys(passkeyData);
       setPasskeysSupported(true);
     } catch (error) {
@@ -117,7 +115,7 @@ const usePasskeys = ({ api, notifyApiError, setStatusMessage, token }: UsePasske
     } finally {
       setPasskeysLoading(false);
     }
-  }, [api, notifyApiError, token]);
+  }, [notifyApiError, token]);
 
   const registerPasskey = useCallback(
     async ({ nickname }: { nickname?: string } = {}): Promise<RegisterPasskeyResult> => {
@@ -132,7 +130,7 @@ const usePasskeys = ({ api, notifyApiError, setStatusMessage, token }: UsePasske
 
       setRegisteringPasskey(true);
       try {
-        const { data } = await api.post('/auth/passkeys/register/start', {});
+        const data = await startPasskeyRegistration();
         const challengeData = data as PasskeyChallengeResponse | undefined;
         const challengeId = challengeData?.challengeId || challengeData?.challenge_id;
         const publicKeyOptions =
@@ -164,7 +162,7 @@ const usePasskeys = ({ api, notifyApiError, setStatusMessage, token }: UsePasske
           payload.nickname = trimmedNickname;
         }
 
-        await api.post('/auth/passkeys/register/finish', payload);
+        await finishPasskeyRegistration(payload);
         await refreshPasskeys();
         setPasskeysSupported(true);
         setStatusMessage('Passkey registered.', 'success');
@@ -188,7 +186,7 @@ const usePasskeys = ({ api, notifyApiError, setStatusMessage, token }: UsePasske
         setRegisteringPasskey(false);
       }
     },
-    [api, notifyApiError, refreshPasskeys, registeringPasskey, setStatusMessage],
+    [notifyApiError, refreshPasskeys, registeringPasskey, setStatusMessage],
   );
 
   const revokePasskey = useCallback(
@@ -201,8 +199,7 @@ const usePasskeys = ({ api, notifyApiError, setStatusMessage, token }: UsePasske
       }
       setRevokingPasskeyId(passkeyId);
       try {
-        const query = reason ? `?reason=${encodeURIComponent(reason)}` : '';
-        await api.delete(`/profile/passkeys/${passkeyId}${query}`);
+        await deletePasskey(passkeyId, { reason });
         await refreshPasskeys();
         setStatusMessage('Passkey revoked.', 'success');
         return { ok: true };
@@ -214,7 +211,7 @@ const usePasskeys = ({ api, notifyApiError, setStatusMessage, token }: UsePasske
         setRevokingPasskeyId(null);
       }
     },
-    [api, notifyApiError, refreshPasskeys, setStatusMessage],
+    [notifyApiError, refreshPasskeys, setStatusMessage],
   );
 
   return {