From 615b59269674be524a5d6a61d5476f711b14e429 Mon Sep 17 00:00:00 2001
From: Perry Mitchell <perry@perrymitchell.net>
Date: Fri, 13 Oct 2023 22:09:05 +0300
Subject: [PATCH] Fix JWK import/export for api

---
 source/main/services/browserAuth.ts | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/source/main/services/browserAuth.ts b/source/main/services/browserAuth.ts
index e8bd8d26..7b4c03ff 100644
--- a/source/main/services/browserAuth.ts
+++ b/source/main/services/browserAuth.ts
@@ -50,12 +50,8 @@ export async function encryptPayload(
 }
 
 async function exportECDHKey(key: CryptoKey): Promise<string> {
-    if (key.type === "private") {
-        const exported = await webcrypto.subtle.exportKey("jwk", key);
-        return Buffer.from(exported.d).toString("base64");
-    }
-    const exported = await webcrypto.subtle.exportKey("raw", key);
-    return Buffer.from(exported).toString("base64");
+    const exported = await webcrypto.subtle.exportKey("jwk", key);
+    return JSON.stringify(exported);
 }
 
 export async function generateBrowserKeys(): Promise<void> {
@@ -85,15 +81,17 @@ export async function getBrowserPublicKeyString(): Promise<string> {
 }
 
 async function importECDHKey(key: string): Promise<CryptoKey> {
-    const buffer = Buffer.from(key, "base64").buffer;
+    const jwk = JSON.parse(key) as JsonWebKey;
+    const usages: Array<KeyUsage> =
+        jwk.key_ops && jwk.key_ops.includes("deriveKey") ? ["deriveKey"] : [];
     return webcrypto.subtle.importKey(
-        "raw",
-        buffer,
+        "jwk",
+        jwk,
         {
             name: API_KEY_ALGO,
             namedCurve: API_KEY_CURVE
         },
-        false,
-        ["deriveKey"]
+        true,
+        usages
     );
 }