Refactor the code

frontend/src/auth/crypto.ts

@@ -2,18 +2,12 @@ import { API_BASE_URL } from "../core/config";
 import { getAuthHeaders } from "./api";
 import { generateX25519KeyPair } from "../crypto/asymmetric";
 import { encryptBackupWithPassword, decryptBackupWithPassword, encodeBlob, decodeBlob } from "../crypto/backup";
+import { b64, ub64 } from "../utils/utils";
+import type { BackupBlob, UploadPublicKeyRequest } from "../core/types";
 
 let currentPublicKey: Uint8Array | null = null;
 let currentPrivateKey: Uint8Array | null = null;
 
-function b64(a: Uint8Array): string { return btoa(String.fromCharCode(...a)); }
-function ub64(s: string): Uint8Array {
-	const bin = atob(s);
-	const arr = new Uint8Array(bin.length);
-	for (let i = 0; i < bin.length; i++) arr[i] = bin.charCodeAt(i);
-	return arr;
-}
-
 async function fetchPublicKey(): Promise<Uint8Array | null> {
 	const res = await fetch(`${API_BASE_URL}/crypto/public-key`, { method: "GET", headers: getAuthHeaders(true) });
 	if (!res.ok) return null;
@@ -23,25 +17,37 @@ async function fetchPublicKey(): Promise<Uint8Array | null> {
 }
 
 async function uploadPublicKey(publicKey: Uint8Array): Promise<void> {
+	const payload: UploadPublicKeyRequest = { 
+		publicKey: b64(publicKey) 
+	}
+
 	await fetch(`${API_BASE_URL}/crypto/public-key`, {
 		method: "POST",
 		headers: getAuthHeaders(true),
-		body: JSON.stringify({ publicKey: b64(publicKey) })
+		body: JSON.stringify(payload)
 	});
 }
 
 async function fetchBackupBlob(): Promise<string | null> {
-	const res = await fetch(`${API_BASE_URL}/crypto/backup`, { method: "GET", headers: getAuthHeaders(true) });
-	if (!res.ok) return null;
-	const data = await res.json();
-	return data?.blob ?? null;
+	const res = await fetch(`${API_BASE_URL}/crypto/backup`, { 
+		method: "GET",
+		headers: getAuthHeaders(true) 
+	});
+	if (res.ok) {
+		const response: BackupBlob = await res.json();
+		return response.blob;
+	} else {
+		return null;
+	}
 }
 
 async function uploadBackupBlob(blobJson: string): Promise<void> {
+	const payload: BackupBlob = { blob: blobJson }
+
 	await fetch(`${API_BASE_URL}/crypto/backup`, {
 		method: "POST",
 		headers: getAuthHeaders(true),
-		body: JSON.stringify({ blob: blobJson })
+		body: JSON.stringify(payload)
 	});
 }