misc syntactic & type-checking clean-up

src/libs/crypto/passkeyHelpers.ts

@@ -55,8 +55,8 @@ export function isoUint8ArrayConcat(arrays: Uint8Array[]): Uint8Array {
 }
 
 // from https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/server/src/helpers/iso/isoCrypto/getWebCrypto.ts
-let webCrypto: unknown = undefined;
-export function getWebCrypto() {
+let webCrypto: { subtle: SubtleCrypto } | undefined = undefined;
+export function getWebCrypto(): Promise<{ subtle: SubtleCrypto }> {
   /**
    * Hello there! If you came here wondering why this method is asynchronous when use of
    * `globalThis.crypto` is not, it's to minimize a bunch of refactor related to making this
@@ -67,22 +67,25 @@ export function getWebCrypto() {
    * TODO: If it's after February 2025 when you read this then consider whether it still makes sense
    * to keep this method asynchronous.
    */
-  const toResolve = new Promise((resolve, reject) => {
-    if (webCrypto) {
-      return resolve(webCrypto);
-    }
-    /**
-     * Naively attempt to access Crypto as a global object, which popular ESM-centric run-times
-     * support (and Node v20+)
-     */
-    const _globalThisCrypto = _getWebCryptoInternals.stubThisGlobalThisCrypto();
-    if (_globalThisCrypto) {
-      webCrypto = _globalThisCrypto;
-      return resolve(webCrypto);
-    }
-    // We tried to access it both in Node and globally, so bail out
-    return reject(new MissingWebCrypto());
-  });
+  const toResolve: Promise<{ subtle: SubtleCrypto }> = new Promise(
+    (resolve, reject) => {
+      if (webCrypto) {
+        return resolve(webCrypto);
+      }
+      /**
+       * Naively attempt to access Crypto as a global object, which popular ESM-centric run-times
+       * support (and Node v20+)
+       */
+      const _globalThisCrypto =
+        _getWebCryptoInternals.stubThisGlobalThisCrypto();
+      if (_globalThisCrypto) {
+        webCrypto = _globalThisCrypto;
+        return resolve(webCrypto);
+      }
+      // We tried to access it both in Node and globally, so bail out
+      return reject(new MissingWebCrypto());
+    },
+  );
   return toResolve;
 }
 export class MissingWebCrypto extends Error {
@@ -96,7 +99,7 @@ export class MissingWebCrypto extends Error {
 export const _getWebCryptoInternals = {
   stubThisGlobalThisCrypto: () => globalThis.crypto,
   // Make it possible to reset the `webCrypto` at the top of the file
-  setCachedCrypto: (newCrypto: unknown) => {
+  setCachedCrypto: (newCrypto: { subtle: SubtleCrypto }) => {
     webCrypto = newCrypto;
   },
-};
+};

src/libs/didPeer.ts

@@ -74,7 +74,7 @@ export async function registerCredential(passkeyName?: string) {
 
   const credIdBase64Url = verification.registrationInfo?.credentialID as string;
   if (attResp.rawId !== credIdBase64Url) {
-    console.log("Warning! The raw ID does not match the credential ID.")
+    console.log("Warning! The raw ID does not match the credential ID.");
   }
   const credIdHex = Buffer.from(
     base64URLStringToArrayBuffer(credIdBase64Url),
@@ -237,8 +237,9 @@ export class PeerSetup {
       .replace(/\//g, "_")
       .replace(/=+$/, "");
 
-    const origSignature = Buffer.from(credential?.response.signature)
-      .toString("base64")
+    const origSignature = Buffer.from(credential?.response.signature).toString(
+      "base64",
+    );
     this.signature = origSignature
       .replace(/\+/g, "-")
       .replace(/\//g, "_")
@@ -423,6 +424,7 @@ export async function verifyJwtWebCrypto(
   return verified;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function peerDidToDidDocument(did: string): Promise<DIDResolutionResult> {
   if (!did.startsWith("did:peer:0z")) {
     throw new Error(
@@ -463,12 +465,15 @@ async function peerDidToDidDocument(did: string): Promise<DIDResolutionResult> {
 }
 
 // convert COSE public key to PEM format
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function COSEtoPEM(cose: Buffer) {
   // const alg = cose.get(3); // Algorithm
   const x = cose[-2]; // x-coordinate
   const y = cose[-3]; // y-coordinate
 
   // Ensure the coordinates are in the correct format
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error because it complains about the type of x and y
   const pubKeyBuffer = Buffer.concat([Buffer.from([0x04]), x, y]);
 
   // Convert to PEM format
@@ -479,6 +484,7 @@ ${pubKeyBuffer.toString("base64")}
   return pem;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function base64urlDecode(input: string) {
   input = input.replace(/-/g, "+").replace(/_/g, "/");
   const pad = input.length % 4 === 0 ? "" : "====".slice(input.length % 4);
@@ -490,13 +496,14 @@ function base64urlDecode(input: string) {
   return bytes.buffer;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function base64urlEncode(buffer: ArrayBuffer) {
   const str = String.fromCharCode(...new Uint8Array(buffer));
   return btoa(str).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
 
 // from @simplewebauthn/browser
-function arrayBufferToBase64URLString(buffer) {
+function arrayBufferToBase64URLString(buffer: ArrayBuffer) {
   const bytes = new Uint8Array(buffer);
   let str = "";
   for (const charCode of bytes) {
@@ -545,6 +552,7 @@ function cborToKeys(publicKeyBytes: Uint8Array) {
   return { publicKeyJwk, publicKeyBuffer };
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function pemToCryptoKey(pem: string) {
   const binaryDerString = atob(
     pem