Merge pull request #46 from identity-com/feature/CIV-3462_updated_cre…

…dential_commons

Updated credential-commons version

.gitignore

@@ -6,3 +6,4 @@ node_modules/
 npm-debug.log
 .DS_Store
 .tmp
+dist/

.npmignore

@@ -6,3 +6,4 @@ build
 __integrations__
 __test__
 .tmp
+.idea

README.md

@@ -164,10 +164,10 @@ Some helper functions to easy the DSR and verifiable credentials usage
    * @param request - Original ScopeRequest
    * @return {boolean}
    */
-  static credentialsMatchesRequest(credentialItems, request)
+  static async credentialsMatchesRequest(credentialItems, request)
 
   //Example
-  ScopeRequest.credentialsMatchesRequest(credentialItems, dsr);  
+  await ScopeRequest.credentialsMatchesRequest(credentialItems, dsr);  
 ```
 
 

babel.config.js

@@ -0,0 +1,17 @@
+module.exports = {
+  env: {
+    cjs: {
+      presets: [
+        ['env', {
+          targets: {
+            node: '6.10',
+          },
+          modules: 'commonjs',
+        }],
+      ],
+    },
+    test: {
+      plugins: ['@babel/plugin-transform-modules-commonjs'],
+    },
+  },
+};

package.json

@@ -1,13 +1,13 @@
 {
   "name": "@identity.com/dsr",
-  "version": "1.0.23",
+  "version": "3.0.0",
   "description": "The Dynamic Scope Request (DSR) javascript library provides capability around securely requesting credential information between an ID Requester and an ID Holder",
   "main": "dist/cjs/index.js",
   "module": "dist/es/index.js",
   "browser": "dist/browser/index.js",
   "scripts": {
     "lint": "eslint ./src/**.js",
-    "test": "cross-env NODE_ENV=false jest",
+    "test": "cross-env NODE_ENV=test jest",
     "test:watch": "jest --watch",
     "check-schemas": "cross-env NODE_ENV=false jest --no-coverage test/integration/schemas/",
     "publish-schemas": "node scripts/publishSchemas.js && aws s3 cp ./schemas/public/ $S3_BUCKET_SCHEMA_URL --recursive --acl public-read",
@@ -25,6 +25,7 @@
     "check": "npm run lint && npm run test"
   },
   "devDependencies": {
+    "@babel/plugin-transform-modules-commonjs": "^7.17.7",
     "ajv": "^6.5.2",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
@@ -48,8 +49,7 @@
     "rimraf": "^2.6.2"
   },
   "dependencies": {
-    "@identity.com/credential-commons": "^1.2.7",
-    "@identity.com/uca": "^1.0.24",
+    "@identity.com/credential-commons": "^3.0.0",
     "bottlejs": "^1.7.1",
     "dotenv": "^8.2.0",
     "json-stable-stringify": "^1.0.1",
@@ -82,7 +82,21 @@
     "coverageDirectory": "reports/coverage",
     "collectCoverage": true,
     "testResultsProcessor": "./node_modules/jest-stare",
-    "verbose": true
+    "verbose": true,
+    "transformIgnorePatterns": [
+      "/node_modules/(?!(@digitalbazaar/did-io|@digitalbazaar/lru-memoize|@digitalbazaar/ed25519-verification-key-2018|@digitalbazaar/did-io|base58-universal))",
+      "node_modules/(?!(@digitalbazaar/did-io|@digitalbazaar/lru-memoize|@digitalbazaar/ed25519-verification-key-2018|@digitalbazaar/did-io|base58-universal))",
+      "<rootDir>/node_modules/(?!(@digitalbazaar/did-io|@digitalbazaar/lru-memoize|@digitalbazaar/ed25519-verification-key-2018|@digitalbazaar/did-io|base58-universal))"
+    ],
+    "moduleNameMapper": {
+      "@digitalbazaar/did-io": "@digitalbazaar/did-io/lib/main.js",
+      "@digitalbazaar/lru-memoize": "@digitalbazaar/lru-memoize/lib/main.js",
+      "@digitalbazaar/ed25519-verification-key-2018": "@digitalbazaar/ed25519-verification-key-2018/src/main.js",
+      "base58-universal": "base58-universal/main.js"
+    },
+    "transform": {
+      "^.+\\.(js|jsx)$": "babel-jest"
+    }
   },
   "jest-stare": {
     "resultDir": "reports",

src/ScopeRequest.js

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const { isValidGlobalIdentifier, VC } = require('@identity.com/credential-commons');
+const { isValidGlobalIdentifier, VCCompat: VC } = require('@identity.com/credential-commons');
 
 const { services, initServices } = require('./services');
 
@@ -63,7 +63,7 @@ class ScopeRequest {
    * @param request - Original ScopeRequest
    * @return {boolean}
    */
-  static credentialsMatchesRequest(credentialItems, request) {
+  static async credentialsMatchesRequest(credentialItems, request) {
     let result = true;
     const requestedItems = _.get(request, 'credentialItems');
 
@@ -74,7 +74,8 @@ class ScopeRequest {
       throw new Error('empty credentialItems param');
     }
     // eslint-disable-next-line consistent-return
-    _.forEach(requestedItems, (requestedItem) => {
+    await _.reduce(requestedItems, async (promise, requestedItem) => {
+      await promise;
       const credentialItem = _.find(credentialItems, { identifier: requestedItem.credential });
       if (!credentialItem) {
         // no need to continue breaking and returning false
@@ -83,7 +84,7 @@ class ScopeRequest {
       }
 
       // If is a presentation `credentialItem.granted` nor empty accept partial
-      const verifiableCredential = VC.fromJSON(credentialItem, !!credentialItem.granted);
+      const verifiableCredential = await VC.fromJSON(credentialItem, !!credentialItem.granted);
 
       const constraints = _.get(requestedItem, 'constraints');
       const match = verifiableCredential.isMatch(constraints);
@@ -92,7 +93,7 @@ class ScopeRequest {
         result = false;
         return false;
       }
-    });
+    }, Promise.resolve());
     return result;
   }
 
@@ -145,7 +146,7 @@ class ScopeRequest {
    * @param identifier
    * @returns {*}
    */
-  static isValidCredentialItemIdentifier(identifier) {
+  static async isValidCredentialItemIdentifier(identifier) {
     return isValidGlobalIdentifier(identifier);
   }
 
@@ -160,26 +161,30 @@ class ScopeRequest {
    * @returns {boolean} true for the pattern to be accepted, false otherwise
    */
   static isValidCredentialIssuer(issuer) {
-    return !(!issuer || !issuer.match(/^did:ethr:0x[a-fA-F0-9]{40}$/g));
+    return !!issuer;
   }
 
   /**
    * Validate the credential items part of an scope request
    * @param credentialItems the array of credential items needed for an dsr
    * @returns {boolean} true|false sucess|failure
    */
-  static validateCredentialItems(credentialItems) {
-    _.forEach(credentialItems, (item) => {
+  static async validateCredentialItems(credentialItems) {
+    await _.reduce(credentialItems, async (promise, item) => {
+      await promise;
+
       if (_.isString(item)) {
-        if (!ScopeRequest.isValidCredentialItemIdentifier(item)) {
+        const valid = await ScopeRequest.isValidCredentialItemIdentifier(item);
+        if (!valid) {
           throw new Error(`${item} is not valid CredentialItem identifier`);
         }
       } else {
         if (_.isEmpty(item.identifier)) {
           throw new Error('CredentialItem identifier is required');
         }
 
-        if (!ScopeRequest.isValidCredentialItemIdentifier(item.identifier)) {
+        const valid = await ScopeRequest.isValidCredentialItemIdentifier(item.identifier);
+        if (!valid) {
           throw new Error(`${item.identifier} is not valid CredentialItem identifier`);
         }
 
@@ -226,7 +231,8 @@ class ScopeRequest {
           });
         }
       }
-    });
+    }, Promise.resolve());
+
     return true;
   }
 
@@ -311,7 +317,18 @@ class ScopeRequest {
     return true;
   }
 
-  constructor(uniqueId, requestedItems, channelsConfig, appConfig, partnerConfig, authentication = true, mode = 'ADVANCED') {
+  static async create(uniqueId, requestedItems, channelsConfig, appConfig, partnerConfig, authentication = true, mode = 'ADVANCED') {
+    let credentialItems = [].concat(requestedItems);
+
+    const valid = await ScopeRequest.validateCredentialItems(credentialItems);
+    if (valid) {
+      credentialItems = _.cloneDeep(credentialItems);
+    }
+
+    return new ScopeRequest(uniqueId, requestedItems, credentialItems, channelsConfig, appConfig, partnerConfig, authentication, mode);
+  }
+
+  constructor(uniqueId, requestedItems, credentialItems, channelsConfig, appConfig, partnerConfig, authentication = true, mode = 'ADVANCED') {
     this.version = SCHEMA_VERSION;
     if (!uniqueId) {
       throw Error('uniqueId is required');
@@ -325,10 +342,7 @@ class ScopeRequest {
 
     this.timestamp = (new Date()).toISOString();
 
-    const credentialItems = [].concat(requestedItems);
-    if (ScopeRequest.validateCredentialItems(credentialItems)) {
-      this.credentialItems = _.cloneDeep(credentialItems);
-    }
+    this.credentialItems = credentialItems;
 
     if (channelsConfig && ScopeRequest.validateChannelsConfig(channelsConfig)) {
       this.channels = channelsConfig;

src/resolver/Resolver.js

@@ -1,5 +1,5 @@
 const sift = require('sift').default;
-const { definitions: ucaDefinitions } = require('@identity.com/uca');
+const { schemaLoader } = require('@identity.com/credential-commons');
 const { VALIDATION_MODE } = require('../ScopeRequest');
 
 /**
@@ -108,7 +108,7 @@ function DsrResolver() {
   this.filterCredentialsByClaim = (globalIdentifier, credentials, credentialItem, scope, filtered) => {
     // for UCAs it can either be a type, or an alsoKnown as
     const type = globalIdentifier.substring('claim-'.length, globalIdentifier.lastIndexOf('-'));
-    const definition = ucaDefinitions.find(def => def.identifier === type);
+    const definition = schemaLoader.ucaDefinitions.find(def => def.identifier === type);
     const tempFiltered = [];
     const filterArgArray = [];