@sphereon/ssi-sdk.siopv2-oid4vp-rp-auth 0.34.1-feature.SSISDK.57.uni.client.206 → 0.34.1-feature.SSISDK.58.host.nonce.endpoint.194

package/src/agent/SIOPv2RP.ts

@@ -5,12 +5,10 @@ import {
   AuthorizationResponseStateStatus,
   AuthorizationResponseStateWithVerifiedData,
   decodeUriAsJson,
-  VerifiedAuthorizationResponse,
+  VerifiedAuthorizationResponse
 } from '@sphereon/did-auth-siop'
 import { getAgentResolver } from '@sphereon/ssi-sdk-ext.did-utils'
 import { shaHasher as defaultHasher } from '@sphereon/ssi-sdk.core'
-import { validate as isValidUUID } from 'uuid'
-
 import type { ImportDcqlQueryItem } from '@sphereon/ssi-sdk.pd-manager'
 import {
   AdditionalClaims,
@@ -88,11 +86,7 @@ export class SIOPv2RP implements IAgentPlugin {
 
   private async createAuthorizationRequestURI(createArgs: ICreateAuthRequestArgs, context: IRequiredContext): Promise<string> {
     return await this.getRPInstance(
-      {
-        createWhenNotPresent: true,
-        responseRedirectURI: createArgs.responseRedirectURI,
-        ...(createArgs.useQueryIdInstance === true && { queryId: createArgs.queryId }),
-      },
+      { responseRedirectURI: createArgs.responseRedirectURI, ...(createArgs.useQueryIdInstance === true && { queryId: createArgs.queryId } ) },
       context,
     )
       .then((rp) => rp.createAuthorizationRequestURI(createArgs, context))
@@ -103,7 +97,7 @@ export class SIOPv2RP implements IAgentPlugin {
     createArgs: ICreateAuthRequestArgs,
     context: IRequiredContext,
   ): Promise<IAuthorizationRequestPayloads> {
-    return await this.getRPInstance({ createWhenNotPresent: true, queryId: createArgs.queryId }, context)
+    return await this.getRPInstance({ queryId: createArgs.queryId }, context)
       .then((rp) => rp.createAuthorizationRequest(createArgs, context))
       .then(async (request) => {
         const authRequest: IAuthorizationRequestPayloads = {
@@ -116,8 +110,10 @@ export class SIOPv2RP implements IAgentPlugin {
   }
 
   private async siopGetRequestState(args: IGetAuthRequestStateArgs, context: IRequiredContext): Promise<AuthorizationRequestState | undefined> {
-    return await this.getRPInstance({ createWhenNotPresent: false, queryId: args.queryId }, context).then((rp) =>
-      rp.get(context).then((rp) => rp.sessionManager.getRequestStateByCorrelationId(args.correlationId, args.errorOnNotFound)),
+    return await this.getRPInstance({ queryId: args.queryId }, context).then((rp) =>
+      rp.get(context).then((rp) =>
+        rp.sessionManager.getRequestStateByCorrelationId(args.correlationId, args.errorOnNotFound)
+      ),
     )
   }
 
@@ -125,7 +121,7 @@ export class SIOPv2RP implements IAgentPlugin {
     args: IGetAuthResponseStateArgs,
     context: IRequiredContext,
   ): Promise<AuthorizationResponseStateWithVerifiedData | undefined> {
-    const rpInstance: RPInstance = await this.getRPInstance({ createWhenNotPresent: false, queryId: args.queryId }, context)
+    const rpInstance: RPInstance = await this.getRPInstance({ queryId: args.queryId }, context)
     const authorizationResponseState: AuthorizationResponseState | undefined = await rpInstance
       .get(context)
       .then((rp) => rp.sessionManager.getResponseStateByCorrelationId(args.correlationId, args.errorOnNotFound))
@@ -205,7 +201,7 @@ export class SIOPv2RP implements IAgentPlugin {
     if (args.state !== 'authorization_request_created') {
       throw Error(`Only 'authorization_request_created' status is supported for this method at this point`)
     }
-    return await this.getRPInstance({ createWhenNotPresent: false, queryId: args.queryId }, context)
+    return await this.getRPInstance({ queryId: args.queryId }, context)
       // todo: In the SIOP library we need to update the signal method to be more like this method
       .then((rp) =>
         rp.get(context).then(async (rp) => {
@@ -219,7 +215,7 @@ export class SIOPv2RP implements IAgentPlugin {
   }
 
   private async siopDeleteState(args: IGetAuthResponseStateArgs, context: IRequiredContext): Promise<boolean> {
-    return await this.getRPInstance({ createWhenNotPresent: false, queryId: args.queryId }, context)
+    return await this.getRPInstance({ queryId: args.queryId }, context)
       .then((rp) => rp.get(context).then((rp) => rp.sessionManager.deleteStateForCorrelationId(args.correlationId)))
       .then(() => true)
   }
@@ -232,12 +228,12 @@ export class SIOPv2RP implements IAgentPlugin {
       typeof args.authorizationResponse === 'string'
         ? (decodeUriAsJson(args.authorizationResponse) as AuthorizationResponsePayload)
         : args.authorizationResponse
-    return await this.getRPInstance({ createWhenNotPresent: false, queryId: args.queryId }, context).then((rp) =>
+    return await this.getRPInstance({ queryId: args.queryId }, context).then((rp) =>
       rp.get(context).then((rp) =>
         rp.verifyAuthorizationResponse(authResponse, {
           correlationId: args.correlationId,
-          ...(args.dcqlQuery ? { dcqlQuery: args.dcqlQuery } : {}),
-          audience: args.audience,
+            ...(args.dcqlQuery ? { dcqlQuery: args.dcqlQuery } : {}),
+            audience: args.audience,
         }),
       ),
     )
@@ -279,36 +275,9 @@ export class SIOPv2RP implements IAgentPlugin {
     return undefined
   }
 
-  async getRPInstance({ createWhenNotPresent, queryId, responseRedirectURI }: ISiopRPInstanceArgs, context: IRequiredContext): Promise<RPInstance> {
-    let rpInstanceId: string = SIOPv2RP._DEFAULT_OPTS_KEY
-    let rpInstance: RPInstance | undefined
-    if (queryId) {
-      if (this.instances.has(queryId)) {
-        rpInstanceId = queryId
-        rpInstance = this.instances.get(rpInstanceId)!
-      } else if (isValidUUID(queryId)) {
-        try {
-          // Check whether queryId is actually the PD item id
-          const pd = await context.agent.pdmGetDefinition({ itemId: queryId })
-          if (this.instances.has(pd.queryId)) {
-            rpInstanceId = pd.queryId
-            rpInstance = this.instances.get(rpInstanceId)!
-          }
-        } catch (ignore) {}
-      }
-      if (createWhenNotPresent) {
-        rpInstanceId = queryId
-      } else {
-        rpInstance = this.instances.get(rpInstanceId)
-      }
-    } else {
-      rpInstance = this.instances.get(rpInstanceId)
-    }
-
-    if (!rpInstance) {
-      if (!createWhenNotPresent) {
-        return Promise.reject(`No RP instance found for key ${rpInstanceId}`)
-      }
+  async getRPInstance({ queryId, responseRedirectURI }: ISiopRPInstanceArgs, context: IRequiredContext): Promise<RPInstance> {
+    const instanceId = queryId ?? SIOPv2RP._DEFAULT_OPTS_KEY
+    if (!this.instances.has(instanceId)) {
       const instanceOpts = this.getInstanceOpts(queryId)
       const rpOpts = await this.getRPOptions(context, { queryId, responseRedirectURI: responseRedirectURI })
       if (!rpOpts.identifierOpts.resolveOpts?.resolver || typeof rpOpts.identifierOpts.resolveOpts.resolver.resolve !== 'function') {
@@ -323,9 +292,9 @@ export class SIOPv2RP implements IAgentPlugin {
           resolverResolution: true,
         })
       }
-      rpInstance = new RPInstance({ rpOpts, pexOpts: instanceOpts })
-      this.instances.set(rpInstanceId, rpInstance)
+      this.instances.set(instanceId, new RPInstance({ rpOpts, pexOpts: instanceOpts }))
     }
+    const rpInstance = this.instances.get(instanceId)!
     if (responseRedirectURI) {
       rpInstance.rpOptions.responseRedirectUri = responseRedirectURI
     }
@@ -367,22 +336,22 @@ export class SIOPv2RP implements IAgentPlugin {
     return options
   }
 
-  getInstanceOpts(queryId?: string): IPEXInstanceOptions | undefined {
+  getInstanceOpts(definitionId?: string): IPEXInstanceOptions | undefined {
     if (!this.opts.instanceOpts) return undefined
 
-    const instanceOpt = queryId ? this.opts.instanceOpts.find((i) => i.queryId === queryId) : undefined
+    const instanceOpt = definitionId ? this.opts.instanceOpts.find((i) => i.queryId === definitionId) : undefined
 
-    return instanceOpt ?? this.getDefaultOptions(queryId)
+    return instanceOpt ?? this.getDefaultOptions(definitionId)
   }
 
-  private getDefaultOptions(queryId: string | undefined) {
+  private getDefaultOptions(definitionId: string | undefined) {
     if (!this.opts.instanceOpts) return undefined
 
     const defaultOptions = this.opts.instanceOpts.find((i) => i.queryId === 'default')
     if (defaultOptions) {
       const clonedOptions = { ...defaultOptions }
-      if (queryId !== undefined) {
-        clonedOptions.queryId = queryId
+      if (definitionId !== undefined) {
+        clonedOptions.queryId = definitionId
       }
       return clonedOptions
     }

package/src/functions.ts

@@ -1,7 +1,6 @@
 import {
   ClientIdentifierPrefix,
   ClientMetadataOpts,
-  DcqlQueryLookupCallback,
   InMemoryRPSessionManager,
   PassBy,
   PresentationVerificationCallback,
@@ -15,7 +14,7 @@ import {
   Scope,
   SubjectType,
   SupportedVersion,
-  VerifyJwtCallback,
+  VerifyJwtCallback
 } from '@sphereon/did-auth-siop'
 import { CreateJwtCallback, JwtHeader, JwtIssuer, JwtPayload, SigningAlgo } from '@sphereon/oid4vc-common'
 import { IPresentationDefinition } from '@sphereon/pex'
@@ -35,7 +34,7 @@ import { TKeyType } from '@veramo/core'
 import { JWTVerifyOptions } from 'did-jwt'
 import { Resolvable } from 'did-resolver'
 import { EventEmitter } from 'events'
-import { IRequiredContext, IRPOptions, ISIOPIdentifierOptions } from './types/ISIOPv2RP'
+import { IPEXOptions, IRequiredContext, IRPOptions, ISIOPIdentifierOptions } from './types/ISIOPv2RP'
 import { DcqlQuery } from 'dcql'
 import { defaultHasher } from '@sphereon/ssi-sdk.core'
 
@@ -43,7 +42,7 @@ export function getRequestVersion(rpOptions: IRPOptions): SupportedVersion {
   if (Array.isArray(rpOptions.supportedVersions) && rpOptions.supportedVersions.length > 0) {
     return rpOptions.supportedVersions[0]
   }
-  return SupportedVersion.OID4VP_v1
+  return SupportedVersion.JWT_VC_PRESENTATION_PROFILE_v1
 }
 
 function getWellKnownDIDVerifyCallback(siopIdentifierOpts: ISIOPIdentifierOptions, context: IRequiredContext) {
@@ -58,31 +57,6 @@ function getWellKnownDIDVerifyCallback(siopIdentifierOpts: ISIOPIdentifierOption
       }
 }
 
-export function getDcqlQueryLookupCallback(context: IRequiredContext): DcqlQueryLookupCallback {
-  async function dcqlQueryLookup(queryId: string, version?: string, tenantId?: string): Promise<DcqlQuery> {
-    // TODO Add caching?
-    const result = await context.agent.pdmGetDefinitions({
-      filter: [
-        {
-          queryId,
-          ...(tenantId && { tenantId }),
-          ...(version && { version }),
-        },
-        {
-          id: queryId,
-        },
-      ],
-    })
-    if (result && result.length > 0) {
-      return result[0].query
-    }
-
-    return Promise.reject(Error(`No dcql query found for queryId ${queryId}`))
-  }
-
-  return dcqlQueryLookup
-}
-
 export function getPresentationVerificationCallback(
   idOpts: ManagedIdentifierOptsOrResult,
   context: IRequiredContext,
@@ -127,11 +101,34 @@ export function getPresentationVerificationCallback(
 
 export async function createRPBuilder(args: {
   rpOpts: IRPOptions
+  pexOpts?: IPEXOptions | undefined
   definition?: IPresentationDefinition
+  dcql?: DcqlQuery
   context: IRequiredContext
 }): Promise<RPBuilder> {
-  const { rpOpts, context } = args
+  const { rpOpts, pexOpts, context } = args
   const { identifierOpts } = rpOpts
+  let definition: IPresentationDefinition | undefined = args.definition
+  let dcqlQuery: DcqlQuery | undefined = args.dcql
+
+  if (!definition && pexOpts && pexOpts.queryId) {
+    const presentationDefinitionItems = await context.agent.pdmGetDefinitions({
+      filter: [
+        {
+          queryId: pexOpts.queryId,
+          version: pexOpts.version,
+          tenantId: pexOpts.tenantId,
+        },
+      ],
+    })
+
+    if (presentationDefinitionItems.length > 0) {
+      const presentationDefinitionItem = presentationDefinitionItems[0]
+      if (!dcqlQuery && presentationDefinitionItem.dcqlPayload) {
+        dcqlQuery = presentationDefinitionItem.dcqlPayload.dcqlQuery as DcqlQuery // cast from DcqlQueryREST back to valibot DcqlQuery
+      }
+    }
+  }
 
   const didMethods = identifierOpts.supportedDIDMethods ?? (await getAgentDIDMethods(context))
   const eventEmitter = rpOpts.eventEmitter ?? new EventEmitter()
@@ -171,7 +168,9 @@ export async function createRPBuilder(args: {
     .withResponseMode(rpOpts.responseMode ?? ResponseMode.POST)
     .withResponseType(ResponseType.VP_TOKEN, PropertyTarget.REQUEST_OBJECT)
     // todo: move to options fill/correct method
-    .withSupportedVersions(rpOpts.supportedVersions ?? [SupportedVersion.OID4VP_v1, SupportedVersion.SIOPv2_OID4VP_D28])
+    .withSupportedVersions(
+      rpOpts.supportedVersions ?? [SupportedVersion.JWT_VC_PRESENTATION_PROFILE_v1, SupportedVersion.SIOPv2_ID1, SupportedVersion.SIOPv2_D11],
+    )
 
     .withEventEmitter(eventEmitter)
     .withSessionManager(rpOpts.sessionManager ?? new InMemoryRPSessionManager(eventEmitter))
@@ -190,7 +189,6 @@ export async function createRPBuilder(args: {
             context,
           ),
     )
-    .withDcqlQueryLookup(getDcqlQueryLookupCallback(context))
     .withRevocationVerification(RevocationVerification.NEVER)
     .withPresentationVerification(getPresentationVerificationCallback(identifierOpts.idOpts, context))
 
@@ -199,12 +197,11 @@ export async function createRPBuilder(args: {
     builder.withEntityId(oidfOpts.identifier, PropertyTarget.REQUEST_OBJECT)
   } else {
     const resolution = await context.agent.identifierManagedGet(identifierOpts.idOpts)
-    const clientId: string =
-      rpOpts.clientMetadataOpts?.client_id ??
-      resolution.issuer ??
-      (isManagedIdentifierDidResult(resolution) ? resolution.did : resolution.jwkThumbprint)
-    const clientIdPrefixed = prefixClientId(clientId)
-    builder.withClientId(clientIdPrefixed, PropertyTarget.REQUEST_OBJECT)
+    const clientId: string = rpOpts.clientMetadataOpts?.client_id ??
+      resolution.issuer ?? (isManagedIdentifierDidResult(resolution) ? resolution.did : resolution.jwkThumbprint)
+     const clientIdPrefixed = prefixClientId(clientId)
+    builder.withClientId(clientIdPrefixed, PropertyTarget.REQUEST_OBJECT
+    )
   }
 
   if (hasher) {
@@ -218,6 +215,10 @@ export async function createRPBuilder(args: {
   //fixme: this has been removed in the new version of did-auth-siop
   // builder.withWellknownDIDVerifyCallback(getWellKnownDIDVerifyCallback(didOpts, context))
 
+  if (dcqlQuery) {
+    builder.withDcqlQuery(dcqlQuery)
+  }
+
   if (rpOpts.responseRedirectUri) {
     builder.withResponseRedirectUri(rpOpts.responseRedirectUri)
   }
@@ -302,8 +303,8 @@ export function getSigningAlgo(type: TKeyType): SigningAlgo {
 export function prefixClientId(clientId: string): string {
   // FIXME SSISDK-60
   if (clientId.startsWith('did:')) {
-    return `${ClientIdentifierPrefix.DECENTRALIZED_IDENTIFIER}:${clientId}`
+    return `${ClientIdentifierPrefix.DECENTRALIZED_IDENTIFIER}:${clientId}`;
   }
 
-  return clientId
+  return clientId;
 }

package/src/types/ISIOPv2RP.ts

@@ -32,7 +32,6 @@ import { HasherSync } from '@sphereon/ssi-types'
 import { VerifyCallback } from '@sphereon/wellknown-dids-client'
 import { IAgentContext, ICredentialVerifier, IDIDManager, IKeyManager, IPluginMethodMap, IResolver } from '@veramo/core'
 import { DcqlQuery } from 'dcql'
-
 import { Resolvable } from 'did-resolver'
 import { EventEmitter } from 'events'
 
@@ -137,12 +136,11 @@ export interface IPEXDefinitionPersistArgs extends IPEXInstanceOptions {
 }
 
 export interface ISiopRPInstanceArgs {
-  createWhenNotPresent: boolean
   queryId?: string
   responseRedirectURI?: string
 }
 
-export interface IPEXInstanceOptions extends IPresentationOptions {
+export interface IPEXInstanceOptions extends IPEXOptions {
   rpOpts?: IRPOptions
 }
 
@@ -160,9 +158,12 @@ export interface IRPOptions {
   responseRedirectUri?: string
 }
 
-export interface IPresentationOptions {
-  queryId: string
+export interface IPEXOptions {
   presentationVerifyCallback?: PresentationVerificationCallback
+  // definition?: IPresentationDefinition
+  queryId: string
+  version?: string
+  tenantId?: string
 }
 
 export type VerificationPolicies = {