@sphereon/ssi-sdk.data-store 0.29.0 → 0.29.1-next.104

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

@@ -1,4 +1,4 @@
-import {DataSources} from "@sphereon/ssi-sdk.agent-config";
+import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { PartyCorrelationType } from '@sphereon/ssi-sdk.core'
 import { ActionType, InitiatorType, LogLevel, SubSystem, System, SystemCorrelationIdType } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'

package/src/__tests__/eventLogger.store.test.ts

@@ -1,4 +1,4 @@
-import {DataSources} from "@sphereon/ssi-sdk.agent-config";
+import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { ActionType, InitiatorType, LogLevel, SubSystem, System, SystemCorrelationIdType } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
 import { DataStoreEventLoggerMigrations } from '../migrations'

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

@@ -1,4 +1,4 @@
-import {DataSources} from "@sphereon/ssi-sdk.agent-config";
+import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource, Repository } from 'typeorm'
 import { DataStoreMigrations } from '../migrations'
 import {

package/src/__tests__/issuanceBranding.store.test.ts

@@ -1,4 +1,4 @@
-import {DataSources} from "@sphereon/ssi-sdk.agent-config";
+import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
 import { IssuanceBrandingStore } from '../issuanceBranding/IssuanceBrandingStore'
 import { DataStoreMigrations } from '../migrations'

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

@@ -1,4 +1,4 @@
-import {DataSources} from "@sphereon/ssi-sdk.agent-config";
+import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
 import { MachineStateInfoEntity } from '../entities/machineState/MachineStateInfoEntity'
 

package/src/__tests__/machineState.store.test.ts

@@ -1,4 +1,4 @@
-import {DataSources} from "@sphereon/ssi-sdk.agent-config";
+import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
 import { DataStoreMachineStateEntities, MachineStateStore, StoreMachineStatesFindActiveArgs, StoreMachineStatePersistArgs } from '../index'
 import { DataStoreMachineStateMigrations } from '../migrations'

package/src/__tests__/pd-manager.entities.test.ts

@@ -1,4 +1,4 @@
-import {DataSources} from "@sphereon/ssi-sdk.agent-config";
+import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
 import { PresentationDefinitionItemEntity } from '../entities/presentationDefinition/PresentationDefinitionItemEntity'
 import { DataStorePresentationDefinitionMigrations } from '../migrations'

package/src/__tests__/pd-manager.store.test.ts

@@ -1,4 +1,4 @@
-import {DataSources} from "@sphereon/ssi-sdk.agent-config";
+import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
 import { DataStorePresentationDefinitionEntities, DataStorePresentationDefinitionMigrations, PDStore } from '../index'
 import { GetDefinitionsArgs, NonPersistedPresentationDefinitionItem, PresentationDefinitionItem } from '../types'

package/src/digitalCredential/DigitalCredentialStore.ts

@@ -52,7 +52,7 @@ export class DigitalCredentialStore extends AbstractDigitalCredentialStore {
   }
 
   getCredentials = async (args?: GetCredentialsArgs): Promise<GetCredentialsResponse> => {
-    const { filter = {}, offset, limit, order = 'id.asc' } = args ?? {}
+    const { filter = {}, offset, limit, order = 'createdAt.asc' } = args ?? {}
     const sortOptions: FindOptionsOrder<DigitalCredentialEntity> =
       order && typeof order === 'string'
         ? parseAndValidateOrderOptions<DigitalCredentialEntity>(order)

package/src/entities/contact/BaseContactEntity.ts

@@ -11,7 +11,7 @@ import {
   TableInheritance,
   UpdateDateColumn,
 } from 'typeorm'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { PartyEntity } from './PartyEntity'
 import { ContactMetadataItemEntity } from './ContactMetadataItemEntity'
 
@@ -21,10 +21,10 @@ export abstract class BaseContactEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 
   @OneToOne(() => PartyEntity, (party: PartyEntity) => party.contact, {

package/src/entities/contact/ContactMetadataItemEntity.ts

@@ -1,6 +1,6 @@
 import { Entity, Column, PrimaryGeneratedColumn, BaseEntity, ManyToOne, BeforeInsert, BeforeUpdate } from 'typeorm'
 import { IMetadataEntity, ValidationConstraint } from '../../types'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { BaseContactEntity } from './BaseContactEntity'
 import { IsNotEmpty, validate, ValidationError } from 'class-validator'
 import { getConstraint } from '../../utils/ValidatorUtils'
@@ -24,7 +24,7 @@ export class ContactMetadataItemEntity extends BaseEntity implements IMetadataEn
   @Column('numeric', { name: 'numberValue', nullable: true })
   numberValue?: number
 
-  @Column({ name: 'dateValue', nullable: true, type: TYPEORM_DATE_TIME_TYPE })
+  @Column({ name: 'dateValue', nullable: true, type: typeOrmDateTime() })
   dateValue?: Date
 
   @Column('boolean', { name: 'boolValue', nullable: true })

package/src/entities/contact/ElectronicAddressEntity.ts

@@ -10,7 +10,7 @@ import {
   CreateDateColumn,
   UpdateDateColumn,
 } from 'typeorm'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { PartyEntity } from './PartyEntity'
 import { getConstraint } from '../../utils/ValidatorUtils'
 import { ElectronicAddressType, ValidationConstraint } from '../../types'
@@ -42,10 +42,10 @@ export class ElectronicAddressEntity extends BaseEntity {
   @Column('text', { name: 'tenant_id', nullable: true })
   tenantId?: string
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 
   // By default, @UpdateDateColumn in TypeORM updates the timestamp only when the entity's top-level properties change.

package/src/entities/contact/IdentityEntity.ts

@@ -13,7 +13,7 @@ import {
   BeforeUpdate,
 } from 'typeorm'
 import { IsNotEmpty, validate, ValidationError } from 'class-validator'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { CorrelationIdentifierEntity } from './CorrelationIdentifierEntity'
 import { ConnectionEntity } from './ConnectionEntity'
 import { IdentityMetadataItemEntity } from './IdentityMetadataItemEntity'
@@ -71,10 +71,10 @@ export class IdentityEntity extends BaseEntity {
   @JoinColumn({ name: 'metadata_id' }) // TODO check in db file
   metadata!: Array<IdentityMetadataItemEntity>
 
-  @CreateDateColumn({ name: 'created_at', nullable: false , type: TYPEORM_DATE_TIME_TYPE})
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 
   @ManyToOne(() => PartyEntity, (party: PartyEntity) => party.identities, {

package/src/entities/contact/IdentityMetadataItemEntity.ts

@@ -1,4 +1,4 @@
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { Entity, Column, PrimaryGeneratedColumn, BaseEntity, ManyToOne, BeforeInsert, BeforeUpdate } from 'typeorm'
 import { IMetadataEntity, ValidationConstraint } from '../../types'
 import { IdentityEntity } from './IdentityEntity'
@@ -24,7 +24,7 @@ export class IdentityMetadataItemEntity extends BaseEntity implements IMetadataE
   @Column('numeric', { name: 'numberValue', nullable: true })
   numberValue?: number
 
-  @Column({ name: 'dateValue', nullable: true, type: TYPEORM_DATE_TIME_TYPE })
+  @Column({ name: 'dateValue', nullable: true, type: typeOrmDateTime() })
   dateValue?: Date
 
   @Column('boolean', { name: 'boolValue', nullable: true })

package/src/entities/contact/OrganizationEntity.ts

@@ -1,8 +1,8 @@
-import {IsNotEmpty, validate, ValidationError} from 'class-validator'
-import {BeforeInsert, BeforeUpdate, ChildEntity, Column} from 'typeorm'
-import {ValidationConstraint} from '../../types'
-import {getConstraint} from '../../utils/ValidatorUtils'
-import {BaseContactEntity} from './BaseContactEntity'
+import { IsNotEmpty, validate, ValidationError } from 'class-validator'
+import { BeforeInsert, BeforeUpdate, ChildEntity, Column } from 'typeorm'
+import { ValidationConstraint } from '../../types'
+import { getConstraint } from '../../utils/ValidatorUtils'
+import { BaseContactEntity } from './BaseContactEntity'
 
 @ChildEntity('Organization')
 export class OrganizationEntity extends BaseContactEntity {

package/src/entities/contact/PartyEntity.ts

@@ -13,7 +13,7 @@ import {
   UpdateDateColumn,
 } from 'typeorm'
 import { ValidationConstraint } from '../../types'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { IdentityEntity } from './IdentityEntity'
 import { validate, ValidationError } from 'class-validator'
 import { PartyTypeEntity } from './PartyTypeEntity'
@@ -89,10 +89,10 @@ export class PartyEntity extends BaseEntity {
   @JoinColumn({ name: 'relationship_id' })
   relationships!: Array<PartyRelationshipEntity>
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 
   // By default, @UpdateDateColumn in TypeORM updates the timestamp only when the entity's top-level properties change.

package/src/entities/contact/PartyRelationshipEntity.ts

@@ -10,7 +10,7 @@ import {
   BeforeUpdate,
   JoinColumn,
 } from 'typeorm'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { PartyEntity } from './PartyEntity'
 
 @Entity('PartyRelationship')
@@ -45,10 +45,10 @@ export class PartyRelationshipEntity {
   @Column('text', { name: 'tenant_id', nullable: true })
   tenantId?: string
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 
   // By default, @UpdateDateColumn in TypeORM updates the timestamp only when the entity's top-level properties change.

package/src/entities/contact/PartyTypeEntity.ts

@@ -1,5 +1,5 @@
 import { BeforeInsert, BeforeUpdate, Column, CreateDateColumn, Entity, Index, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { PartyEntity } from './PartyEntity'
 import { PartyOrigin, PartyTypeType, ValidationConstraint } from '../../types'
 import { IsNotEmpty, Validate, validate, ValidationError } from 'class-validator'
@@ -35,10 +35,10 @@ export class PartyTypeEntity {
   })
   parties!: Array<PartyEntity>
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 
   // By default, @UpdateDateColumn in TypeORM updates the timestamp only when the entity's top-level properties change.

package/src/entities/contact/PhysicalAddressEntity.ts

@@ -10,7 +10,7 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { getConstraint } from '../../utils/ValidatorUtils'
 import { PhysicalAddressType, ValidationConstraint } from '../../types'
 import { PartyEntity } from './PartyEntity'
@@ -67,10 +67,10 @@ export class PhysicalAddressEntity extends BaseEntity {
   @Column('text', { name: 'partyId', nullable: true })
   partyId?: string
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 
   // By default, @UpdateDateColumn in TypeORM updates the timestamp only when the entity's top-level properties change.

package/src/entities/digitalCredential/DigitalCredentialEntity.ts

@@ -1,9 +1,16 @@
 import { BaseEntity, Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
-import { CredentialCorrelationType, CredentialDocumentFormat, CredentialRole, CredentialStateType, DocumentType } from '../../types'
-import {TYPEORM_DATE_TIME_TYPE, TYPEORM_DATE_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import {
+  CredentialCorrelationType,
+  CredentialDocumentFormat,
+  CredentialRole,
+  CredentialStateType,
+  DigitalCredential,
+  DocumentType,
+} from '../../types'
+import { typeormDate, typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 
 @Entity('DigitalCredential')
-export class DigitalCredentialEntity extends BaseEntity {
+export class DigitalCredentialEntity extends BaseEntity implements DigitalCredential {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
@@ -46,21 +53,21 @@ export class DigitalCredentialEntity extends BaseEntity {
   @Column('text', { name: 'tenant_id', nullable: true })
   tenantId?: string
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 
-  @Column({ name: 'valid_until', nullable: true, type: TYPEORM_DATE_TYPE })
+  @Column({ name: 'valid_until', nullable: true, type: typeormDate() })
   validUntil?: Date
 
-  @Column({ name: 'valid_from', nullable: true, type: TYPEORM_DATE_TYPE })
+  @Column({ name: 'valid_from', nullable: true, type: typeormDate() })
   validFrom?: Date
 
-  @Column( { name: 'verified_at', nullable: true, type: TYPEORM_DATE_TIME_TYPE })
+  @Column({ name: 'verified_at', nullable: true, type: typeOrmDateTime() })
   verifiedAt?: Date
 
-  @Column({ name: 'revoked_at', nullable: true, type: TYPEORM_DATE_TIME_TYPE })
+  @Column({ name: 'revoked_at', nullable: true, type: typeOrmDateTime() })
   revokedAt?: Date
 }

package/src/entities/eventLogger/AuditEventEntity.ts

@@ -2,14 +2,14 @@ import { ActionSubType, ActionType, InitiatorType, LogLevel, SubSystem, System,
 import { BaseEntity, Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
 import { PartyCorrelationType } from '@sphereon/ssi-sdk.core'
 import { NonPersistedAuditLoggingEvent } from '../../types'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 
 @Entity('AuditEvents')
 export class AuditEventEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
-  @Column({ name: 'timestamp', nullable: false, unique: false, type: TYPEORM_DATE_TIME_TYPE })
+  @Column({ name: 'timestamp', nullable: false, unique: false, type: typeOrmDateTime() })
   timestamp!: Date
 
   @Column('simple-enum', { name: 'level', enum: LogLevel, nullable: false, unique: false })
@@ -60,10 +60,10 @@ export class AuditEventEntity extends BaseEntity {
   @Column('text', { name: 'diagnosticData', nullable: true, unique: false })
   diagnosticData?: string
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 }
 

package/src/entities/issuanceBranding/BaseLocaleBrandingEntity.ts

@@ -11,7 +11,7 @@ import {
   TableInheritance,
   UpdateDateColumn,
 } from 'typeorm'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { ImageAttributesEntity } from './ImageAttributesEntity'
 import { BackgroundAttributesEntity } from './BackgroundAttributesEntity'
 import { TextAttributesEntity } from './TextAttributesEntity'
@@ -62,10 +62,10 @@ export class BaseLocaleBrandingEntity extends BaseEntity {
   @JoinColumn({ name: 'textId' })
   text?: TextAttributesEntity
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 
   // By default, @UpdateDateColumn in TypeORM updates the timestamp only when the entity's top-level properties change.

package/src/entities/issuanceBranding/CredentialBrandingEntity.ts

@@ -11,7 +11,7 @@ import {
   UpdateDateColumn,
 } from 'typeorm'
 import { ArrayMinSize, IsNotEmpty, validate, ValidationError } from 'class-validator'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { CredentialLocaleBrandingEntity, credentialLocaleBrandingEntityFrom } from './CredentialLocaleBrandingEntity'
 import { IBasicCredentialBranding, IBasicCredentialLocaleBranding } from '../../types'
 
@@ -43,10 +43,10 @@ export class CredentialBrandingEntity extends BaseEntity {
   @ArrayMinSize(1, { message: 'localeBranding cannot be empty' })
   localeBranding!: Array<CredentialLocaleBrandingEntity>
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 
   // By default, @UpdateDateColumn in TypeORM updates the timestamp only when the entity's top-level properties change.

package/src/entities/issuanceBranding/IssuerBrandingEntity.ts

@@ -11,7 +11,7 @@ import {
   UpdateDateColumn,
 } from 'typeorm'
 import { ArrayMinSize, IsNotEmpty, validate, ValidationError } from 'class-validator'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { IssuerLocaleBrandingEntity, issuerLocaleBrandingEntityFrom } from './IssuerLocaleBrandingEntity'
 import { IBasicIssuerBranding, IBasicIssuerLocaleBranding } from '../../types'
 
@@ -38,10 +38,10 @@ export class IssuerBrandingEntity extends BaseEntity {
   @ArrayMinSize(1, { message: 'localeBranding cannot be empty' })
   localeBranding!: Array<IssuerLocaleBrandingEntity>
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 
   // By default, @UpdateDateColumn in TypeORM updates the timestamp only when the entity's top-level properties change.

package/src/entities/machineState/MachineStateInfoEntity.ts

@@ -1,5 +1,5 @@
 import { BaseEntity, Column, CreateDateColumn, Entity, PrimaryColumn, UpdateDateColumn } from 'typeorm'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 
 /**
  * @class MachineStateInfoEntity
@@ -39,19 +39,19 @@ export class MachineStateInfoEntity extends BaseEntity {
   @Column({ name: 'state', type: 'text', nullable: false })
   state!: string
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'updated_at', nullable: false, type: typeOrmDateTime() })
   updatedAt!: Date
 
   @Column({ name: 'updated_count', type: 'integer', nullable: false })
   updatedCount!: number
 
-  @Column({ name: 'expires_at', nullable: true , type: TYPEORM_DATE_TIME_TYPE})
+  @Column({ name: 'expires_at', nullable: true, type: typeOrmDateTime() })
   expiresAt?: Date
 
-  @Column({ name: 'completed_at', nullable: true, type: TYPEORM_DATE_TIME_TYPE })
+  @Column({ name: 'completed_at', nullable: true, type: typeOrmDateTime() })
   completedAt?: Date
 
   @Column({ name: 'tenant_id', type: 'varchar', nullable: true })

package/src/entities/presentationDefinition/PresentationDefinitionItemEntity.ts

@@ -1,6 +1,6 @@
 import { BaseEntity, BeforeInsert, BeforeUpdate, Column, CreateDateColumn, Entity, Index, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
 import { IsNotEmpty } from 'class-validator'
-import {TYPEORM_DATE_TIME_TYPE} from "@sphereon/ssi-sdk.agent-config";
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 
 @Entity('PresentationDefinitionItem')
 @Index(['version'], { unique: false })
@@ -29,10 +29,10 @@ export class PresentationDefinitionItemEntity extends BaseEntity {
   @IsNotEmpty({ message: 'A blank definition payload field is not allowed' })
   definitionPayload!: string
 
-  @CreateDateColumn({ name: 'created_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
-  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: TYPEORM_DATE_TIME_TYPE })
+  @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 
   // By default, @UpdateDateColumn in TypeORM updates the timestamp only when the entity's top-level properties change.

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

@@ -7,7 +7,7 @@ export class CreateDigitalCredential1708525189001 implements MigrationInterface
     await queryRunner.query(`CREATE TYPE "digital_document_type" AS ENUM('VC', 'VP', 'C', 'P')`)
     await queryRunner.query(`CREATE TYPE "digital_credential_document_format" AS ENUM('JSON_LD', 'JWT', 'SD_JWT', 'MDOC')`)
     await queryRunner.query(`CREATE TYPE "digital_credential_credential_role" AS ENUM('ISSUER', 'VERIFIER', 'HOLDER')`)
-    await queryRunner.query(`CREATE TYPE "digital_credential_correlation_type" AS ENUM('DID')`)
+    await queryRunner.query(`CREATE TYPE "digital_credential_correlation_type" AS ENUM('DID', 'URL', 'X509_CN')`)
     await queryRunner.query(`CREATE TYPE "digital_credential_state_type" AS ENUM('REVOKED', 'VERIFIED', 'EXPIRED')`)
 
     await queryRunner.query(`

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

@@ -14,8 +14,8 @@ export class CreateDigitalCredential1708525189002 implements MigrationInterface
                 "uniform_document" text NOT NULL,
                 "credential_id" text,
                 "hash" text NOT NULL UNIQUE,
-                "issuer_correlation_type" varchar CHECK( "issuer_correlation_type" IN ('DID') ) NOT NULL,
-                "subject_correlation_type" varchar CHECK( "subject_correlation_type" IN ('DID') ),
+                "issuer_correlation_type" varchar CHECK( "issuer_correlation_type" IN ('DID', 'URL', 'X509_CN') ) NOT NULL,
+                "subject_correlation_type" varchar CHECK( "subject_correlation_type" IN ('DID', 'URL', 'X509_CN') ),
                 "issuer_correlation_id" text NOT NULL,
                 "subject_correlation_id" text,
                 "verified_state" varchar CHECK( "verified_state" IN ('REVOKED', 'VERIFIED', 'EXPIRED') ),

package/src/statusList/IStatusListStore.ts

@@ -10,8 +10,8 @@ import {
   IRemoveStatusListArgs,
   IStatusListEntryAvailableArgs,
   IUpdateStatusListIndexArgs,
-} from '../types/statusList/IAbstractStatusListStore'
-import { IStatusListEntity, IStatusListEntryEntity } from '../types/statusList/statusList'
+} from '../types'
+import { IStatusListEntity, IStatusListEntryEntity } from '../types'
 
 export interface IStatusListStore {
   getStatusList(args: IGetStatusListArgs): Promise<IStatusListEntity>

package/src/types/contact/contact.ts

@@ -1,4 +1,4 @@
-import { IIdentifierOpts } from '@sphereon/ssi-sdk-ext.did-utils'
+import { ManagedIdentifierOpts } from '@sphereon/ssi-sdk-ext.identifier-resolution/dist/types'
 import { IIdentifier } from '@veramo/core'
 import { ILocaleBranding } from '../issuanceBranding/issuanceBranding'
 import { CredentialRole } from '../digitalCredential/digitalCredential'
@@ -149,7 +149,7 @@ export type PartialOpenIdConfig = Partial<OpenIdConfig>
 
 export type DidAuthConfig = {
   id: string
-  idOpts: IIdentifierOpts
+  idOpts: ManagedIdentifierOpts
   stateId: string
   ownerId?: string
   tenantId?: string

package/src/types/digitalCredential/digitalCredential.ts

@@ -37,8 +37,40 @@ export enum CredentialDocumentFormat {
   MDOC = 'MDOC',
 }
 
+export namespace CredentialDocumentFormat {
+  export function fromSpecValue(credentialFormat: string) {
+    const format = credentialFormat.toLowerCase()
+    if (format.includes('sd')) {
+      return CredentialDocumentFormat.SD_JWT
+    } else if (format.includes('ldp')) {
+      return CredentialDocumentFormat.JSON_LD
+    } else if (format.includes('mso') || credentialFormat.includes('mdoc')) {
+      return CredentialDocumentFormat.MDOC
+    } else if (format.includes('jwt_')) {
+      return CredentialDocumentFormat.JWT
+    } else {
+      throw Error(`Could not map format ${format} to known format`)
+    }
+  }
+
+  export function toSpecValue(documentFormat: CredentialDocumentFormat, documentType: DocumentType) {
+    switch (documentFormat) {
+      case CredentialDocumentFormat.SD_JWT:
+        return 'vc+sd-jwt'
+      case CredentialDocumentFormat.MDOC:
+        return 'mso_mdoc'
+      case CredentialDocumentFormat.JSON_LD:
+        return documentType === DocumentType.C || documentType === DocumentType.VC ? 'ldp_vc' : 'ldp_vp'
+      case CredentialDocumentFormat.JWT:
+        return documentType === DocumentType.C || documentType === DocumentType.VC ? 'jwt_vc_json' : 'jwt_vp_json'
+    }
+  }
+}
+
 export enum CredentialCorrelationType {
   DID = 'DID',
+  X509_CN = 'X509_CN',
+  URL = 'URL',
 }
 
 export enum CredentialRole {

package/src/utils/contact/MappingUtils.ts

@@ -165,8 +165,19 @@ export const correlationIdentifierFrom = (identifier: CorrelationIdentifierEntit
 }
 
 export const didAuthConfigEntityFrom = (config: NonPersistedDidAuthConfig): DidAuthConfigEntity => {
+  let identifier: string | undefined = undefined
+  if (typeof config.idOpts.identifier === 'string') {
+    identifier = config.idOpts.identifier
+  } else if (typeof config.idOpts.identifier === 'object') {
+    if ('did' in config.idOpts.identifier && typeof config.idOpts.identifier.did === 'string') {
+      identifier = config.idOpts.identifier.did
+    }
+  }
+  if (!identifier) {
+    throw Error(`Identifier method ${config.idOpts.method} not yet supported`)
+  }
   const didAuthConfig: DidAuthConfigEntity = new DidAuthConfigEntity()
-  didAuthConfig.identifier = typeof config.idOpts.identifier === 'string' ? config.idOpts.identifier : config.idOpts.identifier.did
+  didAuthConfig.identifier = identifier
   didAuthConfig.redirectUrl = config.redirectUrl
   didAuthConfig.sessionId = config.sessionId
   didAuthConfig.ownerId = config.ownerId