@sphereon/ssi-sdk.data-store 0.36.1-next.129 → 0.36.1-next.150

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.36.1-next.129+2a4f4386",
+  "version": "0.36.1-next.150+f7fd1f3f",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -28,13 +28,14 @@
   "dependencies": {
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
     "@sphereon/pex": "5.0.0-unstable.28",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.36.1-next.129+2a4f4386",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.36.1-next.129+2a4f4386",
-    "@sphereon/ssi-sdk.agent-config": "0.36.1-next.129+2a4f4386",
-    "@sphereon/ssi-sdk.core": "0.36.1-next.129+2a4f4386",
-    "@sphereon/ssi-sdk.data-store-types": "0.36.1-next.129+2a4f4386",
-    "@sphereon/ssi-types": "0.36.1-next.129+2a4f4386",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.36.1-next.150+f7fd1f3f",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.36.1-next.150+f7fd1f3f",
+    "@sphereon/ssi-sdk.agent-config": "0.36.1-next.150+f7fd1f3f",
+    "@sphereon/ssi-sdk.core": "0.36.1-next.150+f7fd1f3f",
+    "@sphereon/ssi-sdk.data-store-types": "0.36.1-next.150+f7fd1f3f",
+    "@sphereon/ssi-types": "0.36.1-next.150+f7fd1f3f",
     "@veramo/core": "4.2.0",
+    "@veramo/data-store": "4.2.0",
     "@veramo/utils": "4.2.0",
     "blakejs": "^1.2.1",
     "class-validator": "0.14.1",
@@ -66,5 +67,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "2a4f43863a1544f53c63485daee40bcb2abbfa81"
+  "gitHead": "f7fd1f3f7e42d569b2695b54aa2587fa4926310d"
 }

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

@@ -18,7 +18,7 @@ import { PartyEntity } from '../entities/contact/PartyEntity'
 import { PartyRelationshipEntity } from '../entities/contact/PartyRelationshipEntity'
 import { PartyTypeEntity } from '../entities/contact/PartyTypeEntity'
 import { PhysicalAddressEntity } from '../entities/contact/PhysicalAddressEntity'
-import { contactMetadataItemEntityFrom, DataStoreContactEntities, DataStoreMigrations, identityMetadataItemEntityFrom, partyTypeFrom } from '../index'
+import { contactMetadataItemEntityFrom, DataStoreEntitiesWithVeramo, DataStoreMigrationsWithVeramo, identityMetadataItemEntityFrom, partyTypeFrom } from '../index'
 import {
   IdentityOrigin,
   MetadataTypes,
@@ -64,9 +64,9 @@ describe('Database entities tests', (): void => {
       database: ':memory:',
       logging: ['info'],
       migrationsRun: false,
-      migrations: DataStoreMigrations,
+      migrations: DataStoreMigrationsWithVeramo,
       synchronize: false,
-      entities: DataStoreContactEntities,
+      entities: DataStoreEntitiesWithVeramo,
     }).initialize()
     await dbConnection.runMigrations()
     expect(await dbConnection.showMigrations()).toBeFalsy()

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

@@ -31,7 +31,7 @@ import { CredentialRole } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { ContactStore } from '../contact/ContactStore'
-import { DataStoreContactEntities, DataStoreMigrations } from '../index'
+import { DataStoreEntitiesWithVeramo, DataStoreMigrationsWithVeramo } from '../index'
 
 describe('Contact store tests', (): void => {
   let dbConnection: DataSource
@@ -44,9 +44,9 @@ describe('Contact store tests', (): void => {
       database: ':memory:',
       logging: ['info'],
       migrationsRun: false,
-      migrations: DataStoreMigrations,
+      migrations: DataStoreMigrationsWithVeramo,
       synchronize: false,
-      entities: DataStoreContactEntities,
+      entities: DataStoreEntitiesWithVeramo,
     }).initialize()
     await dbConnection.runMigrations()
     expect(await dbConnection.showMigrations()).toBeFalsy()

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

@@ -6,7 +6,7 @@ import {
   credentialBrandingEntityFrom,
   CredentialLocaleBrandingEntity,
   credentialLocaleBrandingEntityFrom,
-  DataStoreIssuanceBrandingEntities,
+  DataStoreIssuanceBrandingEntities, DataStoreEntitiesWithVeramo,
   IBasicCredentialBranding,
   IBasicCredentialLocaleBranding,
   IBasicIssuerBranding,
@@ -16,7 +16,7 @@ import {
   IssuerLocaleBrandingEntity,
   issuerLocaleBrandingEntityFrom,
 } from '../index'
-import { DataStoreMigrations } from '../migrations'
+import { DataStoreMigrationsWithVeramo } from '../migrations'
 
 describe('Database entities tests', (): void => {
   let dbConnection: DataSource
@@ -28,9 +28,9 @@ describe('Database entities tests', (): void => {
       database: ':memory:',
       //logging: ['info'],
       migrationsRun: false,
-      migrations: DataStoreMigrations,
+      migrations: DataStoreMigrationsWithVeramo,
       synchronize: false,
-      entities: DataStoreIssuanceBrandingEntities,
+      entities: DataStoreEntitiesWithVeramo,
     }).initialize()
     await dbConnection.runMigrations()
     expect(await dbConnection.showMigrations()).toBeFalsy()

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

@@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import {
   BackgroundAttributesEntity,
   CredentialLocaleBrandingEntity,
-  DataStoreIssuanceBrandingEntities,
+  DataStoreIssuanceBrandingEntities, DataStoreEntitiesWithVeramo,
   IAddCredentialLocaleBrandingArgs,
   IAddIssuerLocaleBrandingArgs,
   IBasicCredentialBranding,
@@ -26,7 +26,7 @@ import {
   TextAttributesEntity,
 } from '../index'
 import { IssuanceBrandingStore } from '../issuanceBranding/IssuanceBrandingStore'
-import { DataStoreMigrations } from '../migrations'
+import { DataStoreMigrationsWithVeramo } from '../migrations'
 
 describe('Issuance branding store tests', (): void => {
   let dbConnection: DataSource
@@ -39,9 +39,9 @@ describe('Issuance branding store tests', (): void => {
       database: ':memory:',
       //logging: ['info'],
       migrationsRun: false,
-      migrations: DataStoreMigrations,
+      migrations: DataStoreMigrationsWithVeramo,
       synchronize: false,
-      entities: DataStoreIssuanceBrandingEntities,
+      entities: DataStoreEntitiesWithVeramo,
     }).initialize()
     await dbConnection.runMigrations()
     expect(await dbConnection.showMigrations()).toBeFalsy()

package/src/contact/ContactStore.ts

@@ -249,10 +249,45 @@ export class ContactStore extends AbstractContactStore {
       }
     }
 
-    const identityEntity: IdentityEntity = identityEntityFrom(identity)
+    const identityRepository = (await this.dbConnection).getRepository(IdentityEntity)
+    const correlationIdentifierRepository = (await this.dbConnection).getRepository(CorrelationIdentifierEntity)
+
+    // First check if an identity with the same correlationId already exists
+    const existingCorrelationIdentifier = await correlationIdentifierRepository.findOne({
+      where: { correlationId: identity.identifier.correlationId },
+    })
+
+    if (existingCorrelationIdentifier) {
+      // The same identifier already exists, return the existing identity
+      const existingIdentity = await identityRepository.findOne({
+        where: { identifier: { id: existingCorrelationIdentifier.id } },
+      })
+      if (existingIdentity) {
+        debug('Identity with same correlationId already exists, returning existing identity', identity.identifier.correlationId)
+        return identityFrom(existingIdentity)
+      }
+    }
+
+    // Check if an identity with the same alias exists (but different correlationId)
+    const existingAlias = await identityRepository.findOne({
+      where: { alias: identity.alias },
+    })
+
+    let uniqueAlias = identity.alias
+    if (existingAlias) {
+      // Generate a unique alias by appending a counter
+      let counter = 1
+      while (await identityRepository.findOne({ where: { alias: `${identity.alias}_${counter}` } })) {
+        counter++
+      }
+      uniqueAlias = `${identity.alias}_${counter}`
+      debug('Alias collision detected, using unique alias', { original: identity.alias, unique: uniqueAlias })
+    }
+
+    const identityEntity: IdentityEntity = identityEntityFrom({ ...identity, alias: uniqueAlias })
     identityEntity.party = party
     debug('Adding identity', identity)
-    const result: IdentityEntity = await (await this.dbConnection).getRepository(IdentityEntity).save(identityEntity, {
+    const result: IdentityEntity = await identityRepository.save(identityEntity, {
       transaction: true,
     })
 

package/src/entities/contact/OpenIdConfigEntity.ts

@@ -6,8 +6,8 @@ export class OpenIdConfigEntity extends BaseConfigEntity {
   @Column('varchar', { name: 'client_id', length: 255, nullable: false })
   clientId!: string
 
-  @Column('varchar', { name: 'client_secret', length: 255, nullable: false })
-  clientSecret!: string
+  @Column('varchar', { name: 'client_secret', length: 255, nullable: true })
+  clientSecret?: string
 
   @Column('simple-array', { name: 'scopes', nullable: false })
   scopes!: Array<string>

package/src/index.ts

@@ -1,3 +1,4 @@
+import { Entities as VeramoDataStoreEntities } from '@veramo/data-store'
 import { BaseConfigEntity } from './entities/contact/BaseConfigEntity'
 import { BaseContactEntity } from './entities/contact/BaseContactEntity'
 import { ConnectionEntity } from './entities/contact/ConnectionEntity'
@@ -53,6 +54,10 @@ export {
   DataStoreStatusListMigrations,
   DataStoreMachineStateMigrations,
   DataStorePresentationDefinitionMigrations,
+  DataStoreServiceMigrations,
+  DataStoreMigrationsWithVeramo,
+  VeramoDataStoreMigrations,
+  VeramoDataStoreEntities,
 } from './migrations'
 export * from './types'
 export * from './utils/contact/MappingUtils'
@@ -123,6 +128,13 @@ export const DataStoreEntities = [
   // ...DataStoreOid4vcStateEntities,
 ]
 
+// All entities combined with Veramo entities if a party wants to enable them all at once
+export const DataStoreEntitiesWithVeramo = [
+  ...VeramoDataStoreEntities,
+  ...DataStoreEntities,
+]
+
+
 export {
   BaseConfigEntity,
   ConnectionEntity,

package/src/migrations/generic/15-AddServiceMetadata.ts

@@ -0,0 +1,66 @@
+import Debug, { Debugger } from 'debug'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
+import { AddServiceMetadata1764000000001 } from '../postgres/1764000000001-AddServiceMetadata'
+import { AddServiceMetadata1764000000002 } from '../sqlite/1764000000002-AddServiceMetadata'
+
+const debug: Debugger = Debug('sphereon:ssi-sdk:migrations')
+
+export class AddServiceMetadata1764000000000 implements MigrationInterface {
+  name: string = 'AddServiceMetadata1764000000000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    debug('migration: adding metadata column to service table')
+    const dbType: DatabaseType = queryRunner.connection.driver.options.type
+
+    switch (dbType) {
+      case 'postgres': {
+        debug('using postgres migration file for AddServiceMetadata')
+        const mig: AddServiceMetadata1764000000001 = new AddServiceMetadata1764000000001()
+        await mig.up(queryRunner)
+        debug('Postgres migration statements for AddServiceMetadata executed')
+        return
+      }
+      case 'sqlite':
+      case 'expo':
+      case 'react-native': {
+        debug('using sqlite/react-native migration file for AddServiceMetadata')
+        const mig: AddServiceMetadata1764000000002 = new AddServiceMetadata1764000000002()
+        await mig.up(queryRunner)
+        debug('SQLite migration statements for AddServiceMetadata executed')
+        return
+      }
+      default:
+        return Promise.reject(
+          `Migrations are currently only supported for sqlite, react-native, expo, and postgres for AddServiceMetadata. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`,
+        )
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    debug('migration: reverting metadata column from service table')
+    const dbType: DatabaseType = queryRunner.connection.driver.options.type
+
+    switch (dbType) {
+      case 'postgres': {
+        debug('using postgres migration file for AddServiceMetadata')
+        const mig: AddServiceMetadata1764000000001 = new AddServiceMetadata1764000000001()
+        await mig.down(queryRunner)
+        debug('Postgres migration statements for AddServiceMetadata reverted')
+        return
+      }
+      case 'sqlite':
+      case 'expo':
+      case 'react-native': {
+        debug('using sqlite/react-native migration file for AddServiceMetadata')
+        const mig: AddServiceMetadata1764000000002 = new AddServiceMetadata1764000000002()
+        await mig.down(queryRunner)
+        debug('SQLite migration statements for AddServiceMetadata reverted')
+        return
+      }
+      default:
+        return Promise.reject(
+          `Migrations are currently only supported for sqlite, react-native, expo, and postgres for AddServiceMetadata. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`,
+        )
+    }
+  }
+}

package/src/migrations/generic/16-MakeOpenIdClientSecretNullable.ts

@@ -0,0 +1,62 @@
+import Debug, { Debugger } from 'debug'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
+import { MakeOpenIdClientSecretNullable1767000000001 } from '../postgres/1767000000001-MakeOpenIdClientSecretNullable'
+import { MakeOpenIdClientSecretNullable1767000000002 } from '../sqlite/1767000000002-MakeOpenIdClientSecretNullable'
+
+const debug: Debugger = Debug('sphereon:ssi-sdk:migrations')
+
+export class MakeOpenIdClientSecretNullable1767000000000 implements MigrationInterface {
+  name: string = 'MakeOpenIdClientSecretNullable1767000000000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    debug('migration: making client_secret nullable in BaseConfig table')
+    const dbType: DatabaseType = queryRunner.connection.driver.options.type
+
+    switch (dbType) {
+      case 'postgres': {
+        debug('using postgres migration file for MakeOpenIdClientSecretNullable')
+        const mig = new MakeOpenIdClientSecretNullable1767000000001()
+        await mig.up(queryRunner)
+        debug('Postgres migration statements for MakeOpenIdClientSecretNullable executed')
+        return
+      }
+      case 'sqlite':
+      case 'expo':
+      case 'react-native': {
+        debug('using sqlite/react-native migration file for MakeOpenIdClientSecretNullable')
+        const mig = new MakeOpenIdClientSecretNullable1767000000002()
+        await mig.up(queryRunner)
+        debug('SQLite migration statements for MakeOpenIdClientSecretNullable executed')
+        return
+      }
+      default:
+        return Promise.reject(
+          `Migrations are currently only supported for sqlite, react-native, expo, and postgres for MakeOpenIdClientSecretNullable. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`,
+        )
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    debug('migration: reverting client_secret nullable in BaseConfig table')
+    const dbType: DatabaseType = queryRunner.connection.driver.options.type
+
+    switch (dbType) {
+      case 'postgres': {
+        const mig = new MakeOpenIdClientSecretNullable1767000000001()
+        await mig.down(queryRunner)
+        return
+      }
+      case 'sqlite':
+      case 'expo':
+      case 'react-native': {
+        const mig = new MakeOpenIdClientSecretNullable1767000000002()
+        await mig.down(queryRunner)
+        return
+      }
+      default:
+        return Promise.reject(
+          `Migrations are currently only supported for sqlite, react-native, expo, and postgres for MakeOpenIdClientSecretNullable. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`,
+        )
+    }
+  }
+}

package/src/migrations/generic/index.ts

@@ -1,3 +1,4 @@
+import { migrations as VeramoDataStoreMigrations, Entities as VeramoDataStoreEntities } from '@veramo/data-store'
 import { CreateContacts1659463079429 } from './1-CreateContacts'
 import { CreatePresentationDefinitions1716533767523 } from './10-CreatePresentationDefinitions'
 import { FixCredentialClaimsReferencesUuid1741895822987 } from './11-FixCredentialClaimsReferenceUuid'
@@ -5,6 +6,8 @@ import { AddBitstringStatusListEnum1741895823000, CreateBitstringStatusList17418
 import { CreateDcqlQueryItem1726617600000 } from './13-CreateDcqlQueryItem'
 import { AddLinkedVpFields1763387280000 } from './14-AddLinkedVpFields'
 import { AddBrandingState1766000000000 } from './15-AddBrandingState'
+import { AddServiceMetadata1764000000000 } from './15-AddServiceMetadata'
+import { MakeOpenIdClientSecretNullable1767000000000 } from './16-MakeOpenIdClientSecretNullable'
 import { CreateIssuanceBranding1659463079429 } from './2-CreateIssuanceBranding'
 import { CreateContacts1690925872318 } from './3-CreateContacts'
 import { CreateStatusList1693866470000 } from './4-CreateStatusList'
@@ -28,6 +31,7 @@ export const DataStoreContactMigrations = [
   CreateContacts1690925872318,
   CreateContacts1708525189000,
   CreateContacts1715761125000,
+  MakeOpenIdClientSecretNullable1767000000000,
 ]
 export const DataStoreIssuanceBrandingMigrations = [
   CreateIssuanceBranding1659463079429,
@@ -43,6 +47,7 @@ export const DataStoreEventLoggerMigrations = [CreateAuditEvents1701635835330]
 export const DataStoreDigitalCredentialMigrations = [CreateDigitalCredential1708525189000, AddLinkedVpFields1763387280000]
 export const DataStoreMachineStateMigrations = [CreateMachineStateStore1708098041262]
 export const DataStorePresentationDefinitionMigrations = [CreatePresentationDefinitions1716533767523, CreateDcqlQueryItem1726617600000]
+export const DataStoreServiceMigrations = [AddServiceMetadata1764000000000]
 
 // All migrations together
 export const DataStoreMigrations = [
@@ -53,4 +58,16 @@ export const DataStoreMigrations = [
   ...DataStoreDigitalCredentialMigrations,
   ...DataStoreMachineStateMigrations,
   ...DataStorePresentationDefinitionMigrations,
+  ...DataStoreServiceMigrations,
 ]
+
+
+
+// All migrations combined with Veramo migrations first - use this when you need both
+export const DataStoreMigrationsWithVeramo = [
+  ...VeramoDataStoreMigrations,
+  ...DataStoreMigrations,
+]
+
+// Re-export Veramo migrations and entities for convenience
+export { VeramoDataStoreMigrations, VeramoDataStoreEntities }

package/src/migrations/index.ts

@@ -1,5 +1,6 @@
 export {
   DataStoreMigrations,
+  DataStoreMigrationsWithVeramo,
   DataStoreEventLoggerMigrations,
   DataStoreContactMigrations,
   DataStoreIssuanceBrandingMigrations,
@@ -7,4 +8,7 @@ export {
   DataStoreDigitalCredentialMigrations,
   DataStoreMachineStateMigrations,
   DataStorePresentationDefinitionMigrations,
+  DataStoreServiceMigrations,
+  VeramoDataStoreMigrations,
+  VeramoDataStoreEntities,
 } from './generic'

package/src/migrations/postgres/1764000000001-AddServiceMetadata.ts

@@ -0,0 +1,44 @@
+import Debug, { Debugger } from 'debug'
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+const debug: Debugger = Debug('sphereon:ssi-sdk:migrations')
+
+export class AddServiceMetadata1764000000001 implements MigrationInterface {
+  name = 'AddServiceMetadata1764000000001'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Check if the service table exists (created by Veramo migrations)
+    const table = await queryRunner.getTable('service')
+    if (!table) {
+      // Service table doesn't exist - Veramo DID Manager is not in use
+      // Skip this migration as there's no service table to modify
+      debug(
+        'AddServiceMetadata: Skipping migration - service table does not exist. ' +
+        'This is expected if Veramo DID Manager is not being used. ' +
+        'If you need service metadata support, ensure Veramo migrations run before SSI-SDK migrations.'
+      )
+      console.warn(
+        '[SSI-SDK Migration] AddServiceMetadata: Skipping - service table does not exist (Veramo DID Manager not in use)'
+      )
+      return
+    }
+
+    await queryRunner.query(`
+      ALTER TABLE "service"
+      ADD COLUMN IF NOT EXISTS "metadata" jsonb
+    `)
+    debug('AddServiceMetadata: Added metadata column to service table')
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    const table = await queryRunner.getTable('service')
+    if (!table) {
+      return
+    }
+    
+    await queryRunner.query(`
+      ALTER TABLE "service"
+      DROP COLUMN IF EXISTS "metadata"
+    `)
+  }
+}

package/src/migrations/postgres/1767000000001-MakeOpenIdClientSecretNullable.ts

@@ -0,0 +1,32 @@
+import Debug, { Debugger } from 'debug'
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+const debug: Debugger = Debug('sphereon:ssi-sdk:migrations')
+
+export class MakeOpenIdClientSecretNullable1767000000001 implements MigrationInterface {
+  name = 'MakeOpenIdClientSecretNullable1767000000001'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const table = await queryRunner.getTable('BaseConfig')
+    if (!table) {
+      debug('MakeOpenIdClientSecretNullable: Skipping migration - BaseConfig table does not exist')
+      return
+    }
+
+    const column = table.columns.find((col) => col.name === 'client_secret')
+    if (column && !column.isNullable) {
+      await queryRunner.query(`ALTER TABLE "BaseConfig" ALTER COLUMN "client_secret" DROP NOT NULL`)
+      debug('MakeOpenIdClientSecretNullable: Made client_secret nullable')
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    const table = await queryRunner.getTable('BaseConfig')
+    if (!table) {
+      return
+    }
+
+    await queryRunner.query(`UPDATE "BaseConfig" SET "client_secret" = '' WHERE "client_secret" IS NULL`)
+    await queryRunner.query(`ALTER TABLE "BaseConfig" ALTER COLUMN "client_secret" SET NOT NULL`)
+  }
+}

package/src/migrations/sqlite/1764000000002-AddServiceMetadata.ts

@@ -0,0 +1,41 @@
+import Debug, { Debugger } from 'debug'
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+const debug: Debugger = Debug('sphereon:ssi-sdk:migrations')
+
+export class AddServiceMetadata1764000000002 implements MigrationInterface {
+  name = 'AddServiceMetadata1764000000002'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Check if the service table exists (created by Veramo migrations)
+    const table = await queryRunner.getTable('service')
+    if (!table) {
+      // Service table doesn't exist - Veramo DID Manager is not in use
+      // Skip this migration as there's no service table to modify
+      debug(
+        'AddServiceMetadata: Skipping migration - service table does not exist. ' +
+        'This is expected if Veramo DID Manager is not being used. ' +
+        'If you need service metadata support, ensure Veramo migrations run before SSI-SDK migrations.'
+      )
+      console.warn(
+        '[SSI-SDK Migration] AddServiceMetadata: Skipping - service table does not exist (Veramo DID Manager not in use)'
+      )
+      return
+    }
+
+    // Check if metadata column already exists
+    const hasMetadataColumn = table.columns.some((col) => col.name === 'metadata')
+    if (!hasMetadataColumn) {
+      await queryRunner.query(`
+        ALTER TABLE "service"
+        ADD COLUMN "metadata" text
+      `)
+      debug('AddServiceMetadata: Added metadata column to service table')
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // SQLite doesn't support DROP COLUMN directly
+    // Also, if the service table doesn't exist, nothing to do
+  }
+}

package/src/migrations/sqlite/1767000000002-MakeOpenIdClientSecretNullable.ts

@@ -0,0 +1,22 @@
+import Debug, { Debugger } from 'debug'
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+const debug: Debugger = Debug('sphereon:ssi-sdk:migrations')
+
+export class MakeOpenIdClientSecretNullable1767000000002 implements MigrationInterface {
+  name = 'MakeOpenIdClientSecretNullable1767000000002'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // SQLite columns added via ALTER TABLE are already nullable by default,
+    // and SQLite does not enforce NOT NULL changes via ALTER COLUMN.
+    // Since client_secret was originally created as NOT NULL, we need to recreate.
+    // However, SQLite in practice allows NULL values in NOT NULL columns when
+    // inserted via raw queries, and TypeORM's synchronize handles this.
+    // For safety, we simply ensure existing rows have an empty string if null.
+    debug('MakeOpenIdClientSecretNullable: SQLite does not support ALTER COLUMN, no action needed for nullable change')
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // No action needed
+  }
+}

package/src/utils/presentationDefinition/MappingUtils.ts

@@ -1,10 +1,13 @@
 import type { IPresentationDefinition } from '@sphereon/pex'
 import type { DcqlQueryItem, NonPersistedDcqlQueryItem, PartialDcqlQueryItem } from '@sphereon/ssi-sdk.data-store-types'
-import * as blakepkg from 'blakejs'
+import * as blakejs from 'blakejs'
 import { DcqlQuery } from 'dcql'
 import { DcqlQueryItemEntity } from '../../entities/presentationDefinition/DcqlQueryItemEntity'
 import { replaceNullWithUndefined } from '../FormattingUtils'
 
+// Handle CommonJS/ESM interop - blakejs may be wrapped in a default export
+const blake = (blakejs as any).default ?? blakejs
+
 export const dcqlQueryItemFrom = (entity: DcqlQueryItemEntity): DcqlQueryItem => {
   const result: DcqlQueryItem = {
     id: entity.id,
@@ -41,7 +44,7 @@ export const dcqlQueryEntityItemFrom = (item: NonPersistedDcqlQueryItem): DcqlQu
 }
 
 function hashPayload(payload: IPresentationDefinition | DcqlQuery): string {
-  return blakepkg.blake2bHex(JSON.stringify(payload))
+  return blake.blake2bHex(JSON.stringify(payload))
 }
 
 export function isPresentationDefinitionEqual(base: PartialDcqlQueryItem, compare: PartialDcqlQueryItem): boolean {