feat: set roleeip191jwt expiration in seconds

energywebfoundation · Sep 6, 2022 · 270778c · 270778c
1 parent 9b5057d
commit 270778c
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 41 deletions.
diff --git a/e2e/claims.service.e2e.ts b/e2e/claims.service.e2e.ts
@@ -495,7 +495,7 @@ describe('Сlaim tests', () => {
           requestorFields,
         });
 
-        expirationTimestamp && expect(exp).toEqual(expirationTimestamp);
+        expirationTimestamp && expect(exp).toEqual(Math.floor(expirationTimestamp / 1000));
 
         expect(claimData).not.toContain({
           fields: [{ key: 'temperature', value: 36 }],
@@ -1030,7 +1030,7 @@ describe('Сlaim tests', () => {
           await claimsService.hasOnChainRole(rootOwnerDID, claimType, version)
         ).toBe(true);
         expect(expiry).toBe(Math.floor(expirationTimestamp / 1000));
-        expect(expiry).toBe(Math.floor(exp / 1000));
+        expect(expiry).toBe(exp);
       });
     });
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,11 +64,11 @@
     "npm": ">= 6.0.0"
   },
   "dependencies": {
-    "@energyweb/credential-governance": "^2.2.1-alpha.292.0",
+    "@energyweb/credential-governance": "^2.2.1-alpha.293.0",
     "@energyweb/ekc": "^0.6.7",
-    "@energyweb/onchain-claims": "^2.2.1-alpha.292.0",
+    "@energyweb/onchain-claims": "^2.2.1-alpha.293.0",
     "@energyweb/staking-pool": "^1.0.0-rc.14",
-    "@energyweb/vc-verification": "^2.2.1-alpha.292.0",
+    "@energyweb/vc-verification": "^2.2.1-alpha.293.0",
     "@ensdomains/ens": "^0.6.2",
     "@ew-did-registry/claims": "0.7.1-alpha.816.0",
     "@ew-did-registry/credentials-interface": "0.7.1-alpha.816.0",

diff --git a/src/modules/claims/claims.service.ts b/src/modules/claims/claims.service.ts
@@ -442,11 +442,11 @@ export class ClaimsService {
       acceptedBy: this._signerService.did,
       expirationTimestamp,
     };
+    const expiry = expirationTimestamp
+      ? Math.floor(expirationTimestamp / 1000)
+      : eternityTimestamp;
 
     if (registrationTypes.includes(RegistrationTypes.OnChain)) {
-      const expiry = expirationTimestamp
-        ? Math.floor(expirationTimestamp / 1000)
-        : eternityTimestamp;
       const onChainProof = await this.createOnChainProof(
         role,
         version,
@@ -485,7 +485,7 @@ export class ClaimsService {
       const publicClaim: IPublicClaim = {
         did: sub,
         signer: this._signerService.did,
-        exp: expirationTimestamp,
+        exp: expiry,
         claimData: {
           ...strippedClaimData,
           ...(issuerFields && { issuerFields }),
@@ -659,6 +659,9 @@ export class ClaimsService {
       acceptedBy: this._signerService.did,
       expirationTimestamp,
     };
+    const expiry = expirationTimestamp
+      ? Math.floor(expirationTimestamp / 1000)
+      : eternityTimestamp;
 
     if (registrationTypes.includes(RegistrationTypes.OffChain)) {
       const vp = await this.issueVerifiablePresentation({
@@ -673,23 +676,20 @@ export class ClaimsService {
       const credentialStatus = credentialStatusOverride || vpCredentialStatus;
       const publicClaim: IPublicClaim = {
         did: subject,
+        exp: expiry,
         signer: this._signerService.did,
         claimData: claim,
         ...(credentialStatus && { credentialStatus }),
       };
       const issuedToken = await this._didRegistry.issuePublicClaim({
         publicClaim,
-        expirationTimestamp,
       });
       message.issuedToken = issuedToken;
       message.vp = JSON.stringify(vp);
     }
 
     if (registrationTypes.includes(RegistrationTypes.OnChain)) {
       const { claimType: role, claimTypeVersion: version } = claim;
-      const expiry = expirationTimestamp
-        ? Math.floor(expirationTimestamp / 1000)
-        : eternityTimestamp;
       const onChainProof = await this.createOnChainProof(
         role,
         version,
@@ -1531,7 +1531,7 @@ export class ClaimsService {
       errors.push(ERROR_MESSAGES.PROOF_NOT_VERIFIED);
     }
     // Date.now() and JWT expiration time both identify the time elapsed since January 1, 1970 00:00:00 UTC
-    const isExpired = payload?.exp && payload?.exp < Date.now();
+    const isExpired = payload?.exp && payload?.exp * 1000 < Date.now();
     if (isExpired) {
       errors.push(ERROR_MESSAGES.CREDENTIAL_EXPIRED);
     }