@arcblock/vc 1.18.166 → 1.19.0

package/lib/index.js

@@ -33,9 +33,9 @@ const proofTypes = {
  * @param {Date} params.expirationDate
  * @param {String} params.endpoint - Status endpoint url
  * @param {String} params.endpointScope - Endpoint scope, either be public or private
- * @returns {object}
+ * @returns {Promise<object>}
  */
-function create({
+async function create({
   type,
   subject,
   issuer,
@@ -124,7 +124,7 @@ function create({
 
   debug('create', result);
 
-  if (verify({ vc: result, ownerDid: subject.id, trustedIssuers: [issuerDid] })) {
+  if (await verify({ vc: result, ownerDid: subject.id, trustedIssuers: [issuerDid] })) {
     return result;
   }
 
@@ -142,9 +142,9 @@ function create({
  * @param {string} ownerDid - vc holder/owner did
  * @param {Array} trustedIssuers - list of issuer did
  * @throws {Error}
- * @returns {boolean}
+ * @returns {Promise<boolean>}
  */
-function verify({ vc, ownerDid, trustedIssuers, ignoreExpired = false }) {
+async function verify({ vc, ownerDid, trustedIssuers, ignoreExpired = false }) {
   // Integrity check
   if (!vc) {
     throw new Error('Empty verifiable credential object');
@@ -196,7 +196,7 @@ function verify({ vc, ownerDid, trustedIssuers, ignoreExpired = false }) {
   delete clone.signature;
 
   // Verify signature
-  if (issuer.verify(stringify(clone), fromBase64(signature)) !== true) {
+  if ((await issuer.verify(stringify(clone), fromBase64(signature))) !== true) {
     throw Error('Verifiable credential signature not valid');
   }
 
@@ -216,9 +216,9 @@ function verify({ vc, ownerDid, trustedIssuers, ignoreExpired = false }) {
  * @param {Array} trustedIssuers - list of issuer did
  * @param {String} challenge - Random byte you want
  * @throws {Error}
- * @returns {boolean}
+ * @returns {Promise<boolean>}
  */
-function verifyPresentation({ presentation, trustedIssuers, challenge, ignoreExpired = false }) {
+async function verifyPresentation({ presentation, trustedIssuers, challenge, ignoreExpired = false }) {
   if (!presentation.challenge || challenge !== presentation.challenge) {
     throw Error('Invalid challenge included on vc presentation');
   }
@@ -231,22 +231,24 @@ function verifyPresentation({ presentation, trustedIssuers, challenge, ignoreExp
   const clone = cloneDeep(presentation);
   delete clone.proof;
 
-  vcList.forEach((vcStr) => {
-    const vcObj = JSON.parse(vcStr);
-    const proof = proofList.find((x) => isFromPublicKey(vcObj.credentialSubject.id, x.pk));
+  await Promise.all(
+    vcList.map(async (vcStr) => {
+      const vcObj = JSON.parse(vcStr);
+      const proof = proofList.find((x) => isFromPublicKey(vcObj.credentialSubject.id, x.pk));
 
-    if (!proof) {
-      throw Error(`VC does not have corresponding proof: ${vcStr}`);
-    }
+      if (!proof) {
+        throw Error(`VC does not have corresponding proof: ${vcStr}`);
+      }
 
-    const signature = proof.jws;
-    const holder = fromPublicKey(fromBase58(proof.pk), toTypeInfo(vcObj.credentialSubject.id));
-    if (holder.verify(stringify(clone), fromBase64(signature)) !== true) {
-      throw Error('Presentation signature invalid');
-    }
+      const signature = proof.jws;
+      const holder = fromPublicKey(fromBase58(proof.pk), toTypeInfo(vcObj.credentialSubject.id));
+      if ((await holder.verify(stringify(clone), fromBase64(signature))) !== true) {
+        throw Error('Presentation signature invalid');
+      }
 
-    verify({ vc: vcObj, ownerDid: vcObj.credentialSubject.id, trustedIssuers, ignoreExpired });
-  });
+      await verify({ vc: vcObj, ownerDid: vcObj.credentialSubject.id, trustedIssuers, ignoreExpired });
+    })
+  );
 
   return true;
 }
@@ -292,37 +294,40 @@ function createCredentialList({ claims, issuer, issuanceDate }) {
   });
 }
 
-function verifyCredentialList({ credentials, trustedIssuers }) {
+// eslint-disable-next-line require-await
+async function verifyCredentialList({ credentials, trustedIssuers }) {
   if (!credentials || !Array.isArray(credentials)) {
     throw new Error('Can not verify with empty credentials list');
   }
 
-  return credentials.map((x) => {
-    // Verify issuer
-    const issuers = Array.isArray(trustedIssuers) ? trustedIssuers : [trustedIssuers];
-    const issuerDid = issuers.find((d) => d === x.issuer.id);
-    if (!issuerDid) {
-      throw new Error('Credential not issued by trusted issuers');
-    }
-    if (!isFromPublicKey(issuerDid, x.issuer.pk)) {
-      throw new Error('Credential not issuer pk not match with issuer did');
-    }
-
-    // Construct the issuer wallet
-    const issuer = fromPublicKey(x.issuer.pk, toTypeInfo(issuerDid));
-
-    // NOTE: we are ignoring other fields of the proof
-    const clone = cloneDeep(x);
-    const signature = clone.proof.jws;
-    delete clone.proof;
-
-    // Verify signature
-    if (issuer.verify(stringify(clone), fromBase64(signature)) !== true) {
-      throw Error('Status credential signature not valid');
-    }
-
-    return x.claim;
-  });
+  return Promise.all(
+    credentials.map(async (x) => {
+      // Verify issuer
+      const issuers = Array.isArray(trustedIssuers) ? trustedIssuers : [trustedIssuers];
+      const issuerDid = issuers.find((d) => d === x.issuer.id);
+      if (!issuerDid) {
+        throw new Error('Credential not issued by trusted issuers');
+      }
+      if (!isFromPublicKey(issuerDid, x.issuer.pk)) {
+        throw new Error('Credential not issuer pk not match with issuer did');
+      }
+
+      // Construct the issuer wallet
+      const issuer = fromPublicKey(x.issuer.pk, toTypeInfo(issuerDid));
+
+      // NOTE: we are ignoring other fields of the proof
+      const clone = cloneDeep(x);
+      const signature = clone.proof.jws;
+      delete clone.proof;
+
+      // Verify signature
+      if ((await issuer.verify(stringify(clone), fromBase64(signature))) !== true) {
+        throw Error('Status credential signature not valid');
+      }
+
+      return x.claim;
+    })
+  );
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/vc",
-  "version": "1.18.166",
+  "version": "1.19.0",
   "description": "Javascript lib to work with ArcBlock Verifiable Credentials",
   "keywords": [
     "arcblock",
@@ -47,14 +47,14 @@
     "url": "https://github.com/ArcBlock/blockchain/issues"
   },
   "dependencies": {
-    "@arcblock/did": "1.18.166",
-    "@ocap/mcrypto": "1.18.166",
-    "@ocap/util": "1.18.166",
-    "@ocap/wallet": "1.18.166",
+    "@arcblock/did": "1.19.0",
+    "@ocap/mcrypto": "1.19.0",
+    "@ocap/util": "1.19.0",
+    "@ocap/wallet": "1.19.0",
     "debug": "^4.3.6",
     "is-absolute-url": "^3.0.3",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "58c8356b3b8c238728560e4c3fef6ed1704d3ac4"
+  "gitHead": "1b6fac03988fb18507c8ef4c21de282762005f87"
 }