@sphereon/ssi-sdk.data-store 0.34.1-fix.114 → 0.34.1-fix.141

package/src/migrations/sqlite/1756975340000-UpdatePresentationDefinitionItemNullable.ts

@@ -0,0 +1,77 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class UpdatePresentationDefinitionItemNullableSqlite1756975340000 implements MigrationInterface {
+  name = 'UpdatePresentationDefinitionItemNullable1756975340000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Create temporary table with updated schema (definition_payload nullable)
+    await queryRunner.query(`
+      CREATE TABLE "temporary_PresentationDefinitionItem" (
+                                                            "id" varchar PRIMARY KEY NOT NULL,
+                                                            "definition_id" varchar(255) NOT NULL,
+                                                            "version" varchar(255) NOT NULL,
+                                                            "tenant_id" varchar(255),
+                                                            "purpose" varchar(255),
+                                                            "name" varchar(255),
+                                                            "definition_payload" text,
+                                                            "dcql_payload" text,
+                                                            "created_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                                            "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                                            CONSTRAINT "UQ_PresentationDefinitionItem_definition_id_version" UNIQUE ("definition_id", "version")
+      )
+    `)
+
+    // Copy data from old table
+    await queryRunner.query(`
+      INSERT INTO "temporary_PresentationDefinitionItem"(
+        "id", "definition_id", "version", "tenant_id", "purpose", "name",
+        "definition_payload", "dcql_payload", "created_at", "last_updated_at"
+      )
+      SELECT
+        "id", "definition_id", "version", "tenant_id", "purpose", "name",
+        "definition_payload", "dcql_payload", "created_at", "last_updated_at"
+      FROM "PresentationDefinitionItem"
+    `)
+
+    // Drop old table and rename
+    await queryRunner.query(`DROP TABLE "PresentationDefinitionItem"`)
+    await queryRunner.query(`ALTER TABLE "temporary_PresentationDefinitionItem" RENAME TO "PresentationDefinitionItem"`)
+
+    // Recreate index
+    await queryRunner.query(`CREATE INDEX "IDX_PresentationDefinitionItem_version" ON "PresentationDefinitionItem" ("version")`)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Revert to original schema (definition_payload NOT NULL, dcql_payload nullable)
+    await queryRunner.query(`
+      CREATE TABLE "temporary_PresentationDefinitionItem" (
+                                                            "id" varchar PRIMARY KEY NOT NULL,
+                                                            "definition_id" varchar(255) NOT NULL,
+                                                            "version" varchar(255) NOT NULL,
+                                                            "tenant_id" varchar(255),
+                                                            "purpose" varchar(255),
+                                                            "name" varchar(255),
+                                                            "definition_payload" text NOT NULL,
+                                                            "dcql_payload" text,
+                                                            "created_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                                            "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                                            CONSTRAINT "UQ_PresentationDefinitionItem_definition_id_version" UNIQUE ("definition_id", "version")
+      )
+    `)
+
+    await queryRunner.query(`
+      INSERT INTO "temporary_PresentationDefinitionItem"(
+        "id", "definition_id", "version", "tenant_id", "purpose", "name",
+        "definition_payload", "dcql_payload", "created_at", "last_updated_at"
+      )
+      SELECT
+        "id", "definition_id", "version", "tenant_id", "purpose", "name",
+        "definition_payload", "dcql_payload", "created_at", "last_updated_at"
+      FROM "PresentationDefinitionItem"
+    `)
+
+    await queryRunner.query(`DROP TABLE "PresentationDefinitionItem"`)
+    await queryRunner.query(`ALTER TABLE "temporary_PresentationDefinitionItem" RENAME TO "PresentationDefinitionItem"`)
+    await queryRunner.query(`CREATE INDEX "IDX_PresentationDefinitionItem_version" ON "PresentationDefinitionItem" ("version")`)
+  }
+}

package/src/presentationDefinition/PDStore.ts

@@ -106,7 +106,12 @@ export class PDStore extends AbstractPDStore {
     updatedEntity.version = item.version
     updatedEntity.name = item.name
     updatedEntity.purpose = item.purpose
-    updatedEntity.definitionPayload = JSON.stringify(item.definitionPayload!)
+    if (item.definitionPayload) {
+      updatedEntity.definitionPayload = JSON.stringify(item.definitionPayload!)
+    }
+    if (item.dcqlPayload) {
+      updatedEntity.dcqlPayload = JSON.stringify(item.dcqlPayload!.dcqlQuery)
+    }
 
     debug('Updating presentation definition entity', updatedEntity)
     const updateResult: PresentationDefinitionItemEntity = await pdRepository.save(updatedEntity, {

package/src/types/contact/contact.ts

@@ -1,7 +1,7 @@
 import { ManagedIdentifierOptsOrResult } from '@sphereon/ssi-sdk-ext.identifier-resolution'
 import { IIdentifier } from '@veramo/core'
 import { IIssuerLocaleBranding } from '../issuanceBranding/issuanceBranding'
-import { CredentialRole } from '../digitalCredential'
+import { CredentialRole } from '@sphereon/ssi-types'
 
 export type MetadataTypes = string | number | Date | boolean | undefined
 

package/src/types/digitalCredential/IAbstractDigitalCredentialStore.ts

@@ -2,7 +2,8 @@ import { HasherSync } from '@sphereon/ssi-types'
 import { FindOptionsOrder } from 'typeorm'
 import { DigitalCredentialEntity } from '../../entities/digitalCredential/DigitalCredentialEntity'
 import { DigitalCredential } from './types'
-import { CredentialCorrelationType, CredentialRole, CredentialStateType, RegulationType } from './enums'
+import { CredentialCorrelationType, CredentialStateType, RegulationType } from './enums'
+import { CredentialRole } from '@sphereon/ssi-types'
 
 export type GetCredentialArgs = { id: string } | { hash: string }
 

package/src/types/digitalCredential/enums.ts

@@ -56,13 +56,6 @@ export enum CredentialCorrelationType {
   URL = 'URL',
 }
 
-export enum CredentialRole {
-  ISSUER = 'ISSUER',
-  VERIFIER = 'VERIFIER',
-  HOLDER = 'HOLDER',
-  FEDERATION_TRUST_ANCHOR = 'FEDERATION_TRUST_ANCHOR',
-}
-
 export enum CredentialStateType {
   REVOKED = 'REVOKED',
   VERIFIED = 'VERIFIED',

package/src/types/digitalCredential/types.ts

@@ -1,4 +1,5 @@
-import { CredentialCorrelationType, CredentialDocumentFormat, CredentialRole, CredentialStateType, DocumentType, RegulationType } from './enums'
+import { CredentialCorrelationType, CredentialDocumentFormat, CredentialStateType, DocumentType, RegulationType } from './enums'
+import { CredentialRole } from '@sphereon/ssi-types'
 
 /**
  * DigitalCredential

package/src/types/presentationDefinition/presentationDefinition.ts

@@ -1,5 +1,5 @@
 import { IPresentationDefinition } from '@sphereon/pex'
-import { DcqlQueryREST } from '@sphereon/ssi-types'
+import { DcqlQueryPayload } from '@sphereon/ssi-types'
 
 export type PresentationDefinitionItem = {
   id: string
@@ -8,8 +8,8 @@ export type PresentationDefinitionItem = {
   version: string
   name?: string
   purpose?: string
-  definitionPayload: IPresentationDefinition
-  dcqlPayload?: DcqlQueryREST
+  definitionPayload?: IPresentationDefinition
+  dcqlPayload?: DcqlQueryPayload
   createdAt: Date
   lastUpdatedAt: Date
 }

package/src/utils/presentationDefinition/MappingUtils.ts

@@ -1,9 +1,10 @@
+import { DcqlQueryPayload } from '@sphereon/ssi-types'
+import { DcqlQuery } from 'dcql'
 import { PresentationDefinitionItemEntity } from '../../entities/presentationDefinition/PresentationDefinitionItemEntity'
 import type { IPresentationDefinition } from '@sphereon/pex'
 import type { NonPersistedPresentationDefinitionItem, PartialPresentationDefinitionItem, PresentationDefinitionItem } from '../../types'
 import * as blakepkg from 'blakejs'
 import { replaceNullWithUndefined } from '../FormattingUtils'
-import type { DcqlQueryREST } from '@sphereon/ssi-types'
 
 export const presentationDefinitionItemFrom = (entity: PresentationDefinitionItemEntity): PresentationDefinitionItem => {
   const result: PresentationDefinitionItem = {
@@ -14,11 +15,21 @@ export const presentationDefinitionItemFrom = (entity: PresentationDefinitionIte
     name: entity.name,
     purpose: entity.purpose,
     definitionPayload: JSON.parse(entity.definitionPayload) as IPresentationDefinition,
-    dcqlPayload: JSON.parse(entity.dcqlPayload) as DcqlQueryREST,
+    ...(entity.dcqlPayload && {
+      dcqlPayload: {
+        queryId: entity.definitionId,
+        name: entity.name,
+        defaultPurpose: entity.purpose,
+        dcqlQuery: DcqlQuery.parse(JSON.parse(entity.dcqlPayload)),
+      },
+    }),
     createdAt: entity.createdAt,
     lastUpdatedAt: entity.lastUpdatedAt,
   }
 
+  if (result.dcqlPayload?.dcqlQuery) {
+    DcqlQuery.validate(result.dcqlPayload?.dcqlQuery)
+  }
   return replaceNullWithUndefined(result)
 }
 
@@ -30,29 +41,47 @@ export const presentationDefinitionEntityItemFrom = (item: NonPersistedPresentat
   entity.version = item.version
   entity.name = item.name
   entity.purpose = item.purpose
-  entity.definitionPayload = JSON.stringify(item.definitionPayload!)
-  entity.dcqlPayload = JSON.stringify(item.dcqlPayload!)
+  if (item.definitionPayload) {
+    entity.definitionPayload = JSON.stringify(item.definitionPayload)
+  }
+  if (item.dcqlPayload) {
+    const dcqlQuery = DcqlQuery.parse(item.dcqlPayload.dcqlQuery)
+    DcqlQuery.validate(dcqlQuery)
+    entity.dcqlPayload = JSON.stringify(item.dcqlPayload.dcqlQuery)
+  }
   return entity
 }
 
-function hashPayload(payload: IPresentationDefinition): string {
+function hashPayload(payload: IPresentationDefinition | DcqlQueryPayload): string {
   return blakepkg.blake2bHex(JSON.stringify(payload))
 }
 
 export function isPresentationDefinitionEqual(base: PartialPresentationDefinitionItem, compare: PartialPresentationDefinitionItem): boolean {
   if (
     base.definitionId !== compare.definitionId ||
-    base.tenantId != compare.tenantId ||
+    base.tenantId !== compare.tenantId ||
     base.version !== compare.version ||
-    base.name != compare.name ||
-    base.purpose != compare.purpose
+    base.name !== compare.name ||
+    base.purpose !== compare.purpose
   ) {
     return false
   }
 
+  if (base.dcqlPayload && compare.dcqlPayload) {
+    if (hashPayload(base.dcqlPayload) !== hashPayload(compare.dcqlPayload)) {
+      return false
+    }
+  } else if (base.dcqlPayload || compare.dcqlPayload) {
+    return false
+  }
+
   if (base.definitionPayload && compare.definitionPayload) {
-    return hashPayload(base.definitionPayload) === hashPayload(compare.definitionPayload)
+    if (hashPayload(base.definitionPayload) !== hashPayload(compare.definitionPayload)) {
+      return false
+    }
+  } else if (base.definitionPayload || compare.definitionPayload) {
+    return false
   }
 
-  return false
+  return true
 }