feature/VDX-341

packages/data-store/src/__tests__/pd-manager.entities.test.ts

@@ -24,6 +24,83 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
     await dbConnection.destroy()
   })
 
+  it('should create and retrieve PresentationDefinitionItemEntity with dcqlPayload', async (): Promise<void> => {
+    const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
+    const entity = new PresentationDefinitionItemEntity()
+    entity.definitionId = 'definition1'
+    entity.version = '1.0'
+    entity.definitionPayload = JSON.stringify({ id: 'definition1', input_descriptors: [] })
+    entity.dcqlPayload = JSON.stringify({
+      credentials: [
+        {
+          id: 'credential1',
+          format: 'jwt_vc',
+          claims: [
+            {
+              namespace: 'test',
+              claim_name: 'testClaim',
+            },
+          ],
+        },
+      ],
+    })
+
+    const savedEntity = await repository.save(entity)
+    expect(savedEntity).toBeDefined()
+    expect(savedEntity.id).toBeDefined()
+    expect(savedEntity.dcqlPayload).toBeDefined()
+
+    const retrievedEntity = await repository.findOneBy({ id: savedEntity.id })
+    expect(retrievedEntity).toBeDefined()
+    expect(retrievedEntity!.dcqlPayload).toBeDefined()
+    const parsedDcql = JSON.parse(retrievedEntity!.dcqlPayload)
+    expect(parsedDcql.credentials[0].id).toEqual('credential1')
+  })
+
+  it('should update PresentationDefinitionItemEntity dcqlPayload', async (): Promise<void> => {
+    const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
+    const entity = new PresentationDefinitionItemEntity()
+    entity.definitionId = 'definition1'
+    entity.version = '1.0'
+    entity.definitionPayload = JSON.stringify({ id: 'definition1', input_descriptors: [] })
+    entity.dcqlPayload = JSON.stringify({
+      credentials: [
+        {
+          id: 'credential1',
+          format: 'jwt_vc',
+          claims: [
+            {
+              namespace: 'test',
+              claim_name: 'testClaim',
+            },
+          ],
+        },
+      ],
+    })
+
+    const savedEntity = await repository.save(entity)
+    expect(savedEntity).toBeDefined()
+
+    const updatedDcql = {
+      credentials: [
+        {
+          id: 'credential2',
+          format: 'jwt_vc',
+          claims: [
+            {
+              namespace: 'test',
+              claim_name: 'updatedClaim',
+            },
+          ],
+        },
+      ],
+    }
+    savedEntity.dcqlPayload = JSON.stringify(updatedDcql)
+    const updatedEntity = await repository.save(savedEntity)
+    expect(updatedEntity).toBeDefined()
+    expect(JSON.parse(updatedEntity.dcqlPayload).credentials[0].id).toEqual('credential2')
+  })
+
   it('should create and retrieve PresentationDefinitionItemEntity', async (): Promise<void> => {
     const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
     const entity = new PresentationDefinitionItemEntity()

packages/data-store/src/entities/presentationDefinition/PresentationDefinitionItemEntity.ts

@@ -25,10 +25,14 @@ export class PresentationDefinitionItemEntity extends BaseEntity {
   @Column({ name: 'name', length: 255, type: 'varchar', nullable: true, unique: false })
   name?: string
 
-  @Column({ name: 'definition_payload', type: 'text', nullable: false, unique: false })
-  @IsNotEmpty({ message: 'A blank definition payload field is not allowed' })
+  @Column({ name: 'definition_payload', type: 'text', nullable: false, unique: false }) // TODO should this become nullable now we have dcqlPayload?
+  @IsNotEmpty({ message: 'A blank PD definition payload field is not allowed' })
   definitionPayload!: string
 
+  @Column({ name: 'dcql_payload', type: 'text', nullable: true, unique: false })
+  @IsNotEmpty({ message: 'A blank dcql definition payload field is not allowed' })
+  dcqlPayload!: string
+
   @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 

packages/data-store/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"))

packages/data-store/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')))`,
     )

packages/data-store/src/types/presentationDefinition/presentationDefinition.ts

@@ -1,4 +1,5 @@
 import { IPresentationDefinition } from '@sphereon/pex'
+import { DcqlQuery } from '@sphereon/ssi-types'
 
 export type PresentationDefinitionItem = {
   id: string
@@ -8,10 +9,11 @@ export type PresentationDefinitionItem = {
   name?: string
   purpose?: string
   definitionPayload: IPresentationDefinition
+  dcqlPayload?: DcqlQuery
   createdAt: Date
   lastUpdatedAt: Date
 }
 
 export type NonPersistedPresentationDefinitionItem = Omit<PresentationDefinitionItem, 'id' | 'createdAt' | 'lastUpdatedAt'>
 export type PartialPresentationDefinitionItem = Partial<PresentationDefinitionItem>
-export type PresentationDefinitionItemFilter = Partial<Omit<PresentationDefinitionItem, 'definitionPayload'>> // TODO add logic to linearize & hash definitionPayload into a separate column so we can filter on it?
+export type PresentationDefinitionItemFilter = Partial<Omit<PresentationDefinitionItem, 'definitionPayload' | 'dcqlPayload'>> // TODO add logic to linearize & hash definitionPayload into a separate column so we can filter on it?

packages/data-store/src/utils/presentationDefinition/MappingUtils.ts

@@ -3,6 +3,7 @@ import { IPresentationDefinition } from '@sphereon/pex'
 import { NonPersistedPresentationDefinitionItem, PartialPresentationDefinitionItem, PresentationDefinitionItem } from '../../types'
 import { blake2bHex } from 'blakejs'
 import { replaceNullWithUndefined } from '../FormattingUtils'
+import { DcqlQuery } from '@sphereon/ssi-types/dist/types/dcql'
 
 export const presentationDefinitionItemFrom = (entity: PresentationDefinitionItemEntity): PresentationDefinitionItem => {
   const result: PresentationDefinitionItem = {
@@ -13,6 +14,7 @@ export const presentationDefinitionItemFrom = (entity: PresentationDefinitionIte
     name: entity.name,
     purpose: entity.purpose,
     definitionPayload: JSON.parse(entity.definitionPayload) as IPresentationDefinition,
+    dcqlPayload: JSON.parse(entity.dcqlPayload) as DcqlQuery,
     createdAt: entity.createdAt,
     lastUpdatedAt: entity.lastUpdatedAt,
   }
@@ -29,6 +31,7 @@ export const presentationDefinitionEntityItemFrom = (item: NonPersistedPresentat
   entity.name = item.name
   entity.purpose = item.purpose
   entity.definitionPayload = JSON.stringify(item.definitionPayload!)
+  entity.dcqlPayload = JSON.stringify(item.dcqlPayload!)
   return entity
 }
 

packages/ebsi-support/package.json

@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@ethersproject/random": "^5.7.0",
-    "@sphereon/did-auth-siop": "0.16.1-feature.SPRIND.137.254+5674a27",
-    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.SPRIND.137.254+5674a27",
+    "@sphereon/did-auth-siop": "0.16.1-feature.SPRIND.137.254",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.SPRIND.137.254",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
     "@sphereon/ssi-sdk-ext.did-resolver-ebsi": "0.27.0",
@@ -44,8 +44,8 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vci-client": "0.16.1-feature.SPRIND.137.254+5674a27",
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254+5674a27",
+    "@sphereon/oid4vci-client": "0.16.1-feature.SPRIND.137.254",
+    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk-ext.key-manager": "0.27.0",
     "@sphereon/ssi-sdk-ext.kms-local": "0.27.0",

packages/mdl-mdoc/package.json

@@ -14,7 +14,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.SPRIND.137.254+5674a27",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.SPRIND.137.254",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
@@ -35,8 +35,8 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@sphereon/oid4vci-client": "0.16.1-feature.SPRIND.137.254+5674a27",
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254+5674a27",
+    "@sphereon/oid4vci-client": "0.16.1-feature.SPRIND.137.254",
+    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk-ext.key-manager": "0.27.0",
     "@sphereon/ssi-sdk-ext.kms-local": "0.27.0",

packages/oid4vci-holder/package.json

@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
-    "@sphereon/oid4vci-client": "0.16.1-feature.SPRIND.137.254+5674a27",
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254+5674a27",
+    "@sphereon/oid4vci-client": "0.16.1-feature.SPRIND.137.254",
+    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
     "@sphereon/ssi-sdk-ext.jwt-service": "0.27.0",
@@ -43,7 +43,7 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vc-common": "0.16.1-feature.SPRIND.137.254+5674a27",
+    "@sphereon/oid4vc-common": "0.16.1-feature.SPRIND.137.254",
     "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.27.0",
     "@types/i18n-js": "^3.8.9",
     "@types/lodash.memoize": "^4.1.9",

packages/oid4vci-holder/src/agent/OID4VCIHolder.ts

@@ -4,6 +4,8 @@ import {
   AuthorizationRequestOpts,
   AuthorizationServerClientOpts,
   AuthorizationServerOpts,
+  CredentialConfigurationSupportedJwtVcJsonLdAndLdpVcV1_0_13,
+  CredentialDefinitionJwtVcJsonLdAndLdpVcV1_0_13,
   CredentialOfferRequestWithBaseUrl,
   DefaultURISchemes,
   EndpointMetadataResult,
@@ -675,7 +677,10 @@ export class OID4VCIHolder implements IAgentPlugin {
       if (!credentialTypes || credentialTypes.length === 0) {
         return Promise.reject(Error('cannot determine credential id to request'))
       }
+
+      const credentialDefinition = this.getCredentialDefinition(issuanceOpt)
       const credentialResponse = await client.acquireCredentials({
+        ...(credentialDefinition && { context: credentialDefinition['@context'] }),
         credentialTypes,
         proofCallbacks: callbacks,
         format: issuanceOpt.format,
@@ -1127,4 +1132,11 @@ export class OID4VCIHolder implements IAgentPlugin {
     }
     return undefined
   }
+
+  private getCredentialDefinition(issuanceOpt: IssuanceOpts): CredentialDefinitionJwtVcJsonLdAndLdpVcV1_0_13 | undefined {
+    if (issuanceOpt.format == 'ldp_vc' || issuanceOpt.format == 'jwt_vc_json-ld') {
+      return (issuanceOpt as CredentialConfigurationSupportedJwtVcJsonLdAndLdpVcV1_0_13).credential_definition
+    }
+    return undefined
+  }
 }

packages/oid4vci-issuer-rest-api/package.json

@@ -11,9 +11,9 @@
     "start:dev": "ts-node __tests__/RestAPI.ts"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254+5674a27",
-    "@sphereon/oid4vci-issuer": "0.16.1-feature.SPRIND.137.254+5674a27",
-    "@sphereon/oid4vci-issuer-server": "0.16.1-feature.SPRIND.137.254+5674a27",
+    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254",
+    "@sphereon/oid4vci-issuer": "0.16.1-feature.SPRIND.137.254",
+    "@sphereon/oid4vci-issuer-server": "0.16.1-feature.SPRIND.137.254",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
     "@sphereon/ssi-sdk.kv-store-temp": "workspace:*",

packages/oid4vci-issuer-rest-client/package.json

@@ -16,7 +16,7 @@
     "generate-plugin-schema": "ts-node ../../packages/dev/bin/sphereon.js dev generate-plugin-schema"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254+5674a27",
+    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254",
     "@sphereon/ssi-types": "workspace:*",
     "@veramo/core": "4.2.0",
     "cross-fetch": "^3.1.8"

packages/oid4vci-issuer-store/package.json

@@ -14,7 +14,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254+5674a27",
+    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
     "@sphereon/ssi-sdk.kv-store-temp": "workspace:*",

packages/oid4vci-issuer/package.json

@@ -14,8 +14,8 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254+5674a27",
-    "@sphereon/oid4vci-issuer": "0.16.1-feature.SPRIND.137.254+5674a27",
+    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.137.254",
+    "@sphereon/oid4vci-issuer": "0.16.1-feature.SPRIND.137.254",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
     "@sphereon/ssi-sdk.agent-config": "workspace:*",