feat(verifyVc): update ew-credentials version and use to resolve cred…

…entials

docs/api/classes/modules_claims.ClaimsService.md

@@ -696,7 +696,7 @@ ___
 
 ### resolveCredentialAndVerify
 
-▸ **resolveCredentialAndVerify**(`subjectDID`, `roleNamespace`): `Promise`<`void`\>
+▸ **resolveCredentialAndVerify**(`subjectDID`, `roleNamespace`): `Promise`<[`CredentialVerificationResult`](../interfaces/modules_claims.CredentialVerificationResult.md)\>
 
 Resolve a credential from storage and verify its proof/signature and its issuer's authority
 
@@ -709,7 +709,7 @@ Resolve a credential from storage and verify its proof/signature and its issuer'
 
 #### Returns
 
-`Promise`<`void`\>
+`Promise`<[`CredentialVerificationResult`](../interfaces/modules_claims.CredentialVerificationResult.md)\>
 
 void. Returns "Proof Not Verified" error if VC not verified. Returns error if issuer not verified
 
@@ -794,7 +794,7 @@ ___
 
 ### verifyOffChainClaim
 
-▸ **verifyOffChainClaim**(`subjectDID`, `roleNamespace`): `Promise`<`void`\>
+▸ **verifyOffChainClaim**(`subjectDID`, `roleNamespace`): `Promise`<[`CredentialVerificationResult`](../interfaces/modules_claims.CredentialVerificationResult.md)\>
 
 Verifies:
 - That off-chain claim was issued by authorized issuer
@@ -809,15 +809,15 @@ Verifies:
 
 #### Returns
 
-`Promise`<`void`\>
+`Promise`<[`CredentialVerificationResult`](../interfaces/modules_claims.CredentialVerificationResult.md)\>
 
-void. Returns "Proof Not Verified" error if VC not verified. Returns error if issuer not verified
+Boolean indicating if verified and array of error messages
 
 ___
 
 ### verifyVc
 
-▸ **verifyVc**(`vc`): `Promise`<`void`\>
+▸ **verifyVc**(`vc`): `Promise`<[`CredentialVerificationResult`](../interfaces/modules_claims.CredentialVerificationResult.md)\>
 
 Verifies:
 - That credential proof is valid
@@ -831,9 +831,9 @@ Verifies:
 
 #### Returns
 
-`Promise`<`void`\>
+`Promise`<[`CredentialVerificationResult`](../interfaces/modules_claims.CredentialVerificationResult.md)\>
 
-void. Returns "Proof Not Verified" error if VC not verified. Returns error if issuer not verified
+Boolean indicating if verified and array of error messages
 
 ___
 

docs/api/interfaces/modules_claims.CredentialVerificationResult.md

@@ -0,0 +1,26 @@
+# Interface: CredentialVerificationResult
+
+[modules/claims](../modules/modules_claims.md).CredentialVerificationResult
+
+## Table of contents
+
+### Properties
+
+- [errors](modules_claims.CredentialVerificationResult.md#errors)
+- [isVerified](modules_claims.CredentialVerificationResult.md#isverified)
+
+## Properties
+
+### errors
+
+• **errors**: `string`[]
+
+Verification errors
+
+___
+
+### isVerified
+
+• **isVerified**: `boolean`
+
+Verifies if a claim has been successfully verified

docs/api/modules/modules_claims.md

@@ -19,6 +19,7 @@
 - [ClaimRevocationDetailsResult](../interfaces/modules_claims.ClaimRevocationDetailsResult.md)
 - [CreateClaimRequestOptions](../interfaces/modules_claims.CreateClaimRequestOptions.md)
 - [CreateSelfSignedClaimOptions](../interfaces/modules_claims.CreateSelfSignedClaimOptions.md)
+- [CredentialVerificationResult](../interfaces/modules_claims.CredentialVerificationResult.md)
 - [DeleteClaimOptions](../interfaces/modules_claims.DeleteClaimOptions.md)
 - [GetClaimsByIssuerOptions](../interfaces/modules_claims.GetClaimsByIssuerOptions.md)
 - [GetClaimsByRequesterOptions](../interfaces/modules_claims.GetClaimsByRequesterOptions.md)

package.json

@@ -63,11 +63,11 @@
     "npm": ">= 6.0.0"
   },
   "dependencies": {
-    "@energyweb/credential-governance": "^1.0.1-alpha.174.0",
+    "@energyweb/credential-governance": "^1.0.1-alpha.181.0",
     "@energyweb/ekc": "^0.6.6",
-    "@energyweb/onchain-claims": "^1.0.1-alpha.174.0",
+    "@energyweb/onchain-claims": "^1.0.1-alpha.181.0",
     "@energyweb/staking-pool": "^1.0.0-rc.14",
-    "@energyweb/vc-verification": "^1.0.1-alpha.174.0",
+    "@energyweb/vc-verification": "^1.0.1-alpha.181.0",
     "@ensdomains/ens": "^0.6.2",
     "@ew-did-registry/claims": "^0.6.3-alpha.682.0",
     "@ew-did-registry/credentials-interface": "^0.6.3-alpha.682.0",

src/errors/error-messages.ts

@@ -33,5 +33,6 @@ export enum ERROR_MESSAGES {
   REVOKE_CLAIM_NOT_FOUND = 'Could not find claim to revoke',
   DID_DOCUMENT_NOT_UPDATED = 'DID Document was not updated',
   PROOF_NOT_VERIFIED = 'Proof not verified',
-  OFFCHAIN_ISSUER_NOT_AUTHORIZED = 'Issuer of OffChain Claim is not authorized'
+  OFFCHAIN_ISSUER_NOT_AUTHORIZED = 'Issuer of OffChain Claim is not authorized',
+  NO_CLAIM_RESOLVED = 'No claim found for given DID and role'
 }

src/modules/claims/claims.service.ts

@@ -61,6 +61,7 @@ import {
   GetRevocationClaimDetailsResult,
   ClaimRevocationDetailsResult,
   GetClaimsByRevokerOptions,
+  CredentialVerificationResult,
 } from './claims.types';
 import {
   CredentialResolver,
@@ -1413,17 +1414,29 @@ export class ClaimsService {
    * - That credential was issued by authorized issuer
    *
    * @param {VerifiableCredential<RoleCredentialSubject} vc to be verified
-   * @return void. Returns "Proof Not Verified" error if VC not verified. Returns error if issuer not verified
+   * @return Boolean indicating if verified and array of error messages
    */
   async verifyVc(
     vc: VerifiableCredential<RoleCredentialSubject>
-  ): Promise<void> {
+  ): Promise<CredentialVerificationResult> {
+    const errors: string[] = [];
     const issuerDID = this._signerService.did;
-    if (!(await this._verifiableCredentialService.verify(vc))) {
-      throw new Error(ERROR_MESSAGES.PROOF_NOT_VERIFIED);
+    const proofVerified = await this._verifiableCredentialService.verify(vc)
+    if (!proofVerified) {
+      errors.push(ERROR_MESSAGES.PROOF_NOT_VERIFIED);
     }
     const role = vc.credentialSubject.role.namespace;
-    await this._vcIssuerVerifier.verifyIssuer(issuerDID, role);
+    let issuerVerified = true;
+    try {
+      await this._vcIssuerVerifier.verifyIssuer(issuerDID, role);
+    } catch(e) {
+      issuerVerified = false;
+      errors.push((e as Error).message)
+    }
+    return {
+      errors,
+      isVerified: proofVerified && issuerVerified
+    }
   }
 
     /**
@@ -1433,27 +1446,27 @@ export class ClaimsService {
    *
    * @param subjectDID The DID to try to resolve a credential for
    * @param roleNamesapce The role to try to get a credential for. Should be a full role namespace (for example, "myrole.roles.myorg.auth.ewc") 
-   * @return void. Returns "Proof Not Verified" error if VC not verified. Returns error if issuer not verified
+   * @return Boolean indicating if verified and array of error messages
    */
-     async verifyOffChainClaim(subjectDID: string, roleNamespace: string): Promise<void> {
+     async verifyOffChainClaim(subjectDID: string, roleNamespace: string): Promise<CredentialVerificationResult> {
       const errors: string[] = [];
       const issuerDID = this._signerService.did;
       const claimIssuerVerifier = new ClaimIssuerVerification(this._signerService.provider, this._didRegistry.registrySettings, this._credentialResolver, this._issuerResolver);
       const issuerVerified  = await claimIssuerVerifier.verifyIssuer(issuerDID, roleNamespace);
-      //let claimVerified
       if (!issuerVerified) {
         errors.push(ERROR_MESSAGES.OFFCHAIN_ISSUER_NOT_AUTHORIZED)
       }
+      let proofVerified = true;
       try {
         await claimIssuerVerifier.verifyIssuance(subjectDID, roleNamespace);
       } catch (e) {
-        //claimVerified = false;
-        errors.push(JSON.stringify(e));
+        proofVerified = false;
+        errors.push((e as Error).message);
       }
-      // return {
-      //   errors: offChainVerificationErrofs,
-      //   verified: claimVerified && issuerVerified
-      // }      
+      return {
+        errors: errors,
+        isVerified: proofVerified && issuerVerified
+      }      
     }
 
    /**
@@ -1463,18 +1476,16 @@ export class ClaimsService {
    * @param roleNamesapce The role to try to get a credential for. Should be a full role namespace (for example, "myrole.roles.myorg.auth.ewc") 
    * @return void. Returns "Proof Not Verified" error if VC not verified. Returns error if issuer not verified
    */
-
-    async  resolveCredentialAndVerify(subjectDID: string, roleNamespace: string): Promise<void> {
-      /*
-      ...some code to resolve the credential 
-      if (foundOffChainClaim) {
-        return verifyOffChainClaim(offChainClaim);
-      }
-      if (foundVc) {
-        return verifyVc(vc);
+    async  resolveCredentialAndVerify(subjectDID: string, roleNamespace: string): Promise<CredentialVerificationResult> {
+      const resolvedCredential = await this._credentialResolver.getCredential(subjectDID, roleNamespace);
+      if (!resolvedCredential) {
+        return {
+          isVerified: false,
+          errors: [ERROR_MESSAGES.NO_CLAIM_RESOLVED]
+        }
       }
-      */
-
+      const credentialIsOffChain = resolvedCredential?.issuedToken;
+      return credentialIsOffChain ? this.verifyOffChainClaim(subjectDID, roleNamespace) : this.verifyVc(resolvedCredential as VerifiableCredential<RoleCredentialSubject>);
     }
 
   /**

src/modules/claims/claims.types.ts

@@ -429,3 +429,11 @@ export interface ClaimRevocationDetailsResult {
   revoker: string;
   timestamp: number;
 }
+
+export interface CredentialVerificationResult {
+  /** Verifies if a claim has been successfully verified */
+  isVerified: boolean;
+
+  /** Verification errors */
+  errors: string[];
+}