@sphereon/ssi-sdk.data-store 0.32.1-next.54 → 0.33.0

package/src/migrations/postgres/1693866470001-CreateStatusList.ts

@@ -1,24 +1,57 @@
+// noinspection SqlPostgresDialect SqlNoDataSourceInspection
 import { MigrationInterface, QueryRunner } from 'typeorm'
 
 export class CreateStatusList1693866470001 implements MigrationInterface {
   name = 'CreateStatusList1693866470001'
 
   public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`CREATE TYPE "StatusList_type_enum" AS ENUM('StatusList2021')`)
+    await queryRunner.query(`CREATE TYPE "StatusList_drivertype_enum" AS ENUM('agent_typeorm', 'agent_kv_store', 'github', 'agent_filesystem')`)
+    await queryRunner.query(`CREATE TYPE "StatusList_credentialidmode_enum" AS ENUM('ISSUANCE', 'PERSISTENCE', 'NEVER')`)
+
     await queryRunner.query(
-      `CREATE TABLE "StatusListEntry" ("statusListId" character varying NOT NULL, "statusListIndex" integer NOT NULL, "credentialId" character varying, "credentialHash" character varying(128), "correlationId" character varying(255), "value" character varying(50), CONSTRAINT "PK_68704d2d13857360c6b44a3d1d0" PRIMARY KEY ("statusListId", "statusListIndex"))`,
-    )
-    await queryRunner.query(`CREATE TYPE "public"."StatusList_type_enum" AS ENUM('StatusList2021')`)
-    await queryRunner.query(
-      `CREATE TYPE "public"."StatusList_drivertype_enum" AS ENUM('agent_typeorm', 'agent_kv_store', 'github', 'agent_filesystem')`,
+      `CREATE TABLE "StatusListEntry"
+             (
+                 "statusListId"    character varying NOT NULL,
+                 "statusListIndex" integer           NOT NULL,
+                 "credentialId"    character varying,
+                 "credentialHash"  character varying(128),
+                 "correlationId"   character varying(255),
+                 "value"           character varying(50),
+                 CONSTRAINT "PK_68704d2d13857360c6b44a3d1d0" PRIMARY KEY ("statusListId", "statusListIndex")
+             )`,
     )
-    await queryRunner.query(`CREATE TYPE "public"."StatusList_credentialidmode_enum" AS ENUM('ISSUANCE', 'PERSISTENCE', 'NEVER')`)
     await queryRunner.query(
-      `CREATE TABLE "StatusList" ("id" character varying NOT NULL, "correlationId" character varying NOT NULL, "length" integer NOT NULL, "issuer" text NOT NULL, "type" "public"."StatusList_type_enum" NOT NULL DEFAULT 'StatusList2021', "driverType" "public"."StatusList_drivertype_enum" NOT NULL DEFAULT 'agent_typeorm', "credentialIdMode" "public"."StatusList_credentialidmode_enum" NOT NULL DEFAULT 'ISSUANCE', "proofFormat" character varying NOT NULL DEFAULT 'lds', "indexingDirection" character varying NOT NULL DEFAULT 'rightToLeft', "statusPurpose" character varying NOT NULL DEFAULT 'revocation', "statusListCredential" text, CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId"), CONSTRAINT "PK_StatusList_Id" PRIMARY KEY ("id"))`,
+      `CREATE TABLE "StatusList"
+             (
+                 "id"                   character varying                  NOT NULL,
+                 "correlationId"        character varying                  NOT NULL,
+                 "length"               integer                            NOT NULL,
+                 "issuer"               text                               NOT NULL,
+                 "type"                 "StatusList_type_enum"             NOT NULL DEFAULT 'StatusList2021',
+                 "driverType"           "StatusList_drivertype_enum"       NOT NULL DEFAULT 'agent_typeorm',
+                 "credentialIdMode"     "StatusList_credentialidmode_enum" NOT NULL DEFAULT 'ISSUANCE',
+                 "proofFormat"          character varying                  NOT NULL DEFAULT 'lds',
+                 "indexingDirection"    character varying                  NOT NULL DEFAULT 'rightToLeft',
+                 "statusPurpose"        character varying                  NOT NULL DEFAULT 'revocation',
+                 "statusListCredential" text,
+                 CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId"),
+                 CONSTRAINT "PK_StatusList_Id" PRIMARY KEY ("id")
+             )`,
     )
     await queryRunner.query(
-      `ALTER TABLE "StatusListEntry" ADD CONSTRAINT "FK_statusListEntry_statusListId" FOREIGN KEY ("statusListId") REFERENCES "StatusList"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+      `ALTER TABLE "StatusListEntry"
+                ADD CONSTRAINT "FK_statusListEntry_statusListId" FOREIGN KEY ("statusListId") REFERENCES "StatusList" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
     )
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "StatusListEntry"
+            DROP CONSTRAINT "FK_statusListEntry_statusListId"`)
+    await queryRunner.query(`DROP TABLE "StatusListEntry"`)
+    await queryRunner.query(`DROP TABLE "StatusList"`)
+    await queryRunner.query(`DROP TYPE "StatusList_credentialidmode_enum"`)
+    await queryRunner.query(`DROP TYPE "StatusList_drivertype_enum"`)
+    await queryRunner.query(`DROP TYPE "StatusList_type_enum"`)
+  }
 }

package/src/migrations/postgres/1716475165345-CreatePresentationDefinitions.ts

@@ -13,6 +13,7 @@ CREATE TABLE "PresentationDefinitionItem" (
     "version" TEXT NOT NULL, 
     "purpose" TEXT, 
     "definition_payload" TEXT NOT NULL, 
+    "dcql_payload" TEXT, 
     "created_at" TIMESTAMP NOT NULL DEFAULT now(), 
     "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), 
     CONSTRAINT "PK_PresentationDefinitionItem_id" PRIMARY KEY ("id"))

package/src/migrations/postgres/1737110469001-UpdateStatusList.ts

@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class UpdateStatusList1737110469001 implements MigrationInterface {
+  name = 'UpdateStatusList1737110469001'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Add new enum value
+    await queryRunner.query(`ALTER TYPE "StatusList_type_enum" ADD VALUE 'OAuthStatusList'`)
+
+    // Make columns nullable and add new columns
+    await queryRunner.query(`ALTER TABLE "StatusList" ALTER COLUMN "indexingDirection" DROP NOT NULL`)
+    await queryRunner.query(`ALTER TABLE "StatusList" ALTER COLUMN "statusPurpose" DROP NOT NULL`)
+    await queryRunner.query(`ALTER TABLE "StatusList" ADD "bitsPerStatus" integer`)
+    await queryRunner.query(`ALTER TABLE "StatusList" ADD "expiresAt" timestamp with time zone`)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "expiresAt"`)
+    await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "bitsPerStatus"`)
+    await queryRunner.query(`ALTER TABLE "StatusList" ALTER COLUMN "statusPurpose" SET NOT NULL`)
+    await queryRunner.query(`ALTER TABLE "StatusList" ALTER COLUMN "indexingDirection" SET NOT NULL`)
+
+    // Note: Cannot remove enum value in Postgres, would need to recreate the type
+  }
+}

package/src/migrations/postgres/1741895822987-FixCredentialClaimsReferencesUuid.ts

@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class FixCredentialClaimsReferencesUuidPG1741895822987 implements MigrationInterface {
+  name = 'FixCredentialClaimsReferencesUuid1741895822987'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Migrate varchar to uuid
+    await queryRunner.query(`
+      ALTER TABLE "CredentialClaims"
+      ALTER COLUMN "credentialLocaleBrandingId" TYPE uuid USING "credentialLocaleBrandingId"::uuid;
+    `)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Migrate uuid back to varchar
+    await queryRunner.query(`
+      ALTER TABLE "CredentialClaims"
+      ALTER COLUMN "credentialLocaleBrandingId" TYPE character varying USING "credentialLocaleBrandingId"::text;
+    `)
+  }
+}

package/src/migrations/sqlite/1693866470000-CreateStatusList.ts

@@ -5,20 +5,60 @@ export class CreateStatusList1693866470002 implements MigrationInterface {
 
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(
-      `CREATE TABLE "StatusListEntry" ("statusListId" varchar NOT NULL, "statusListIndex" integer NOT NULL, "credentialId" varchar, "credentialHash" varchar(128), "correlationId" varchar(255), "value" varchar(50), PRIMARY KEY ("statusListId", "statusListIndex"))`,
+      `CREATE TABLE "StatusListEntry"
+             (
+                 "statusListId"    varchar NOT NULL,
+                 "statusListIndex" integer NOT NULL,
+                 "credentialId"    varchar,
+                 "credentialHash"  varchar(128),
+                 "correlationId"   varchar(255),
+                 "value"           varchar(50),
+                 PRIMARY KEY ("statusListId", "statusListIndex")
+             )`,
     )
     await queryRunner.query(
-      `CREATE TABLE "StatusList" ("id" varchar PRIMARY KEY NOT NULL, "correlationId" varchar NOT NULL, "length" integer NOT NULL, "issuer" text NOT NULL, "type" varchar CHECK( "type" IN ('StatusList2021') ) NOT NULL DEFAULT ('StatusList2021'), "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'), "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'), "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt') ) NOT NULL DEFAULT ('lds'), "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ) NOT NULL DEFAULT ('rightToLeft'), "statusPurpose" varchar NOT NULL DEFAULT ('revocation'), "statusListCredential" text, CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId"))`,
+      `CREATE TABLE "StatusList"
+             (
+                 "id"                   varchar PRIMARY KEY                                                          NOT NULL,
+                 "correlationId"        varchar                                                                      NOT NULL,
+                 "length"               integer                                                                      NOT NULL,
+                 "issuer"               text                                                                         NOT NULL,
+                 "type"                 varchar CHECK ( "type" IN ('StatusList2021') )                               NOT NULL DEFAULT ('StatusList2021'),
+                 "driverType"           varchar CHECK ( "driverType" IN ('agent_typeorm', 'agent_kv_store', 'github',
+                                                                         'agent_filesystem') )                       NOT NULL DEFAULT ('agent_typeorm'),
+                 "credentialIdMode"     varchar CHECK ( "credentialIdMode" IN ('ISSUANCE', 'PERSISTENCE', 'NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
+                 "proofFormat"          varchar CHECK ( "proofFormat" IN ('lds', 'jwt') )                            NOT NULL DEFAULT ('lds'),
+                 "indexingDirection"    varchar CHECK ( "indexingDirection" IN ('rightToLeft') )                     NOT NULL DEFAULT ('rightToLeft'),
+                 "statusPurpose"        varchar                                                                      NOT NULL DEFAULT ('revocation'),
+                 "statusListCredential" text,
+                 CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
+             )`,
     )
     await queryRunner.query(
-      `CREATE TABLE "temporary_StatusListEntry" ("statusListId" varchar NOT NULL, "statusListIndex" integer NOT NULL, "credentialId" varchar, "credentialHash" varchar(128), "correlationId" varchar(255), "value" varchar(50), CONSTRAINT "FK_statusListEntry_statusListId" FOREIGN KEY ("statusListId") REFERENCES "StatusList" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION, PRIMARY KEY ("statusListId", "statusListIndex"))`,
+      `CREATE TABLE "temporary_StatusListEntry"
+             (
+                 "statusListId"    varchar NOT NULL,
+                 "statusListIndex" integer NOT NULL,
+                 "credentialId"    varchar,
+                 "credentialHash"  varchar(128),
+                 "correlationId"   varchar(255),
+                 "value"           varchar(50),
+                 CONSTRAINT "FK_statusListEntry_statusListId" FOREIGN KEY ("statusListId") REFERENCES "StatusList" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION,
+                 PRIMARY KEY ("statusListId", "statusListIndex")
+             )`,
     )
     await queryRunner.query(
-      `INSERT INTO "temporary_StatusListEntry"("statusListId", "statusListIndex", "credentialId", "credentialHash", "correlationId", "value") SELECT "statusListId", "statusListIndex", "credentialId", "credentialHash", "correlationId", "value" FROM "StatusListEntry"`,
+      `INSERT INTO "temporary_StatusListEntry"("statusListId", "statusListIndex", "credentialId",
+                                                     "credentialHash", "correlationId", "value")
+             SELECT "statusListId", "statusListIndex", "credentialId", "credentialHash", "correlationId", "value"
+             FROM "StatusListEntry"`,
     )
     await queryRunner.query(`DROP TABLE "StatusListEntry"`)
     await queryRunner.query(`ALTER TABLE "temporary_StatusListEntry" RENAME TO "StatusListEntry"`)
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE "StatusListEntry"`)
+    await queryRunner.query(`DROP TABLE "StatusList"`)
+  }
 }

package/src/migrations/sqlite/1716475165344-CreatePresentationDefinitions.ts

@@ -13,6 +13,7 @@ export class CreatePresentationDefinitions1716475165344 implements MigrationInte
     "version" varchar NOT NULL,
     "purpose" varchar,
     "definition_payload" varchar NOT NULL,
+    "dcql_payload" varchar,
     "created_at" datetime NOT NULL DEFAULT (datetime('now')),
     "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`,
     )

package/src/migrations/sqlite/1737110469000-UpdateStatusList.ts

@@ -0,0 +1,94 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class UpdateStatusList1737110469000 implements MigrationInterface {
+  name = 'UpdateStatusList1737110469000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Create temporary table with new schema
+    await queryRunner.query(
+      `CREATE TABLE "temporary_StatusList" (
+                "id" varchar PRIMARY KEY NOT NULL,
+                "correlationId" varchar NOT NULL,
+                "length" integer NOT NULL,
+                "issuer" text NOT NULL,
+                "type" varchar CHECK( "type" IN ('StatusList2021', 'OAuthStatusList') ) NOT NULL DEFAULT ('StatusList2021'),
+                "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'),
+                "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
+                "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt') ) NOT NULL DEFAULT ('lds'),
+                "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ),
+                "statusPurpose" varchar,
+                "statusListCredential" text,
+                "bitsPerStatus" integer,
+                "expiresAt" datetime,
+                CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
+            )`,
+    )
+
+    // Copy data from old table to temporary table
+    await queryRunner.query(
+      `INSERT INTO "temporary_StatusList"(
+                "id", "correlationId", "length", "issuer", "type", "driverType",
+                "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
+                "statusListCredential"
+            )
+            SELECT 
+                "id", "correlationId", "length", "issuer", "type", "driverType",
+                "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
+                "statusListCredential"
+            FROM "StatusList"`,
+    )
+
+    // Drop old table and rename temporary table
+    await queryRunner.query(`DROP TABLE "StatusList"`)
+    await queryRunner.query(`ALTER TABLE "temporary_StatusList" RENAME TO "StatusList"`)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+     ALTER TABLE "StatusListEntry"
+     RENAME COLUMN "entryCorrelationId" TO "correlationId"
+   `)
+
+    await queryRunner.query(`
+     ALTER TABLE "StatusListEntry"
+     DROP COLUMN "statusListCorrelationId"
+   `)
+
+    // Create temporary table with old schema
+    await queryRunner.query(
+      `CREATE TABLE "temporary_StatusList" (
+                "id" varchar PRIMARY KEY NOT NULL,
+                "correlationId" varchar NOT NULL,
+                "length" integer NOT NULL,
+                "issuer" text NOT NULL,
+                "type" varchar CHECK( "type" IN ('StatusList2021') ) NOT NULL DEFAULT ('StatusList2021'),
+                "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'),
+                "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
+                "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt') ) NOT NULL DEFAULT ('lds'),
+                "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ) NOT NULL DEFAULT ('rightToLeft'),
+                "statusPurpose" varchar NOT NULL DEFAULT ('revocation'),
+                "statusListCredential" text,
+                CONSTRAINT "UQ_correlationId" UNIQUE ("correlationId")
+            )`,
+    )
+
+    // Copy data back, excluding new columns
+    await queryRunner.query(
+      `INSERT INTO "temporary_StatusList"(
+                "id", "correlationId", "length", "issuer", "type", "driverType",
+                "credentialIdMode", "proofFormat", "indexingDirection", "statusPurpose",
+                "statusListCredential"
+            )
+            SELECT 
+                "id", "correlationId", "length", "issuer", 
+                CASE WHEN "type" = 'OAuthStatusList' THEN 'StatusList2021' ELSE "type" END,
+                "driverType", "credentialIdMode", "proofFormat", "indexingDirection",
+                COALESCE("statusPurpose", 'revocation'), "statusListCredential"
+            FROM "StatusList"`,
+    )
+
+    // Drop new table and rename temporary table back
+    await queryRunner.query(`DROP TABLE "StatusList"`)
+    await queryRunner.query(`ALTER TABLE "temporary_StatusList" RENAME TO "StatusList"`)
+  }
+}

package/src/migrations/sqlite/1741895822987-FixCredentialClaimsReferencesUuid.ts

@@ -0,0 +1,73 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class FixCredentialClaimsReferencesUuidSqlite1741895822987 implements MigrationInterface {
+  name = 'FixCredentialClaimsReferencesUuid1741895822987'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Create a new table with the updated column type (uuid)
+    await queryRunner.query(`
+            CREATE TABLE "CredentialClaims_new"
+            (
+                "id"                         uuid                   NOT NULL DEFAULT (lower(hex(randomblob(16)))),
+                "key"                        character varying(255) NOT NULL,
+                "name"                       character varying(255) NOT NULL,
+                "credentialLocaleBrandingId" uuid,
+                CONSTRAINT "PK_CredentialClaims_id" PRIMARY KEY ("id")
+            )
+        `)
+
+    // Copy data from the old table
+    await queryRunner.query(`
+            INSERT INTO "CredentialClaims_new" ("id", "key", "name", "credentialLocaleBrandingId")
+            SELECT "id", "key", "name", "credentialLocaleBrandingId"
+            FROM "CredentialClaims"
+        `)
+
+    // Drop the old table
+    await queryRunner.query(`DROP TABLE "CredentialClaims"`)
+
+    // Rename the new table to the original name
+    await queryRunner.query(`ALTER TABLE "CredentialClaims_new" RENAME TO "CredentialClaims"`)
+
+    // Recreate the unique index
+    await queryRunner.query(`
+            CREATE UNIQUE INDEX "IDX_CredentialClaimsEntity_credentialLocaleBranding_locale"
+                ON "CredentialClaims" ("credentialLocaleBrandingId", "key")
+        `)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Migrate uuid back to varchar
+
+    // Create a new table reverting the column back to character varying
+    await queryRunner.query(`
+            CREATE TABLE "CredentialClaims_old"
+            (
+                "id"                         uuid                   NOT NULL DEFAULT (lower(hex(randomblob(16)))),
+                "key"                        character varying(255) NOT NULL,
+                "name"                       character varying(255) NOT NULL,
+                "credentialLocaleBrandingId" character varying,
+                CONSTRAINT "PK_CredentialClaims_id" PRIMARY KEY ("id")
+            )
+        `)
+
+    // Copy data from the current table
+    await queryRunner.query(`
+            INSERT INTO "CredentialClaims_old" ("id", "key", "name", "credentialLocaleBrandingId")
+            SELECT "id", "key", "name", "credentialLocaleBrandingId"
+            FROM "CredentialClaims"
+        `)
+
+    // Drop the current table
+    await queryRunner.query(`DROP TABLE "CredentialClaims"`)
+
+    // Rename the new table back to the original name
+    await queryRunner.query(`ALTER TABLE "CredentialClaims_old" RENAME TO "CredentialClaims"`)
+
+    // Recreate the unique index
+    await queryRunner.query(`
+            CREATE UNIQUE INDEX "IDX_CredentialClaimsEntity_credentialLocaleBranding_locale"
+                ON "CredentialClaims" ("credentialLocaleBrandingId", "key")
+        `)
+  }
+}

package/src/statusList/IStatusListStore.ts

@@ -1,4 +1,4 @@
-import { StatusListEntryEntity } from '../entities/statusList2021/StatusList2021EntryEntity'
+import { StatusListEntryEntity } from '../entities/statusList/StatusList2021EntryEntity'
 import {
   IAddStatusListArgs,
   IAddStatusListEntryArgs,
@@ -18,7 +18,7 @@ export interface IStatusListStore {
 
   getStatusLists(args: IGetStatusListsArgs): Promise<Array<IStatusListEntity>>
 
-  removeStatusList(args: IRemoveStatusListArgs): Promise<void>
+  removeStatusList(args: IRemoveStatusListArgs): Promise<boolean>
 
   addStatusList(args: IAddStatusListArgs): Promise<IStatusListEntity>
 

package/src/statusList/StatusListStore.ts

@@ -1,8 +1,8 @@
-import { OrPromise } from '@sphereon/ssi-types'
+import { OrPromise, StatusListType } from '@sphereon/ssi-types'
 import Debug from 'debug'
 import { DataSource, In, Repository } from 'typeorm'
-import { StatusListEntity } from '../entities/statusList2021/StatusList2021Entity'
-import { StatusListEntryEntity } from '../entities/statusList2021/StatusList2021EntryEntity'
+import { OAuthStatusListEntity, StatusList2021Entity, StatusListEntity } from '../entities/statusList/StatusListEntities'
+import { StatusListEntryEntity } from '../entities/statusList/StatusList2021EntryEntity'
 import {
   IAddStatusListArgs,
   IAddStatusListEntryArgs,
@@ -12,12 +12,13 @@ import {
   IGetStatusListEntryByIndexArgs,
   IGetStatusListsArgs,
   IRemoveStatusListArgs,
-  IStatusListEntryAvailableArgs,
-  IUpdateStatusListIndexArgs,
   IStatusListEntity,
+  IStatusListEntryAvailableArgs,
   IStatusListEntryEntity,
+  IUpdateStatusListIndexArgs,
 } from '../types'
 import { IStatusListStore } from './IStatusListStore'
+import { statusListEntityFrom, statusListFrom } from '../utils/statusList/MappingUtils'
 
 const debug = Debug('sphereon:ssi-sdk:data-store:status-list')
 
@@ -57,7 +58,7 @@ export class StatusListStore implements IStatusListStore {
   }
 
   async updateStatusListEntry(args: IAddStatusListEntryArgs): Promise<IStatusListEntryEntity> {
-    const statusListId = typeof args.statusList === 'string' ? args.statusList : args.statusList.id
+    const statusListId = args.statusListId ?? args.statusList?.id
     const result = await this.getStatusListEntryByIndex({ ...args, statusListId, errorOnNotFound: false })
     const updatedEntry: Partial<IStatusListEntryEntity> = {
       value: args.value,
@@ -66,56 +67,55 @@ export class StatusListStore implements IStatusListStore {
       credentialId: args.credentialId,
     }
 
+    const updStatusListId = result?.statusListId ?? statusListId
     const updateResult = await (
       await this.getStatusListEntryRepo()
     ).upsert(
-      { ...(result ?? { statusList: args.statusList, statusListIndex: args.statusListIndex }), ...updatedEntry },
+      { ...(result ?? { statusListId: updStatusListId, statusListIndex: args.statusListIndex }), ...updatedEntry },
       { conflictPaths: ['statusList', 'statusListIndex'] },
     )
     console.log(updateResult)
-    return (await this.getStatusListEntryByIndex({ ...args, statusListId, errorOnNotFound: true })) as IStatusListEntryEntity
+    return (await this.getStatusListEntryByIndex({
+      ...args,
+      statusListId: updStatusListId,
+      errorOnNotFound: true,
+    })) as IStatusListEntryEntity
   }
 
-  async getStatusListEntryByIndex(args: IGetStatusListEntryByIndexArgs): Promise<StatusListEntryEntity | undefined> {
-    if (!args.statusListId && !args.correlationId) {
-      throw Error(`Cannot get statusList entry if not either a statusList id or correlationId is provided`)
+  async getStatusListEntryByIndex({
+    statusListId,
+    statusListCorrelationId,
+    statusListIndex,
+    entryCorrelationId,
+    errorOnNotFound,
+  }: IGetStatusListEntryByIndexArgs): Promise<StatusListEntryEntity | undefined> {
+    if (!statusListId && !statusListCorrelationId) {
+      throw Error(`Cannot get statusList entry without either a statusList id or statusListCorrelationId`)
     }
+
+    if (!statusListIndex && !entryCorrelationId) {
+      throw Error(`Cannot get statusList entry without either a statusListIndex or entryCorrelationId`)
+    }
+
     const result = await (
       await this.getStatusListEntryRepo()
     ).findOne({
       where: {
-        ...(args.statusListId && { statusList: args.statusListId }),
-        ...(args.correlationId && { correlationId: args.correlationId }),
-        statusListIndex: args.statusListIndex,
+        ...(statusListId && { statusListId }),
+        ...(!statusListId && statusListCorrelationId && { statusList: { correlationId: statusListCorrelationId } }),
+        ...(statusListIndex && { statusListIndex }),
+        ...(entryCorrelationId && { entryCorrelationId }),
+      },
+      relations: {
+        statusList: true,
       },
     })
 
-    if (!result && args.errorOnNotFound) {
-      throw Error(`Could not find status list index ${args.statusListIndex} for status list id ${args.statusListId}`)
+    if (!result && errorOnNotFound) {
+      throw Error(`Could not find status list entry with provided filters`)
     }
-    return result ?? undefined
-  }
 
-  async removeStatusListEntryByIndex(args: IGetStatusListEntryByIndexArgs): Promise<boolean> {
-    let error = false
-    try {
-      await this.getStatusListEntryByIndex(args) // only used to check it exists
-    } catch (error) {
-      error = true
-    }
-    if (error) {
-      console.log(`Could not delete statusList ${args.statusListId} entry by index ${args.statusListIndex}`)
-    } else {
-      const result = await (
-        await this.getStatusListEntryRepo()
-      ).delete({
-        ...(args.statusListId && { statusList: args.statusListId }),
-        ...(args.correlationId && { correlationId: args.correlationId }),
-        statusListIndex: args.statusListIndex,
-      })
-      error = !result.affected || result.affected !== 1
-    }
-    return !error
+    return result ?? undefined
   }
 
   async getStatusListEntryByCredentialId(args: IGetStatusListEntryByCredentialIdArgs): Promise<StatusListEntryEntity | undefined> {
@@ -123,9 +123,12 @@ export class StatusListStore implements IStatusListStore {
     if (!credentialId) {
       throw Error('Can only get a credential by credentialId when a credentialId is supplied')
     }
-    const statusList = await this.getStatusList({ id: args.statusListId, correlationId: args.statusListCorrelationId })
+    const statusList = await this.getStatusList({
+      id: args.statusListId,
+      correlationId: args.statusListCorrelationId,
+    })
     const where = {
-      statusList: statusList.id,
+      statusList: { id: statusList.id },
       ...(args.entryCorrelationId && { correlationId: args.entryCorrelationId }),
       credentialId,
     }
@@ -158,11 +161,37 @@ export class StatusListStore implements IStatusListStore {
     return !error
   }
 
+  async removeStatusListEntryByIndex(args: IGetStatusListEntryByIndexArgs): Promise<boolean> {
+    let error = false
+    try {
+      await this.getStatusListEntryByIndex(args)
+    } catch (error) {
+      error = true
+    }
+    if (error) {
+      console.log(`Could not delete statusList ${args.statusListId} entry by index ${args.statusListIndex}`)
+    } else {
+      const result = await (
+        await this.getStatusListEntryRepo()
+      ).delete({
+        ...(args.statusListId && { statusList: args.statusListId }),
+        ...(args.entryCorrelationId && { correlationId: args.entryCorrelationId }),
+        statusListIndex: args.statusListIndex,
+      })
+      error = !result.affected || result.affected !== 1
+    }
+    return !error
+  }
+
   async getStatusListEntries(args: IGetStatusListEntriesArgs): Promise<StatusListEntryEntity[]> {
     return (await this.getStatusListEntryRepo()).find({ where: { ...args?.filter, statusList: args.statusListId } })
   }
 
   async getStatusList(args: IGetStatusListArgs): Promise<IStatusListEntity> {
+    return statusListFrom(await this.getStatusListEntity(args))
+  }
+
+  private async getStatusListEntity(args: IGetStatusListArgs): Promise<StatusListEntity> {
     if (!args.id && !args.correlationId) {
       throw Error(`At least and 'id' or 'correlationId' needs to be provided to lookup a status list`)
     }
@@ -189,7 +218,8 @@ export class StatusListStore implements IStatusListStore {
     if (!result) {
       return []
     }
-    return result
+
+    return result.map((entity) => statusListFrom(entity))
   }
 
   async addStatusList(args: IAddStatusListArgs): Promise<IStatusListEntity> {
@@ -205,29 +235,42 @@ export class StatusListStore implements IStatusListStore {
     }
 
     debug('Adding status list ', id)
-    const createdResult = await (await this.getStatusListRepo()).save(args)
-
-    return createdResult
+    const entity = statusListEntityFrom(args)
+    const createdResult = await (await this.getStatusListRepo(args.type)).save(entity)
+    return statusListFrom(createdResult)
   }
 
   async updateStatusList(args: IUpdateStatusListIndexArgs): Promise<IStatusListEntity> {
     const result = await this.getStatusList(args)
     debug('Updating status list', result)
-    const updatedResult = await (await this.getStatusListRepo()).save(args, { transaction: true })
-    return updatedResult
+    const entity = statusListEntityFrom(args)
+    const updatedResult = await (await this.getStatusListRepo(args.type)).save(entity, { transaction: true })
+    return statusListFrom(updatedResult)
   }
 
-  async removeStatusList(args: IRemoveStatusListArgs): Promise<void> {
-    const result = await this.getStatusList(args)
-    await (await this.getStatusListRepo()).delete(result)
+  async removeStatusList(args: IRemoveStatusListArgs): Promise<boolean> {
+    const result = await this.getStatusListEntity(args)
+
+    await (await this.getStatusListEntryRepo()).delete({ statusListId: result.id })
+    const deletedEntity = await (await this.getStatusListRepo()).remove(result)
+
+    return Boolean(deletedEntity)
   }
 
   private async getDS(): Promise<DataSource> {
     return this._dbConnection
   }
 
-  async getStatusListRepo(): Promise<Repository<StatusListEntity>> {
-    return (await this.getDS()).getRepository(StatusListEntity)
+  async getStatusListRepo(type?: StatusListType): Promise<Repository<StatusListEntity>> {
+    const dataSource = await this.getDS()
+    switch (type) {
+      case StatusListType.StatusList2021:
+        return dataSource.getRepository(StatusList2021Entity)
+      case StatusListType.OAuthStatusList:
+        return dataSource.getRepository(OAuthStatusListEntity)
+      default:
+        return dataSource.getRepository(StatusListEntity)
+    }
   }
 
   async getStatusListEntryRepo(): Promise<Repository<StatusListEntryEntity>> {

package/src/types/digitalCredential/IAbstractDigitalCredentialStore.ts

@@ -1,5 +1,5 @@
 import { CredentialCorrelationType, CredentialRole, CredentialStateType, DigitalCredential, RegulationType } from './digitalCredential'
-import { Hasher } from '@sphereon/ssi-types'
+import { HasherSync } from '@sphereon/ssi-types'
 import { FindOptionsOrder } from 'typeorm'
 import { DigitalCredentialEntity } from '../../entities/digitalCredential/DigitalCredentialEntity'
 
@@ -34,7 +34,7 @@ export type AddCredentialArgs = {
   state?: CredentialStateType
   verifiedAt?: Date
   revokedAt?: Date
-  opts?: { maxTimeSkewInMS?: number; hasher?: Hasher }
+  opts?: { maxTimeSkewInMS?: number; hasher?: HasherSync }
 }
 
 export type UpdateCredentialStateArgs = GetCredentialArgs & { verifiedState: CredentialStateType; verifiedAt?: Date; revokedAt?: Date }