Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Aug 4, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b509330
fix(exp): do not use dflt validity period to calculate timestamp if n…
whitneypurdum Aug 3, 2022
ebb6d47
fix(exp): remove logs
whitneypurdum Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/api/modules/modules_claims.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ ___

### readyToBeRegisteredOnchain

▸ **readyToBeRegisteredOnchain**(`claim`): claim is Required<Pick<Claim, "claimType" \| "claimTypeVersion" \| "subject" \| "onChainProof" \| "acceptedBy" \| "subjectAgreement"\> & Object\>
▸ **readyToBeRegisteredOnchain**(`claim`): claim is Required<Pick<Claim, "claimType" \| "claimTypeVersion" \| "subject" \| "onChainProof" \| "acceptedBy"\> & Object\>

#### Parameters

Expand All @@ -143,4 +143,4 @@ ___

#### Returns

claim is Required<Pick<Claim, "claimType" \| "claimTypeVersion" \| "subject" \| "onChainProof" \| "acceptedBy" \| "subjectAgreement"\> & Object\>
claim is Required<Pick<Claim, "claimType" \| "claimTypeVersion" \| "subject" \| "onChainProof" \| "acceptedBy"\> & Object\>
10 changes: 1 addition & 9 deletions e2e/claims.service.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -482,12 +480,6 @@ describe('Сlaim tests', () => {
) {
expirationTimestamp &&
expect(args.expiry.toNumber()).toEqual(expirationTimestamp);

!expirationTimestamp &&
roleDefinitionValidityPeriod &&
expect(args.expiry.toNumber()).toBeLessThanOrEqual(
Date.now() + roleDefinitionValidityPeriod
);
}
});
}
Expand Down
47 changes: 8 additions & 39 deletions src/modules/claims/claims.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import jsonwebtoken from 'jsonwebtoken';
import { v4 } from 'uuid';
import {
IRoleDefinition,
IRoleDefinitionV2,
PreconditionType,
RoleCredentialSubject,
} from '@energyweb/credential-governance';
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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)) {
Expand All @@ -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;
Expand All @@ -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,
Expand Down Expand Up @@ -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;
}
}