From 66daebe577f4b1646cfff60bd138d6d55b5b11b4 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Thu, 9 Jan 2025 02:59:59 +0900
Subject: [PATCH] =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routes/(fullscreen)/auth/login/service.ts  |  4 +---
 .../(fullscreen)/key/export/+page.svelte       | 18 +++++++++---------
 src/routes/(fullscreen)/key/export/service.ts  |  6 +++---
 .../(fullscreen)/key/generate/+page.svelte     |  4 ++--
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/routes/(fullscreen)/auth/login/service.ts b/src/routes/(fullscreen)/auth/login/service.ts
index 0227edc..4e6145d 100644
--- a/src/routes/(fullscreen)/auth/login/service.ts
+++ b/src/routes/(fullscreen)/auth/login/service.ts
@@ -9,9 +9,7 @@ export { requestMasterKeyDownload } from "$lib/services/key";
 export const requestLogin = async (email: string, password: string) => {
   const res = await fetch("/api/auth/login", {
     method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
+    headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ email, password } satisfies LoginRequest),
   });
   return res.ok;
diff --git a/src/routes/(fullscreen)/key/export/+page.svelte b/src/routes/(fullscreen)/key/export/+page.svelte
index e673713..19e1e0a 100644
--- a/src/routes/(fullscreen)/key/export/+page.svelte
+++ b/src/routes/(fullscreen)/key/export/+page.svelte
@@ -7,7 +7,7 @@
   import BeforeContinueBottomSheet from "./BeforeContinueBottomSheet.svelte";
   import BeforeContinueModal from "./BeforeContinueModal.svelte";
   import {
-    exportClientKeys,
+    serializeClientKeys,
     requestClientRegistration,
     storeClientKeys,
     requestTokenUpgrade,
@@ -21,14 +21,14 @@
   let isBeforeContinueModalOpen = $state(false);
   let isBeforeContinueBottomSheetOpen = $state(false);
 
-  const exportKeyPair = () => {
-    const clientKeysExported = exportClientKeys(
+  const exportClientKeys = () => {
+    const clientKeysSerialized = serializeClientKeys(
       data.encryptKeyBase64,
       data.decryptKeyBase64,
       data.signKeyBase64,
       data.verifyKeyBase64,
     );
-    const clientKeysBlob = new Blob([JSON.stringify(clientKeysExported)], {
+    const clientKeysBlob = new Blob([JSON.stringify(clientKeysSerialized)], {
       type: "application/json",
     });
     saveAs(clientKeysBlob, "arkvault-clientkey.json");
@@ -40,7 +40,7 @@
     }
   };
 
-  const registerPubKey = async () => {
+  const registerPubKeys = async () => {
     if (!$clientKeyStore) {
       throw new Error("Failed to find key pair");
     }
@@ -100,7 +100,7 @@
   </div>
 </TitleDiv>
 <BottomDiv>
-  <Button onclick={exportKeyPair}>암호 키 내보내기</Button>
+  <Button onclick={exportClientKeys}>암호 키 내보내기</Button>
   <TextButton
     onclick={() => {
       isBeforeContinueModalOpen = true;
@@ -110,9 +110,9 @@
   </TextButton>
 </BottomDiv>
 
-<BeforeContinueModal bind:isOpen={isBeforeContinueModalOpen} onContinueClick={registerPubKey} />
+<BeforeContinueModal bind:isOpen={isBeforeContinueModalOpen} onContinueClick={registerPubKeys} />
 <BeforeContinueBottomSheet
   bind:isOpen={isBeforeContinueBottomSheetOpen}
-  onRetryClick={exportKeyPair}
-  onContinueClick={registerPubKey}
+  onRetryClick={exportClientKeys}
+  onContinueClick={registerPubKeys}
 />
diff --git a/src/routes/(fullscreen)/key/export/service.ts b/src/routes/(fullscreen)/key/export/service.ts
index 8a59f94..b943379 100644
--- a/src/routes/(fullscreen)/key/export/service.ts
+++ b/src/routes/(fullscreen)/key/export/service.ts
@@ -7,7 +7,7 @@ import type { ClientKeys } from "$lib/stores";
 export { requestTokenUpgrade } from "$lib/services/auth";
 export { requestClientRegistration } from "$lib/services/key";
 
-type ExportedKeyPairs = {
+type SerializedKeyPairs = {
   generator: "ArkVault";
   exportedAt: Date;
 } & {
@@ -18,7 +18,7 @@ type ExportedKeyPairs = {
   verifyKey: string;
 };
 
-export const exportClientKeys = (
+export const serializeClientKeys = (
   encryptKeyBase64: string,
   decryptKeyBase64: string,
   signKeyBase64: string,
@@ -32,7 +32,7 @@ export const exportClientKeys = (
     decryptKey: decryptKeyBase64,
     signKey: signKeyBase64,
     verifyKey: verifyKeyBase64,
-  } satisfies ExportedKeyPairs;
+  } satisfies SerializedKeyPairs;
 };
 
 export const storeClientKeys = async (clientKeys: ClientKeys) => {
diff --git a/src/routes/(fullscreen)/key/generate/+page.svelte b/src/routes/(fullscreen)/key/generate/+page.svelte
index ba6b60d..81c6180 100644
--- a/src/routes/(fullscreen)/key/generate/+page.svelte
+++ b/src/routes/(fullscreen)/key/generate/+page.svelte
@@ -32,7 +32,7 @@
     },
   ];
 
-  const generate = async () => {
+  const generateKeys = async () => {
     // TODO: Loading indicator
 
     const { encryptKey, ...clientKeys } = await generateClientKeys();
@@ -74,6 +74,6 @@
   </div>
 </TitleDiv>
 <BottomDiv>
-  <Button onclick={generate}>새 암호 키 생성하기</Button>
+  <Button onclick={generateKeys}>새 암호 키 생성하기</Button>
   <TextButton>키를 갖고 있어요</TextButton>
 </BottomDiv>