fix(exp): do not use dflt validity period to calculate timestamp if n… (

#623) * fix(exp): do not use dflt validity period to calculate timestamp if no expiration date * fix(exp): remove logs
energywebfoundation · Aug 4, 2022 · 9ce524d · 9ce524d
1 parent 8e0e03a
commit 9ce524d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 48 deletions.
diff --git a/e2e/claims.service.e2e.ts b/e2e/claims.service.e2e.ts
@@ -457,9 +457,7 @@ describe('Сlaim tests', () => {
       expect(requester).toEqual(requesterDID);
       expect(claimIssuer).toEqual([issuerDID]);
 
-      if (
-        registrationTypes.includes(RegistrationTypes.OnChain)
-      ) {
+      if (registrationTypes.includes(RegistrationTypes.OnChain)) {
         expect(onChainProof).toHaveLength(132);
 
         if (expirationTimestamp || roleDefinitionValidityPeriod) {
@@ -482,12 +480,6 @@ describe('Сlaim tests', () => {
             ) {
               expirationTimestamp &&
                 expect(args.expiry.toNumber()).toEqual(expirationTimestamp);
-
-              !expirationTimestamp &&
-                roleDefinitionValidityPeriod &&
-                expect(args.expiry.toNumber()).toBeLessThanOrEqual(
-                  Date.now() + roleDefinitionValidityPeriod
-                );
             }
           });
         }

diff --git a/src/modules/claims/claims.service.ts b/src/modules/claims/claims.service.ts
@@ -3,7 +3,6 @@ import jsonwebtoken from 'jsonwebtoken';
 import { v4 } from 'uuid';
 import {
   IRoleDefinition,
-  IRoleDefinitionV2,
   PreconditionType,
   RoleCredentialSubject,
 } from '@energyweb/credential-governance';
@@ -435,21 +434,16 @@ export class ClaimsService {
     const strippedClaimData = this.stripClaimData(claimData);
     const { claimType: role, claimTypeVersion: version } = claimData;
 
-    const claimExpirationTimestamp = this.getClaimExpirationTimestamp(
-      roleDefinition as IRoleDefinitionV2,
-      expirationTimestamp
-    );
-
     const message: IClaimIssuance = {
       id,
       requester,
       claimIssuer: [this._signerService.did],
       acceptedBy: this._signerService.did,
-      expirationTimestamp: claimExpirationTimestamp,
+      expirationTimestamp,
     };
 
     if (registrationTypes.includes(RegistrationTypes.OnChain)) {
-      const expiry = claimExpirationTimestamp || eternityTimestamp;
+      const expiry = expirationTimestamp || eternityTimestamp;
       const onChainProof = await this.createOnChainProof(
         role,
         version,
@@ -481,7 +475,7 @@ export class ClaimsService {
         version: version.toString(),
         issuerFields,
         credentialStatus: credentialStatusOverride,
-        expirationTimestamp: claimExpirationTimestamp,
+        expirationTimestamp,
       });
       const vpCredentialStatus = vp?.verifiableCredential[0]?.credentialStatus;
       const credentialStatus = credentialStatusOverride || vpCredentialStatus;
@@ -496,7 +490,7 @@ export class ClaimsService {
       };
       const issuedToken = await this._didRegistry.issuePublicClaim({
         publicClaim,
-        expirationTimestamp: claimExpirationTimestamp,
+        expirationTimestamp,
       });
       message.issuedToken = issuedToken;
       message.vp = JSON.stringify(vp);
@@ -654,17 +648,12 @@ export class ClaimsService {
       roleDefinition,
     });
 
-    const claimExpirationTimestamp = this.getClaimExpirationTimestamp(
-      roleDefinition as IRoleDefinitionV2,
-      expirationTimestamp
-    );
-
     const message: IClaimIssuance = {
       id: v4(),
       requester: subject,
       claimIssuer: [this._signerService.did],
       acceptedBy: this._signerService.did,
-      expirationTimestamp: claimExpirationTimestamp,
+      expirationTimestamp,
     };
 
     if (registrationTypes.includes(RegistrationTypes.OffChain)) {
@@ -674,7 +663,7 @@ export class ClaimsService {
         version: claim.claimTypeVersion.toString(),
         issuerFields: claim.issuerFields,
         credentialStatus: credentialStatusOverride,
-        expirationTimestamp: claimExpirationTimestamp,
+        expirationTimestamp,
       });
       const vpCredentialStatus = vp?.verifiableCredential[0]?.credentialStatus;
       const credentialStatus = credentialStatusOverride || vpCredentialStatus;
@@ -686,15 +675,15 @@ export class ClaimsService {
       };
       const issuedToken = await this._didRegistry.issuePublicClaim({
         publicClaim,
-        expirationTimestamp: claimExpirationTimestamp,
+        expirationTimestamp,
       });
       message.issuedToken = issuedToken;
       message.vp = JSON.stringify(vp);
     }
 
     if (registrationTypes.includes(RegistrationTypes.OnChain)) {
       const { claimType: role, claimTypeVersion: version } = claim;
-      const expiry = claimExpirationTimestamp || eternityTimestamp;
+      const expiry = expirationTimestamp || eternityTimestamp;
       const onChainProof = await this.createOnChainProof(
         role,
         version,
@@ -1610,24 +1599,4 @@ export class ClaimsService {
       return JSON.stringify({ errors: [] });
     });
   }
-
-  /**
-   * Get claim expiration timestamp based on issuer value and role definition.
-   *
-   * @param {IRoleDefinitionV2} roleDefinition role definition
-   * @param {Number} [expirationTimestamp] issuer-defined expiration timestamp
-   *
-   * @return claim expiration timestamp
-   */
-  private getClaimExpirationTimestamp(
-    roleDefinition: IRoleDefinitionV2,
-    expirationTimestamp?: number
-  ) {
-    const defaultValidityPeriod = roleDefinition?.defaultValidityPeriod;
-    const roleDefinitionExpirationTimestamp = defaultValidityPeriod
-      ? Date.now() + defaultValidityPeriod
-      : undefined;
-
-    return expirationTimestamp || roleDefinitionExpirationTimestamp;
-  }
 }