ox 1.2.0 → 1.3.0

package/src/webauthn/_test/WebAuthn.browser.test.ts

@@ -0,0 +1,28 @@
+import { describe, expect, test } from 'vp/test'
+import * as Bytes from '../../core/Bytes.js'
+import * as Secp256k1 from '../../core/Secp256k1.js'
+import * as WebAuthn from '../../core/WebAuthn.js'
+
+const rpId = 'localhost'
+const rpName = 'Ox Test'
+
+describe('createCredential + getCredential', () => {
+  test('derives a stable private key', async () => {
+    const credential = await WebAuthn.createCredential({
+      name: `prf-${Date.now()}`,
+      prf: true,
+      rp: {
+        id: rpId,
+        name: rpName,
+      },
+    })
+    const next = await WebAuthn.getCredential({
+      credentialId: credential.id,
+      prf: true,
+      rpId,
+    })
+
+    expect(Bytes.isEqual(credential.prf, next.prf)).toBe(true)
+    expect(Secp256k1.fromPrf(credential.prf)).toBe(Secp256k1.fromPrf(next.prf))
+  })
+})

package/src/webauthn/internal/utils.ts

@@ -24,8 +24,9 @@ export function bytesToArrayBuffer(bytes: Uint8Array): ArrayBuffer {
 /** @internal */
 export function bufferSourceToBytes(source: Types.BufferSource): Uint8Array {
   if (source instanceof Uint8Array) return source
-  if (source instanceof ArrayBuffer) return new Uint8Array(source)
-  return new Uint8Array(source.buffer, source.byteOffset, source.byteLength)
+  if (ArrayBuffer.isView(source))
+    return new Uint8Array(source.buffer, source.byteOffset, source.byteLength)
+  return new Uint8Array(source)
 }
 
 /**
@@ -119,13 +120,20 @@ export function serializeExtensions(
   extensions: Types.AuthenticationExtensionsClientInputs,
 ): Types.AuthenticationExtensionsClientInputs<true> {
   const { prf, ...rest } = extensions
+  const { eval: eval_, evalByCredential } = prf ?? {}
   return {
     ...rest,
     ...(prf && {
       prf: {
-        eval: {
-          first: Base64.fromBytes(prf.eval.first, base64UrlOptions),
-        },
+        ...(eval_ && { eval: serializePrfValues(eval_) }),
+        ...(evalByCredential && {
+          evalByCredential: Object.fromEntries(
+            Object.entries(evalByCredential).map(([id, values]) => [
+              id,
+              serializePrfValues(values),
+            ]),
+          ),
+        }),
       },
     }),
   }
@@ -136,14 +144,39 @@ export function deserializeExtensions(
   extensions: Types.AuthenticationExtensionsClientInputs<true>,
 ): Types.AuthenticationExtensionsClientInputs {
   const { prf, ...rest } = extensions
+  const { eval: eval_, evalByCredential } = prf ?? {}
   return {
     ...rest,
     ...(prf && {
       prf: {
-        eval: {
-          first: Base64.toBytes(prf.eval.first),
-        },
+        ...(eval_ && { eval: deserializePrfValues(eval_) }),
+        ...(evalByCredential && {
+          evalByCredential: Object.fromEntries(
+            Object.entries(evalByCredential).map(([id, values]) => [
+              id,
+              deserializePrfValues(values),
+            ]),
+          ),
+        }),
       },
     }),
   }
 }
+
+function serializePrfValues(values: Types.PrfValues): Types.PrfValues<true> {
+  const { first, second } = values
+  return {
+    first: Base64.fromBytes(bufferSourceToBytes(first), base64UrlOptions),
+    ...(second !== undefined && {
+      second: Base64.fromBytes(bufferSourceToBytes(second), base64UrlOptions),
+    }),
+  }
+}
+
+function deserializePrfValues(values: Types.PrfValues<true>): Types.PrfValues {
+  const { first, second } = values
+  return {
+    first: Base64.toBytes(first),
+    ...(second !== undefined && { second: Base64.toBytes(second) }),
+  }
+}