"Update imports to use 'cbor-web' functions directly"

safe-global · Aug 28, 2024 · 8926d4e · 8926d4e
1 parent 7d6db7f
commit 8926d4e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/modules/passkey/src/utils/webauthn.ts b/modules/passkey/src/utils/webauthn.ts
@@ -1,4 +1,4 @@
-import CBOR from 'cbor-web'
+import { decode as cborDecode } from 'cbor-web'
 
 /**
  * Returns the flag for the user verification requirement.
@@ -40,15 +40,15 @@ export function base64UrlEncode(data: string | Uint8Array | ArrayBuffer): string
  * @returns The x and y coordinates of the public key.
  */
 export function decodePublicKey(response: Pick<AuthenticatorAttestationResponse, 'attestationObject'>): { x: bigint; y: bigint } {
-  const attestationObject = CBOR.decode(response.attestationObject)
+  const attestationObject = cborDecode(response.attestationObject)
   const authData = new DataView(
     attestationObject.authData.buffer,
     attestationObject.authData.byteOffset,
     attestationObject.authData.byteLength,
   )
   const credentialIdLength = authData.getUint16(53)
   const cosePublicKey = attestationObject.authData.slice(55 + credentialIdLength)
-  const key: Map<number, unknown> = CBOR.decode(cosePublicKey)
+  const key: Map<number, unknown> = cborDecode(cosePublicKey)
   const bn = (bytes: Uint8Array) => BigInt('0x' + toHexString(bytes))
   return {
     x: bn(key.get(-2) as Uint8Array),

diff --git a/modules/passkey/test/utils/webauthnShim.ts b/modules/passkey/test/utils/webauthnShim.ts
@@ -10,7 +10,7 @@
 import { p256 } from '@noble/curves/p256'
 import { ethers } from 'ethers'
 import type { BytesLike } from 'ethers'
-import CBOR from 'cbor-web'
+import { encode as cborEncode } from 'cbor-web'
 import { base64UrlEncode, userVerificationFlag } from '../../src/utils/webauthn'
 
 function b2ab(buf: Uint8Array): ArrayBuffer {
@@ -135,7 +135,7 @@ class Credential {
     key.set(1, 2) // kty = EC2
     key.set(3, -7) // alg = ES256 (Elliptic curve signature with SHA-256)
 
-    return ethers.hexlify(CBOR.encode(key))
+    return ethers.hexlify(cborEncode(key))
   }
 }
 
@@ -191,7 +191,7 @@ export class WebAuthnCredentials {
       rawId: credential.rawId.slice(),
       response: {
         clientDataJSON: b2ab(ethers.toUtf8Bytes(JSON.stringify(clientData))),
-        attestationObject: b2ab(CBOR.encode(attestationObject)),
+        attestationObject: b2ab(cborEncode(attestationObject)),
       },
       type: 'public-key',
     }

diff --git a/modules/passkey/test/webauthn/WebAuthnShim.spec.ts b/modules/passkey/test/webauthn/WebAuthnShim.spec.ts
@@ -9,7 +9,7 @@ import {
   verifyRegistrationResponse,
 } from '@simplewebauthn/server'
 import { expect } from 'chai'
-import CBOR from 'cbor-web'
+import { decode as cborDecode } from 'cbor-web'
 import { ethers } from 'ethers'
 import { WebAuthnCredentials } from '../../test/utils/webauthnShim'
 import { base64UrlEncode } from '../../src/utils/webauthn'
@@ -90,7 +90,7 @@ describe('WebAuthn Shim', () => {
         },
       })
 
-      const attestationObject = CBOR.decode(credential.response.attestationObject)
+      const attestationObject = cborDecode(credential.response.attestationObject)
       const authData = new DataView(
         attestationObject.authData.buffer,
         attestationObject.authData.byteOffset,

diff --git a/modules/passkey/tsconfig.json b/modules/passkey/tsconfig.json
@@ -10,5 +10,5 @@
     "skipLibCheck": true,
     "resolveJsonModule": true
   },
-  "include": ["bin", "src/**/*.ts", "hardhat.config.ts", "test", "typechain-types"]
+  "include": ["bin", "src/**/*.ts", "hardhat.config.ts", "test/**/*.ts", "typechain-types"]
 }