fix signing to work with breaking changes in digital bazaar libs

digitalcredentials · Sep 4, 2024 · 8768b7d · 8768b7d
1 parent f8ecb60
commit 8768b7d
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 203 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: npm install
       - name: Run test with Node.js ${{ matrix.node-version }}
-        run: npm run pretest; npm run test-node; npm run posttest
+        run: npm run test-node
         env:
           CI: true
   # FIXME: fix karma tests

diff --git a/karma.conf.js b/karma.conf.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@digitalcredentials/credential-status-manager-db",
   "description": "A Typescript library for managing the status of Verifiable Credentials in a Database using Bitstring Status List.",
-  "version": "0.0.1",
+  "version": "0.0.1-beta.0",
   "license": "MIT",
   "engines": {
     "node": ">=20.0"
@@ -25,12 +25,11 @@
     "LICENSE.md"
   ],
   "main": "dist/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/esm/index.d.ts",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "import": "./dist/index.js"
     }
   },
   "publishConfig": {
@@ -44,8 +43,8 @@
     "spec": "dist/test/**/*.js"
   },
   "scripts": {
-    "build": "npm run clear && tsc -d && tsc -p tsconfig.esm.json",
-    "build-test": "npm run clear && tsc -d && tsc -p tsconfig.spec.json",
+    "build": "npm run clear && tsc -p tsconfig.json",
+    "build-test": "npm run clear && tsc -p tsconfig.spec.json",
     "clear": "rimraf dist/*",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",

diff --git a/post-test.js b/post-test.js
diff --git a/pre-test.js b/pre-test.js
diff --git a/src/helpers.ts b/src/helpers.ts
@@ -63,6 +63,7 @@ interface GetSigningKeysResult {
   issuerDid: string;
   keyPairs: Map<string, any>;
   verificationMethod: string;
+  signingKey: any;
 }
 
 // validates credential
@@ -122,16 +123,15 @@ export async function signCredential({
   didWebUrl
 }: SignCredentialOptions): Promise<VerifiableCredential> {
   const {
-    keyPairs,
-    verificationMethod
+    signingKey
   } = await getSigningMaterial({
     didMethod,
     didSeed,
     didWebUrl
   });
-  const key = keyPairs.get(verificationMethod);
+
   const date = getDateString();
-  const suite = new Ed25519Signature2020({ key, date });
+  const suite = new Ed25519Signature2020({ key:signingKey, date });
   return sign({
     credential,
     documentLoader,
@@ -145,39 +145,54 @@ export async function getSigningMaterial({
   didSeed,
   didWebUrl
 }: GetSigningKeysOptions)
-: Promise<GetSigningKeysResult> {
+  : Promise<GetSigningKeysResult> {
   let didDocument;
   let keyPairs;
+  let methodFor;
+  let signingKey;
+  let verificationMethod;
   const didSeedBytes = decodeSeed(didSeed);
-  switch (didMethod) {
-    case DidMethod.Key:
-      const verificationKeyPair = await Ed25519VerificationKey2020.generate({
-        seed: didSeedBytes
+  if (didMethod === DidMethod.Key) {
+    const verificationKeyPair = await Ed25519VerificationKey2020.generate({
+      seed: didSeedBytes
+    });
+    ({ didDocument, keyPairs, methodFor } = await didKeyDriver.fromKeyPair({
+      verificationKeyPair
+    }));
+
+    const assertionMethod = methodFor({ purpose: 'assertionMethod' })
+    signingKey = await Ed25519VerificationKey2020.from({
+      type: assertionMethod.type,
+      controller: assertionMethod.controller,
+      id: assertionMethod.id,
+      publicKeyMultibase: assertionMethod.publicKeyMultibase,
+      privateKeyMultibase: verificationKeyPair.privateKeyMultibase
+    })
+    verificationMethod = extractId(didDocument.assertionMethod[0]);
+  } else if (didMethod === DidMethod.Web) {
+    ({ didDocument, keyPairs } = await didWebDriver.generate({
+      seed: didSeedBytes,
+      url: didWebUrl
+    }));
+    verificationMethod = extractId(didDocument.assertionMethod[0]);
+    signingKey = keyPairs.get(verificationMethod);
+  } else {
+    throw new BadRequestError({
+      message:
+        '"didMethod" must be one of the following values: ' +
+        `${Object.values(DidMethod).map(m => `"${m}"`).join(', ')}.`
     });
-    ({ didDocument, keyPairs } = await didKeyDriver.fromKeyPair({
-        verificationKeyPair
-      }));
-    break;
-    case DidMethod.Web:
-      ({ didDocument, keyPairs } = await didWebDriver.generate({
-        seed: didSeedBytes,
-        url: didWebUrl
-      }));
-      break;
-    default:
-      throw new BadRequestError({
-        message:
-          '"didMethod" must be one of the following values: ' +
-          `${Object.values(DidMethod).map(m => `"${m}"`).join(', ')}.`
-      });
   }
+
   const issuerDid = didDocument.id;
-  const verificationMethod = extractId(didDocument.assertionMethod[0]);
+
+
   return {
     didDocument,
     issuerDid,
     keyPairs,
-    verificationMethod
+    verificationMethod,
+    signingKey
   };
 }
 
@@ -188,7 +203,7 @@ function decodeSeed(didSeed: string): Uint8Array {
     // This is a multibase-encoded seed
     didSeedBytes = decodeSecretKeySeed({ secretKeySeed: didSeed });
   } else if (didSeed.length >= 32) {
-      didSeedBytes = (new TextEncoder()).encode(didSeed).slice(0, 32);
+    didSeedBytes = (new TextEncoder()).encode(didSeed).slice(0, 32);
   } else {
     throw new InvalidDidSeedError();
   }
@@ -199,7 +214,7 @@ function decodeSeed(didSeed: string): Uint8Array {
 function extractId(objectOrString: any): string {
   if (typeof objectOrString === 'string') {
     return objectOrString;
-  } 
+  }
   return objectOrString.id;
 }
 

diff --git a/tsconfig.esm.json b/tsconfig.esm.json
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,8 +2,8 @@
   "compilerOptions": {
     "strict": true,
     "target": "es2022",
-    "lib": ["es2022", "dom"],
-    "module": "commonjs",
+    "lib": ["es2022"],
+    "module": "es2022",
     "moduleResolution": "node",
     "outDir": "dist",
     "noImplicitAny": true,
@@ -20,9 +20,7 @@
   "include": [
     "src/**/*",
     ".eslintrc.js",
-    "karma.conf.js",
-    "pre-test.js",
-    "post-test.js"
+    "karma.conf.js"
   ],
   "exclude": ["node_modules", "dist", "test"]
 }
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
@@ -1,33 +1,33 @@
 {
-  "compilerOptions": {
-    "strict": true,
-    "target": "es2022",
-    "lib": [
-      "es2022",
-      "dom"
+    "compilerOptions": {
+      "strict": true,
+      "target": "es2022",
+      "lib": [
+        "es2022",
+        "dom"
+      ],
+      "module": "es2022",
+      "moduleResolution": "node",
+      "outDir": "dist",
+      "noImplicitAny": true,
+      "removeComments": false,
+      "preserveConstEnums": true,
+      "baseUrl": ".",
+      "allowSyntheticDefaultImports": true,
+      "skipLibCheck": true,
+      "resolveJsonModule": true
+    },
+    "ts-node": {
+      "files": true
+    },
+    "include": [
+      "src/**/*",
+      "test/**/*",
+      ".eslintrc.js",
+      "karma.conf.js"
     ],
-    "module": "es2022",
-    "moduleResolution": "node",
-    "outDir": "dist",
-    "noImplicitAny": true,
-    "removeComments": false,
-    "preserveConstEnums": true,
-    "baseUrl": ".",
-    "allowSyntheticDefaultImports": true,
-    "skipLibCheck": true,
-    "resolveJsonModule": true
-  },
-  "ts-node": {
-    "files": true
-  },
-  "include": [
-    "src/**/*",
-    "test/**/*",
-    ".eslintrc.js",
-    "karma.conf.js"
-  ],
-  "exclude": [
-    "node_modules",
-    "dist"
-  ]
-}
+    "exclude": [
+      "node_modules",
+      "dist"
+    ]
+  }