fix: on-chain claim revocation

energywebfoundation · Jun 2, 2022 · df9eeea · df9eeea
1 parent 74578c9
commit df9eeea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/e2e/claim-revocation.e2e.ts b/e2e/claim-revocation.e2e.ts
@@ -167,6 +167,7 @@ describe('On-chain claim revocation', () => {
       ...issuedClaim,
       subject: subject.signerService.did,
       namespace: claimType,
+      claimType,
     };
   };
 

diff --git a/src/modules/claims/claims.service.ts b/src/modules/claims/claims.service.ts
@@ -955,7 +955,12 @@ export class ClaimsService {
     if (claimIds) {
       const claimsDetails = await Promise.all([
         ...claimIds.map(async (claimId) => {
-          return await this.getClaimById(claimId);
+          const claim = await this.getClaimById(claimId);
+          if (!claim) return undefined;
+          return {
+            namespace: claim.claimType,
+            subject: claim.subject,
+          };
         }),
       ]);
       claimsDetailsToRevoke = [
@@ -1066,7 +1071,7 @@ export class ClaimsService {
         throw new Error(ERROR_MESSAGES.REVOKE_CLAIM_NOT_FOUND);
       }
 
-      namespace = claimData.namespace;
+      namespace = claimData.claimType;
       subject = claimData.subject;
     }