@sphereon/ssi-sdk.data-store 0.18.2-unstable.95 → 0.18.2-unstable.96

package/dist/entities/digitalCredential/DigitalCredentialEntity.d.ts

@@ -15,8 +15,8 @@ export declare class DigitalCredentialEntity extends BaseEntity {
     tenantId?: string;
     createdAt: Date;
     lastUpdatedAt: Date;
-    expiresAt?: Date;
-    issuedAt?: Date;
+    validUntil?: Date;
+    validFrom?: Date;
     verifiedAt?: Date;
     revokedAt?: Date;
 }

package/dist/entities/digitalCredential/DigitalCredentialEntity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DigitalCredentialEntity.d.ts","sourceRoot":"","sources":["../../../src/entities/digitalCredential/DigitalCredentialEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA8E,MAAM,SAAS,CAAA;AAChH,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACxB,mBAAmB,EACnB,cAAc,EACf,MAAM,iDAAiD,CAAA;AAExD,qBACa,uBAAwB,SAAQ,UAAU;IAErD,EAAE,EAAG,MAAM,CAAA;IAGX,cAAc,EAAG,cAAc,CAAA;IAG/B,cAAc,EAAG,wBAAwB,CAAA;IAGzC,GAAG,EAAG,MAAM,CAAA;IAGZ,eAAe,EAAG,MAAM,CAAA;IAGxB,IAAI,EAAG,MAAM,CAAA;IAGb,qBAAqB,EAAG,yBAAyB,CAAA;IAGjD,sBAAsB,CAAC,EAAE,yBAAyB,CAAA;IAGlD,mBAAmB,EAAG,MAAM,CAAA;IAG5B,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAG7B,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAGnC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAGjB,SAAS,EAAG,IAAI,CAAA;IAGhB,aAAa,EAAG,IAAI,CAAA;IAGpB,SAAS,CAAC,EAAE,IAAI,CAAA;IAGhB,QAAQ,CAAC,EAAE,IAAI,CAAA;IAGf,UAAU,CAAC,EAAE,IAAI,CAAA;IAGjB,SAAS,CAAC,EAAE,IAAI,CAAA;CACjB"}
+{"version":3,"file":"DigitalCredentialEntity.d.ts","sourceRoot":"","sources":["../../../src/entities/digitalCredential/DigitalCredentialEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA8E,MAAM,SAAS,CAAA;AAChH,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACxB,mBAAmB,EACnB,cAAc,EACf,MAAM,iDAAiD,CAAA;AAExD,qBACa,uBAAwB,SAAQ,UAAU;IAErD,EAAE,EAAG,MAAM,CAAA;IAGX,cAAc,EAAG,cAAc,CAAA;IAG/B,cAAc,EAAG,wBAAwB,CAAA;IAGzC,GAAG,EAAG,MAAM,CAAA;IAGZ,eAAe,EAAG,MAAM,CAAA;IAGxB,IAAI,EAAG,MAAM,CAAA;IAGb,qBAAqB,EAAG,yBAAyB,CAAA;IAGjD,sBAAsB,CAAC,EAAE,yBAAyB,CAAA;IAGlD,mBAAmB,EAAG,MAAM,CAAA;IAG5B,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAG7B,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAGnC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAGjB,SAAS,EAAG,IAAI,CAAA;IAGhB,aAAa,EAAG,IAAI,CAAA;IAGpB,UAAU,CAAC,EAAE,IAAI,CAAA;IAGjB,SAAS,CAAC,EAAE,IAAI,CAAA;IAGhB,UAAU,CAAC,EAAE,IAAI,CAAA;IAGjB,SAAS,CAAC,EAAE,IAAI,CAAA;CACjB"}

package/dist/entities/digitalCredential/DigitalCredentialEntity.js

@@ -71,13 +71,13 @@ __decorate([
     __metadata("design:type", Date)
 ], DigitalCredentialEntity.prototype, "lastUpdatedAt", void 0);
 __decorate([
-    (0, typeorm_1.Column)('date', { name: 'expires_at', nullable: true }),
+    (0, typeorm_1.Column)('date', { name: 'valid_until', nullable: true }),
     __metadata("design:type", Date)
-], DigitalCredentialEntity.prototype, "expiresAt", void 0);
+], DigitalCredentialEntity.prototype, "validUntil", void 0);
 __decorate([
-    (0, typeorm_1.Column)('date', { name: 'issued_at', nullable: true }),
+    (0, typeorm_1.Column)('date', { name: 'valid_from', nullable: true }),
     __metadata("design:type", Date)
-], DigitalCredentialEntity.prototype, "issuedAt", void 0);
+], DigitalCredentialEntity.prototype, "validFrom", void 0);
 __decorate([
     (0, typeorm_1.Column)('date', { name: 'verified_at', nullable: true }),
     __metadata("design:type", Date)

package/dist/entities/digitalCredential/DigitalCredentialEntity.js.map

@@ -1 +1 @@
-{"version":3,"file":"DigitalCredentialEntity.js","sourceRoot":"","sources":["../../../src/entities/digitalCredential/DigitalCredentialEntity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DigitalCredentialEntity.js","sourceRoot":"","sources":["../../../src/entities/digitalCredential/DigitalCredentialEntity.ts"],"names":[],"mappings":"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"}

package/dist/migrations/postgres/1708525189001-CreateDigitalCredential.js

@@ -36,8 +36,8 @@ class CreateDigitalCredential1708525189001 {
         "tenant_id" text,
         "created_at" TIMESTAMP NOT NULL DEFAULT now(),
         "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(),
-        "issued_at" DATE,
-        "expires_at" DATE,
+        "valid_from" DATE,
+        "valid_until" DATE,
         "verified_at" DATE,
         "revoked_at" DATE,
         PRIMARY KEY ("id")

package/dist/migrations/sqlite/1708525189002-CreateDigitalCredential.js

@@ -32,8 +32,8 @@ class CreateDigitalCredential1708525189002 {
                 "tenant_id" text,
                 "created_at" datetime NOT NULL DEFAULT (datetime('now')),
                 "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
-                "issued_at" datetime,
-                "expires_at" datetime,
+                "valid_from" datetime,
+                "valid_until" datetime,
                 "verified_at" datetime,
                 "revoked_at" datetime
             )

package/dist/types/digitalCredential/digitalCredential.d.ts

@@ -14,8 +14,8 @@ export type DigitalCredential = {
     tenantId?: string;
     createdAt: Date;
     lastUpdatedAt: Date;
-    expiresAt?: Date;
-    issuedAt?: Date;
+    validUntil?: Date;
+    validFrom?: Date;
     verifiedAt?: Date;
     revokedAt?: Date;
 };

package/dist/types/digitalCredential/digitalCredential.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"digitalCredential.d.ts","sourceRoot":"","sources":["../../../src/types/digitalCredential/digitalCredential.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAA;AAEzE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAA;IACV,cAAc,EAAE,cAAc,CAAA;IAC9B,cAAc,EAAE,wBAAwB,CAAA;IACxC,GAAG,EAAE,MAAM,CAAA;IACX,eAAe,EAAE,MAAM,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,qBAAqB,EAAE,yBAAyB,CAAA;IAChD,sBAAsB,CAAC,EAAE,yBAAyB,CAAA;IAClD,mBAAmB,EAAE,MAAM,CAAA;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,IAAI,CAAA;IACf,aAAa,EAAE,IAAI,CAAA;IACnB,SAAS,CAAC,EAAE,IAAI,CAAA;IAChB,QAAQ,CAAC,EAAE,IAAI,CAAA;IACf,UAAU,CAAC,EAAE,IAAI,CAAA;IACjB,SAAS,CAAC,EAAE,IAAI,CAAA;CACjB,CAAA;AAED,oBAAY,cAAc;IACxB,EAAE,OAAO;IACT,EAAE,OAAO;IACT,CAAC,MAAM;IACP,CAAC,MAAM;CACR;AAED,oBAAY,wBAAwB;IAClC,OAAO,YAAY;IACnB,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,IAAI,SAAS;CACd;AAED,oBAAY,yBAAyB;IACnC,GAAG,QAAQ;CACZ;AAED,oBAAY,mBAAmB;IAC7B,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,OAAO,YAAY;CACpB"}
+{"version":3,"file":"digitalCredential.d.ts","sourceRoot":"","sources":["../../../src/types/digitalCredential/digitalCredential.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAA;AAEzE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAA;IACV,cAAc,EAAE,cAAc,CAAA;IAC9B,cAAc,EAAE,wBAAwB,CAAA;IACxC,GAAG,EAAE,MAAM,CAAA;IACX,eAAe,EAAE,MAAM,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,qBAAqB,EAAE,yBAAyB,CAAA;IAChD,sBAAsB,CAAC,EAAE,yBAAyB,CAAA;IAClD,mBAAmB,EAAE,MAAM,CAAA;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,IAAI,CAAA;IACf,aAAa,EAAE,IAAI,CAAA;IACnB,UAAU,CAAC,EAAE,IAAI,CAAA;IACjB,SAAS,CAAC,EAAE,IAAI,CAAA;IAChB,UAAU,CAAC,EAAE,IAAI,CAAA;IACjB,SAAS,CAAC,EAAE,IAAI,CAAA;CACjB,CAAA;AAED,oBAAY,cAAc;IACxB,EAAE,OAAO;IACT,EAAE,OAAO;IACT,CAAC,MAAM;IACP,CAAC,MAAM;CACR;AAED,oBAAY,wBAAwB;IAClC,OAAO,YAAY;IACnB,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,IAAI,SAAS;CACd;AAED,oBAAY,yBAAyB;IACnC,GAAG,QAAQ;CACZ;AAED,oBAAY,mBAAmB;IAC7B,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,OAAO,YAAY;CACpB"}

package/dist/utils/digitalCredential/MappingUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MappingUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/digitalCredential/MappingUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+DAA+D,CAAA;AACjG,OAAO,EAAE,uBAAuB,EAAE,MAAM,0DAA0D,CAAA;AAWlG,OAAO,EAGL,iBAAiB,EACjB,6BAA6B,EAC9B,MAAM,iDAAiD,CAAA;AAwExD,eAAO,MAAM,8CAA8C,sBAAuB,iBAAiB,KAAG,6BAyBrG,CAAA;AAED,eAAO,MAAM,qBAAqB,qBAAsB,uBAAuB,KAAG,iBAIjF,CAAA;AAED,eAAO,MAAM,sBAAsB,uBAAwB,MAAM,uBAAuB,CAAC,KAAG,iBAAiB,EAE5G,CAAA"}
+{"version":3,"file":"MappingUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/digitalCredential/MappingUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+DAA+D,CAAA;AACjG,OAAO,EAAE,uBAAuB,EAAE,MAAM,0DAA0D,CAAA;AAYlG,OAAO,EAGL,iBAAiB,EACjB,6BAA6B,EAC9B,MAAM,iDAAiD,CAAA;AA2ExD,eAAO,MAAM,8CAA8C,sBAAuB,iBAAiB,KAAG,6BAyBrG,CAAA;AAED,eAAO,MAAM,qBAAqB,qBAAsB,uBAAuB,KAAG,iBAIjF,CAAA;AAED,eAAO,MAAM,sBAAsB,uBAAwB,MAAM,uBAAuB,CAAC,KAAG,iBAAiB,EAE5G,CAAA"}

package/dist/utils/digitalCredential/MappingUtils.js

@@ -43,7 +43,7 @@ function determineCredentialDocumentFormat(documentFormat) {
             throw new Error(`Not supported document format: ${documentFormat}`);
     }
 }
-function getExpiresAt(uniformDocument) {
+function getValidUntil(uniformDocument) {
     if ('expirationDate' in uniformDocument) {
         return new Date(uniformDocument.expirationDate);
     }
@@ -55,12 +55,16 @@ function getExpiresAt(uniformDocument) {
     }
     return undefined;
 }
-function getIssuedAt(uniformDocument) {
+function getValidFrom(uniformDocument) {
+    let proof = undefined;
+    if (uniformDocument.proof && !uniformDocument.vct) {
+        proof = Array.isArray(uniformDocument.proof) ? uniformDocument.proof[0] : uniformDocument.proof;
+    }
     if ('issuanceDate' in uniformDocument) {
         return new Date(uniformDocument.issuanceDate);
     }
-    else if (uniformDocument.proof && ssi_types_1.CredentialMapper.getFirstProof(uniformDocument)) {
-        return new Date(ssi_types_1.CredentialMapper.getFirstProof(uniformDocument).created);
+    else if (proof && proof.created) {
+        return new Date(proof.created);
     }
     else if ('validFrom' in uniformDocument) {
         return new Date(uniformDocument['validFrom']);
@@ -85,10 +89,10 @@ const nonPersistedDigitalCredentialEntityFromAddArgs = (addCredentialArgs) => {
         : credentialType === digitalCredential_1.CredentialType.VC || credentialType === digitalCredential_1.CredentialType.C
             ? ssi_types_1.CredentialMapper.toUniformCredential(addCredentialArgs.raw)
             : ssi_types_1.CredentialMapper.toUniformPresentation(addCredentialArgs.raw);
-    const issuedAt = getIssuedAt(uniformDocument);
-    const expiresAt = getExpiresAt(uniformDocument);
-    return Object.assign(Object.assign({}, addCredentialArgs), { credentialType, documentFormat: determineCredentialDocumentFormat(documentFormat), createdAt: new Date(), hash: (0, utils_1.computeEntryHash)(addCredentialArgs.raw), uniformDocument: JSON.stringify(uniformDocument), issuedAt,
-        expiresAt, lastUpdatedAt: new Date() });
+    const validFrom = getValidFrom(uniformDocument);
+    const validUntil = getValidUntil(uniformDocument);
+    return Object.assign(Object.assign({}, addCredentialArgs), { credentialType, documentFormat: determineCredentialDocumentFormat(documentFormat), createdAt: new Date(), hash: (0, utils_1.computeEntryHash)(addCredentialArgs.raw), uniformDocument: JSON.stringify(uniformDocument), validFrom,
+        validUntil, lastUpdatedAt: new Date() });
 };
 exports.nonPersistedDigitalCredentialEntityFromAddArgs = nonPersistedDigitalCredentialEntityFromAddArgs;
 const digitalCredentialFrom = (credentialEntity) => {

package/dist/utils/digitalCredential/MappingUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"MappingUtils.js","sourceRoot":"","sources":["../../../src/utils/digitalCredential/MappingUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MappingUtils.js","sourceRoot":"","sources":["../../../src/utils/digitalCredential/MappingUtils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.18.2-unstable.95+a02b1a48",
+  "version": "0.18.2-unstable.96+5ed10032",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,8 +13,8 @@
     "typeorm-postgres:migration:run": "pnpm run typeorm -- migration:run -c migration-postgres"
   },
   "dependencies": {
-    "@sphereon/ssi-sdk.core": "0.18.2-unstable.95+a02b1a48",
-    "@sphereon/ssi-types": "0.18.2-unstable.95+a02b1a48",
+    "@sphereon/ssi-sdk.core": "0.18.2-unstable.96+5ed10032",
+    "@sphereon/ssi-types": "0.18.2-unstable.96+5ed10032",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "class-validator": "^0.14.0",
@@ -44,5 +44,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "a02b1a483a716d6b2ebd31e865b7a607a83a3704"
+  "gitHead": "5ed10032a4f7b45c68f4caeccedc627d76f7a721"
 }

package/src/__tests__/digitalCredential.entities.test.ts

@@ -71,9 +71,9 @@ describe('Database entities tests', (): void => {
       tenantId: 'urn:uuid:nnag4b43-1e7a-98f8-a32c-a48dbc5b10mj',
     })
     expect(digitalCredential.credentialType).toEqual(CredentialType.VC)
-    expect(digitalCredential.issuedAt).toEqual(new Date('2024-02-20T14:53:28.000Z'))
+    expect(digitalCredential.validFrom).toEqual(new Date('2024-02-20T14:53:28.000Z'))
     expect(digitalCredential.documentFormat).toEqual(CredentialDocumentFormat.JWT)
-    expect(digitalCredential.expiresAt).toEqual(undefined)
+    expect(digitalCredential.validUntil).toEqual(undefined)
   })
 
   it('should assign correct values to DigitalCredential: jwt credential 2', () => {
@@ -86,9 +86,9 @@ describe('Database entities tests', (): void => {
       tenantId: 'urn:uuid:nnag4b43-1e7a-98f8-a32c-a48dbc5b10mj',
     })
     expect(digitalCredential.credentialType).toEqual(CredentialType.VC)
-    expect(digitalCredential.issuedAt).toEqual(new Date('2018-11-06T08:42:04.000Z'))
+    expect(digitalCredential.validFrom).toEqual(new Date('2018-11-06T08:42:04.000Z'))
     expect(digitalCredential.documentFormat).toEqual(CredentialDocumentFormat.JWT)
-    expect(digitalCredential.expiresAt).toEqual(new Date('2019-11-06T08:42:03.000Z'))
+    expect(digitalCredential.validUntil).toEqual(new Date('2019-11-06T08:42:03.000Z'))
   })
 
   it('should assign correct values to DigitalCredential: signed ldb credential', () => {
@@ -128,9 +128,9 @@ describe('Database entities tests', (): void => {
       tenantId: 'urn:uuid:nnag4b43-1e7a-98f8-a32c-a48dbc5b10mj',
     })
     expect(digitalCredential.credentialType).toEqual(CredentialType.VC)
-    expect(digitalCredential.issuedAt).toEqual(new Date('2022-01-07T11:54:12.000Z'))
+    expect(digitalCredential.validFrom).toEqual(new Date('2022-01-07T11:54:12.000Z'))
     expect(digitalCredential.documentFormat).toEqual(CredentialDocumentFormat.JSON_LD)
-    expect(digitalCredential.expiresAt).toEqual(undefined)
+    expect(digitalCredential.validUntil).toEqual(undefined)
   })
 
   it('should assign correct values to DigitalCredential: signed ldb presentation', () => {
@@ -226,9 +226,9 @@ describe('Database entities tests', (): void => {
       tenantId: 'urn:uuid:nnag4b43-1e7a-98f8-a32c-a48dbc5b10mj',
     })
     expect(digitalCredential.credentialType).toEqual(CredentialType.VP)
-    expect(digitalCredential.issuedAt).toEqual(new Date('2018-09-14T21:19:10.000Z'))
+    expect(digitalCredential.validFrom).toEqual(new Date('2018-09-14T21:19:10.000Z'))
     expect(digitalCredential.documentFormat).toEqual(CredentialDocumentFormat.JSON_LD)
-    expect(digitalCredential.expiresAt).toEqual(undefined)
+    expect(digitalCredential.validUntil).toEqual(undefined)
   })
 
   it('should assign correct values to DigitalCredential: signed sd_jwt credential', () => {
@@ -244,8 +244,8 @@ describe('Database entities tests', (): void => {
       },
     })
     expect(digitalCredential.credentialType).toEqual(CredentialType.VC)
-    expect(digitalCredential.issuedAt).toEqual(new Date('2023-10-24T12:45:32.000Z'))
+    expect(digitalCredential.validFrom).toEqual(new Date('2023-10-24T12:45:32.000Z'))
     expect(digitalCredential.documentFormat).toEqual(CredentialDocumentFormat.SD_JWT)
-    expect(digitalCredential.expiresAt).toEqual(undefined)
+    expect(digitalCredential.validUntil).toEqual(undefined)
   })
 })

package/src/entities/digitalCredential/DigitalCredentialEntity.ts

@@ -50,11 +50,11 @@ export class DigitalCredentialEntity extends BaseEntity {
   @UpdateDateColumn({ name: 'last_updated_at', nullable: false })
   lastUpdatedAt!: Date
 
-  @Column('date', { name: 'expires_at', nullable: true })
-  expiresAt?: Date
+  @Column('date', { name: 'valid_until', nullable: true })
+  validUntil?: Date
 
-  @Column('date', { name: 'issued_at', nullable: true })
-  issuedAt?: Date
+  @Column('date', { name: 'valid_from', nullable: true })
+  validFrom?: Date
 
   @Column('date', { name: 'verified_at', nullable: true })
   verifiedAt?: Date

package/src/migrations/postgres/1708525189001-CreateDigitalCredential.ts

@@ -25,8 +25,8 @@ export class CreateDigitalCredential1708525189001 implements MigrationInterface
         "tenant_id" text,
         "created_at" TIMESTAMP NOT NULL DEFAULT now(),
         "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(),
-        "issued_at" DATE,
-        "expires_at" DATE,
+        "valid_from" DATE,
+        "valid_until" DATE,
         "verified_at" DATE,
         "revoked_at" DATE,
         PRIMARY KEY ("id")

package/src/migrations/sqlite/1708525189002-CreateDigitalCredential.ts

@@ -20,8 +20,8 @@ export class CreateDigitalCredential1708525189002 implements MigrationInterface
                 "tenant_id" text,
                 "created_at" datetime NOT NULL DEFAULT (datetime('now')),
                 "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
-                "issued_at" datetime,
-                "expires_at" datetime,
+                "valid_from" datetime,
+                "valid_until" datetime,
                 "verified_at" datetime,
                 "revoked_at" datetime
             )

package/src/types/digitalCredential/digitalCredential.ts

@@ -15,8 +15,8 @@ export type DigitalCredential = {
   tenantId?: string
   createdAt: Date
   lastUpdatedAt: Date
-  expiresAt?: Date
-  issuedAt?: Date
+  validUntil?: Date
+  validFrom?: Date
   verifiedAt?: Date
   revokedAt?: Date
 }

package/src/utils/digitalCredential/MappingUtils.ts

@@ -4,6 +4,7 @@ import {
   CredentialMapper,
   decodeSdJwtVc,
   DocumentFormat,
+  IProof,
   IVerifiableCredential,
   IVerifiablePresentation,
   OriginalVerifiableCredential,
@@ -60,7 +61,7 @@ function determineCredentialDocumentFormat(documentFormat: DocumentFormat): Cred
   }
 }
 
-function getExpiresAt(uniformDocument: IVerifiableCredential | IVerifiablePresentation | SdJwtDecodedVerifiableCredentialPayload): Date | undefined {
+function getValidUntil(uniformDocument: IVerifiableCredential | IVerifiablePresentation | SdJwtDecodedVerifiableCredentialPayload): Date | undefined {
   if ('expirationDate' in uniformDocument) {
     return new Date(uniformDocument.expirationDate)
   } else if ('validUntil' in uniformDocument) {
@@ -71,11 +72,15 @@ function getExpiresAt(uniformDocument: IVerifiableCredential | IVerifiablePresen
   return undefined
 }
 
-function getIssuedAt(uniformDocument: IVerifiableCredential | IVerifiablePresentation | SdJwtDecodedVerifiableCredentialPayload): Date | undefined {
+function getValidFrom(uniformDocument: IVerifiableCredential | IVerifiablePresentation | SdJwtDecodedVerifiableCredentialPayload): Date | undefined {
+  let proof: IProof | undefined = undefined
+  if (uniformDocument.proof && !uniformDocument.vct) {
+    proof = Array.isArray(uniformDocument.proof) ? <IProof>uniformDocument.proof[0] : <IProof>uniformDocument.proof
+  }
   if ('issuanceDate' in uniformDocument) {
     return new Date(uniformDocument.issuanceDate)
-  } else if (uniformDocument.proof && CredentialMapper.getFirstProof(uniformDocument as IVerifiableCredential | IVerifiablePresentation)) {
-    return new Date(CredentialMapper.getFirstProof(uniformDocument as IVerifiableCredential | IVerifiablePresentation)!.created)
+  } else if (proof && proof.created) {
+    return new Date(proof.created)
   } else if ('validFrom' in uniformDocument) {
     return new Date(uniformDocument['validFrom'])
   } else if ('nbf' in uniformDocument) {
@@ -83,7 +88,6 @@ function getIssuedAt(uniformDocument: IVerifiableCredential | IVerifiablePresent
   } else if ('iat' in uniformDocument) {
     return new Date(uniformDocument['iat'] * 1000)
   }
-
   return undefined
 }
 
@@ -99,8 +103,8 @@ export const nonPersistedDigitalCredentialEntityFromAddArgs = (addCredentialArgs
       : credentialType === CredentialType.VC || credentialType === CredentialType.C
       ? CredentialMapper.toUniformCredential(addCredentialArgs.raw)
       : CredentialMapper.toUniformPresentation(addCredentialArgs.raw)
-  const issuedAt: Date | undefined = getIssuedAt(uniformDocument)
-  const expiresAt: Date | undefined = getExpiresAt(uniformDocument)
+  const validFrom: Date | undefined = getValidFrom(uniformDocument)
+  const validUntil: Date | undefined = getValidUntil(uniformDocument)
   return {
     ...addCredentialArgs,
     credentialType,
@@ -108,8 +112,8 @@ export const nonPersistedDigitalCredentialEntityFromAddArgs = (addCredentialArgs
     createdAt: new Date(),
     hash: computeEntryHash(addCredentialArgs.raw),
     uniformDocument: JSON.stringify(uniformDocument),
-    issuedAt,
-    expiresAt,
+    validFrom,
+    validUntil,
     lastUpdatedAt: new Date(),
   }
 }