clean up and update test

tkhq · Aug 14, 2024 · 5ac2345 · 5ac2345
1 parent 3a20f2a
commit 5ac2345
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 77 deletions.
diff --git a/examples/browser-api-key-stamper/src/pages/index.tsx b/examples/browser-api-key-stamper/src/pages/index.tsx
@@ -80,10 +80,7 @@ export default function WhoamiPage() {
         />
       </a>
 
-      <form
-        className={styles.form}
-        onSubmit={whoamiFormSubmit(whoami)}
-      >
+      <form className={styles.form} onSubmit={whoamiFormSubmit(whoami)}>
         <label className={styles.label}>
           API Private Key
           <input

diff --git a/packages/api-key-stamper/src/__tests__/utils-test.ts b/packages/api-key-stamper/src/__tests__/utils-test.ts
@@ -1,10 +1,6 @@
 import { test, expect } from "@jest/globals";
 import { convertTurnkeyApiKeyToJwk } from "../utils";
-import { readFixture } from "../__fixtures__/shared";
-import { assertValidSignature } from "./shared";
-import { generateP256KeyPair } from "@turnkey/crypto";
 import * as crypto from "crypto";
-import { uint8ArrayFromHexString } from "@turnkey/encoding";
 import { signWithApiKey as signWeb } from "../webcrypto";
 
 Object.defineProperty(globalThis, "crypto", {
@@ -15,67 +11,23 @@ Object.defineProperty(globalThis, "crypto", {
 });
 
 test("correctly converts turnkey API key to JWK", async function () {
-  for (let i = 0; i < 10000; i++) {
-    try {
-      const newApiKeyPair = generateP256KeyPair();
-
-      const content = crypto.randomBytes(16).toString("hex");
-
-      const signed = await signWeb({
-        content,
-        publicKey: newApiKeyPair.publicKey,
-        // publicKey: "",
-        privateKey:
-          "ee05fc3bdf4161bc70701c221d8d77180294cefcfcea64ba83c4d4c732fcb9",
-      });
-
-      const result = convertTurnkeyApiKeyToJwk({
-        uncompressedPrivateKeyHex:
-          "ee05fc3bdf4161bc70701c221d8d77180294cefcfcea64ba83c4d4c732fcb9", // arbitrary 31 byte hex string
-        compressedPublicKeyHex: newApiKeyPair.publicKey,
-      });
-
-      const info = {
-        publicKey: newApiKeyPair.publicKeyUncompressed,
-        publicKeyBuffer: new Uint8Array(
-          Buffer.from(newApiKeyPair.publicKeyUncompressed, "hex")
-        ),
-        publicKeyX: new Uint8Array(
-          Buffer.from(newApiKeyPair.publicKeyUncompressed, "hex").subarray(
-            1,
-            33
-          )
-        ),
-        publicKeyXFromHex: uint8ArrayFromHex(
-          newApiKeyPair.publicKeyUncompressed.slice(2, 66)
-        ),
-        // publicKeyXLength: new Uint8Array(Buffer.from(newApiKeyPair.publicKeyUncompressed, "hex").subarray(1, 33)).length,
-        publicKeyY: new Uint8Array(
-          Buffer.from(newApiKeyPair.publicKeyUncompressed, "hex").subarray(33)
-        ),
-        publicKeyYFromHex: uint8ArrayFromHex(
-          newApiKeyPair.publicKeyUncompressed.slice(66)
-        ),
-        // publicKeyYLength: new Uint8Array(Buffer.from(newApiKeyPair.publicKeyUncompressed, "hex").subarray(33)).length,
-      };
-
-      // console.log(info)
-
-      if (info.publicKeyX[0] == 0 || info.publicKeyY[0] == 0) {
-        console.log("eureka");
-        console.log("info", info);
-      }
-    } catch (err: any) {
-      console.log("caught an error", err);
-
-      throw new Error(err);
-
-      // expect(err).toBeTruthy();
-
-      // return;
-    }
-  }
+  const content = crypto.randomBytes(16).toString("hex");
+  const privateKey =
+    "ee05fc3bdf4161bc70701c221d8d77180294cefcfcea64ba83c4d4c732fcb9"; // 31 bytes, not 32
+  const publicKey =
+    "03f3e1d85243f8b2927106cc0ddd84752c7782f863f303f975c3e8fe13d588d534";
+
+  expect(
+    convertTurnkeyApiKeyToJwk({
+      uncompressedPrivateKeyHex: privateKey,
+      compressedPublicKeyHex: publicKey,
+    })
+  ).toBeTruthy();
+  expect(
+    await signWeb({
+      content,
+      publicKey,
+      privateKey,
+    })
+  ).toBeTruthy();
 });
-
-const uint8ArrayFromHex = (hexString: string) =>
-  new Uint8Array(hexString.match(/../g)!.map((h) => parseInt(h, 16)));
diff --git a/packages/api-key-stamper/src/tink/elliptic_curves.ts b/packages/api-key-stamper/src/tink/elliptic_curves.ts
@@ -37,8 +37,6 @@ function byteArrayToInteger(bytes: Uint8Array): bigint {
 
 /** Converts bigint to byte array. */
 function integerToByteArray(i: bigint, length: number): Uint8Array {
-  console.log("bigint", i);
-
   const input = i.toString(16);
   const numHexChars = length * 2;
   let padding = "";
@@ -50,10 +48,6 @@ function integerToByteArray(i: bigint, length: number): Uint8Array {
     padding = "0".repeat(numHexChars - input.length);
   }
 
-  console.log("hex input", input);
-  console.log("input", Bytes.fromHex(input));
-  console.log("padded input", Bytes.fromHex(padding + input));
-
   return Bytes.fromHex(padding + input);
 }