pubKeyStore와 privKeyStore를 keyPairStore로 통합

src/lib/indexedDB.ts

@@ -1,21 +1,21 @@
 import { Dexie, type EntityTable } from "dexie";
 
-interface ClientKeyPair {
+interface KeyPair {
   type: "publicKey" | "privateKey";
   key: CryptoKey;
 }
 
 const keyStore = new Dexie("keyStore") as Dexie & {
-  clientKeyPairs: EntityTable<ClientKeyPair, "type">;
+  keyPair: EntityTable<KeyPair, "type">;
 };
 
 keyStore.version(1).stores({
-  clientKeyPairs: "type",
+  keyPair: "type",
 });
 
 export const getKeyPairFromIndexedDB = async () => {
-  const pubKey = await keyStore.clientKeyPairs.get("publicKey");
-  const privKey = await keyStore.clientKeyPairs.get("privateKey");
+  const pubKey = await keyStore.keyPair.get("publicKey");
+  const privKey = await keyStore.keyPair.get("privateKey");
   return {
     pubKey: pubKey?.key ?? null,
     privKey: privKey?.key ?? null,
@@ -23,7 +23,10 @@ export const getKeyPairFromIndexedDB = async () => {
 };
 
 export const storeKeyPairIntoIndexedDB = async (pubKey: CryptoKey, privKey: CryptoKey) => {
-  await keyStore.clientKeyPairs.bulkPut([
+  if (!pubKey.extractable) throw new Error("Public key must be extractable");
+  if (privKey.extractable) throw new Error("Private key must be non-extractable");
+
+  await keyStore.keyPair.bulkPut([
     { type: "publicKey", key: pubKey },
     { type: "privateKey", key: privKey },
   ]);

src/lib/stores/key.ts

@@ -1,4 +1,3 @@
 import { writable } from "svelte/store";
 
-export const pubKeyStore = writable<CryptoKey | null>(null);
-export const privKeyStore = writable<CryptoKey | null>(null);
+export const keyPairStore = writable<CryptoKeyPair | null>(null);

src/routes/(fullscreen)/key/generate/service.ts

@@ -1,5 +1,5 @@
 import { storeKeyPairIntoIndexedDB } from "$lib/indexedDB";
-import { pubKeyStore, privKeyStore } from "$lib/stores";
+import { keyPairStore } from "$lib/stores";
 
 type KeyType = "public" | "private";
 
@@ -42,12 +42,13 @@ const exportKeyToBase64 = async (key: CryptoKey, type: KeyType) => {
 
 export const generateKeyPair = async () => {
   const keyPair = await generateRSAKeyPair();
-  const privKeySecure = await makeRSAKeyNonextractable(keyPair.privateKey, "private");
+  const privKeySecured = await makeRSAKeyNonextractable(keyPair.privateKey, "private");
 
-  pubKeyStore.set(keyPair.publicKey);
-  privKeyStore.set(privKeySecure);
-
-  await storeKeyPairIntoIndexedDB(keyPair.publicKey, privKeySecure);
+  keyPairStore.set({
+    publicKey: keyPair.publicKey,
+    privateKey: privKeySecured,
+  });
+  await storeKeyPairIntoIndexedDB(keyPair.publicKey, privKeySecured);
 
   return {
     pubKeyBase64: await exportKeyToBase64(keyPair.publicKey, "public"),

src/routes/api/key/register/+server.ts

@@ -18,5 +18,5 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
   }
 
   await registerPubKey(userId, zodRes.data.pubKey);
-  return text("Public key registered");
+  return text("Public key registered", { headers: { "Content-Type": "text/plain" } });
 };