Skip to content

Commit

Permalink
feat(verifyVC): update ew-credentials
Browse files Browse the repository at this point in the history
  • Loading branch information
whitneypurdum committed Jul 13, 2022
1 parent 3034101 commit 877fad6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
7 changes: 4 additions & 3 deletions package.json
Expand Up @@ -63,11 +63,11 @@
"npm": ">= 6.0.0"
},
"dependencies": {
"@energyweb/credential-governance": "^1.0.1-alpha.181.0",
"@energyweb/credential-governance": "^1.0.1-alpha.191.0",
"@energyweb/ekc": "^0.6.6",
"@energyweb/onchain-claims": "^1.0.1-alpha.181.0",
"@energyweb/onchain-claims": "^1.0.1-alpha.191.0",
"@energyweb/staking-pool": "^1.0.0-rc.14",
"@energyweb/vc-verification": "^1.0.1-alpha.181.0",
"@energyweb/vc-verification": "^1.0.1-alpha.191.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",
Expand All @@ -94,6 +94,7 @@
"didkit-wasm-node": "^0.1.6",
"eth-ens-namehash": "^2.0.8",
"ethers": "^5.6.1",
"ipfsd-ctl": "^12.0.0",
"js-sha3": "^0.8.0",
"jsonwebtoken": "^8.5.1",
"lodash.difference": "^4.5.0",
Expand Down
17 changes: 8 additions & 9 deletions src/modules/claims/claims.service.ts
Expand Up @@ -69,7 +69,7 @@ import {
IpfsCredentialResolver,
VCIssuerVerification,
ClaimIssuerVerification,
OffChainClaim,
RoleEIP191JWT,
} from '@energyweb/vc-verification';
import { DidRegistry } from '../did-registry/did-registry.service';
import { ClaimData } from '../did-registry/did.types';
Expand Down Expand Up @@ -1449,9 +1449,9 @@ export class ClaimsService {
* @return Boolean indicating if verified and array of error messages
*/
async verifyOffChainClaim(
offChainClaim: OffChainClaim
offChainClaim: RoleEIP191JWT
): Promise<CredentialVerificationResult> {
const {claimType, issuedToken, iss} = offChainClaim;
const {payload, eip191Jwt} = offChainClaim;
const errors: string[] = [];
const issuerDID = this._signerService.did;
const claimIssuerVerifier = new ClaimIssuerVerification(
Expand All @@ -1462,19 +1462,18 @@ export class ClaimsService {
);
const issuerVerified = await claimIssuerVerifier.verifyIssuer(
issuerDID,
claimType
payload?.claimData?.claimType
);

if (!issuerVerified) {
errors.push(ERROR_MESSAGES.OFFCHAIN_ISSUER_NOT_AUTHORIZED);
}
const proofVerified = await this._didRegistry.verifyPublicClaim(issuedToken, iss);
const proofVerified = await this._didRegistry.verifyPublicClaim(eip191Jwt, payload?.iss as string);
if (!proofVerified) {
errors.push(ERROR_MESSAGES.PROOF_NOT_VERIFIED)
}
return {
errors: errors,
isVerified: !!proofVerified && issuerVerified,
isVerified: !!proofVerified && !!issuerVerified,
};
}

Expand All @@ -1499,9 +1498,9 @@ export class ClaimsService {
errors: [ERROR_MESSAGES.NO_CLAIM_RESOLVED],
};
}
const credentialIsOffChain = resolvedCredential?.issuedToken;
const credentialIsOffChain = resolvedCredential.eip191Jwt;
return credentialIsOffChain
? this.verifyOffChainClaim(resolvedCredential as OffChainClaim)
? this.verifyOffChainClaim(resolvedCredential as RoleEIP191JWT)
: this.verifyVc(
resolvedCredential as VerifiableCredential<RoleCredentialSubject>
);
Expand Down

0 comments on commit 877fad6

Please sign in to comment.