@sphereon/ssi-sdk.siopv2-oid4vp-rp-rest-api 0.34.1-feature.SSISDK.57.uni.client.205 → 0.34.1-feature.SSISDK.58.host.nonce.endpoint.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.siopv2-oid4vp-rp-rest-api",
-  "version": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
+  "version": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -23,16 +23,16 @@
     "start:dev": "ts-node __tests__/RestAPI.ts"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.19.1-feature.DIIPv4.161",
-    "@sphereon/ssi-express-support": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-sdk.kv-store-temp": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-sdk.pd-manager": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-sdk.presentation-exchange": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-rp-auth": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
+    "@sphereon/did-auth-siop": "0.19.1-feature.SSISDK.58.host.nonce.endpoint.107",
+    "@sphereon/ssi-express-support": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
+    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
+    "@sphereon/ssi-sdk.kv-store-temp": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
+    "@sphereon/ssi-sdk.pd-manager": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
+    "@sphereon/ssi-sdk.presentation-exchange": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-rp-auth": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
     "@veramo/core": "4.2.0",
     "@veramo/credential-w3c": "4.2.0",
     "awesome-qr": "^2.1.5-rc.0",
@@ -44,21 +44,18 @@
     "express": "^4.19.2",
     "short-uuid": "^4.2.2",
     "swagger-ui-express": "^5.0.1",
-    "uuid": "^9.0.1",
-    "zod": "^4.1.5"
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@decentralized-identity/ion-sdk": "^0.6.0",
-    "@sphereon/did-auth-siop-adapter": "0.19.1-feature.DIIPv4.161",
+    "@sphereon/did-auth-siop-adapter": "0.19.1-feature.SSISDK.58.host.nonce.endpoint.107",
     "@sphereon/did-uni-client": "^0.6.3",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
-    "@sphereon/ssi-sdk-ext.did-provider-jwk": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-sdk.credential-vcdm": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-sdk.credential-vcdm-jsonld-provider": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
-    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.57.uni.client.205+f1b902e3",
+    "@sphereon/ssi-sdk-ext.did-provider-jwk": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
+    "@sphereon/ssi-sdk.credential-vcdm": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
+    "@sphereon/ssi-sdk.credential-vcdm-jsonld-provider": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
+    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.145+5bfc0b12",
     "@types/body-parser": "^1.19.5",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
@@ -117,5 +114,5 @@
     "OpenID Connect",
     "Authenticator"
   ],
-  "gitHead": "f1b902e3fec25a9541783646315a23c0999b32e9"
+  "gitHead": "5bfc0b1229134b5d80279a3baf1fc64c9c6e755e"
 }

package/src/index.ts

@@ -2,6 +2,6 @@
  * @public
  */
 export * from './siop-api-functions'
-export * from './universal-oid4vp-api-functions'
+export * from './webapp-api-functions'
 export * from './types'
 export * from './siopv2-rp-api-server'

package/src/siop-api-functions.ts

@@ -46,32 +46,21 @@ export function verifyAuthResponseSIOPv2Endpoint(router: Router, context: IRequi
     console.log(`verifyAuthResponse SIOP endpoint is disabled`)
     return
   }
-  const path = opts?.path ?? '/siop/queries/:queryId/auth-responses/:correlationId'
+  const path = opts?.path ?? '/siop/definitions/:definitionId/auth-responses/:correlationId'
   router.post(path, checkAuth(opts?.endpoint), async (request: Request, response: Response) => {
     try {
-      const { correlationId, queryId, tenantId, version } = request.params
-      if (!correlationId) {
-        console.log(`No authorization request could be found for the given url. correlationId: ${correlationId}`)
+      const { correlationId, definitionId, tenantId, version } = request.params
+      if (!correlationId || !definitionId) {
+        console.log(`No authorization request could be found for the given url. correlationId: ${correlationId}, definitionId: ${definitionId}`)
         return sendErrorResponse(response, 404, 'No authorization request could be found')
       }
-      console.debug('Authorization Response (siop-sessions') // TODO use logger
-      console.debug(JSON.stringify(request.body, null, 2))
-      const definitionItems = await context.agent.pdmGetDefinitions({
-        filter: [
-          {
-            queryId,
-            ...(tenantId && { tenantId }),
-            ...(version && { version }),
-          },
-          {
-            id: queryId,
-          },
-        ],
-      })
+      console.log('Authorization Response (siop-sessions')
+      console.log(JSON.stringify(request.body, null, 2))
+      const definitionItems = await context.agent.pdmGetDefinitions({ filter: [{ definitionId, tenantId, version }] })
       if (definitionItems.length === 0) {
-        console.log(`Could not get dcql query with id ${queryId} from agent. Will return 404`)
+        console.log(`Could not get definition ${definitionId} from agent. Will return 404`)
         response.statusCode = 404
-        response.statusMessage = `No definition ${queryId}`
+        response.statusMessage = `No definition ${definitionId}`
         return response.send()
       }
 
@@ -82,8 +71,8 @@ export function verifyAuthResponseSIOPv2Endpoint(router: Router, context: IRequi
       const verifiedResponse = await context.agent.siopVerifyAuthResponse({
         authorizationResponse,
         correlationId,
-        queryId,
-        dcqlQuery: definitionItem.query,
+        definitionId,
+        dcqlQueryPayload: definitionItem.dcqlPayload,
       })
 
       // FIXME SSISDK-55 add proper support for checking for DCQL presentations
@@ -100,7 +89,7 @@ export function verifyAuthResponseSIOPv2Endpoint(router: Router, context: IRequi
           return response.send(JSON.stringify(authorizationChallengeValidationResponse))
         }
 
-        const responseRedirectURI = await context.agent.siopGetRedirectURI({ correlationId, queryId, state: verifiedResponse.state })
+        const responseRedirectURI = await context.agent.siopGetRedirectURI({ correlationId, definitionId, state: verifiedResponse.state })
         if (responseRedirectURI) {
           response.setHeader('Content-Type', 'application/json')
           return response.send(JSON.stringify({ redirect_uri: responseRedirectURI }))
@@ -124,23 +113,23 @@ export function getAuthRequestSIOPv2Endpoint(router: Router, context: IRequiredC
     console.log(`getAuthRequest SIOP endpoint is disabled`)
     return
   }
-  const path = opts?.path ?? '/siop/queries/:queryId/auth-requests/:correlationId'
+  const path = opts?.path ?? '/siop/definitions/:definitionId/auth-requests/:correlationId'
   router.get(path, checkAuth(opts?.endpoint), async (request: Request, response: Response) => {
     try {
       const correlationId = request.params.correlationId
-      const queryId = request.params.queryId
-      if (!correlationId || !queryId) {
-        console.log(`No authorization request could be found for the given url. correlationId: ${correlationId}, queryId: ${queryId}`)
+      const definitionId = request.params.definitionId
+      if (!correlationId || !definitionId) {
+        console.log(`No authorization request could be found for the given url. correlationId: ${correlationId}, definitionId: ${definitionId}`)
         return sendErrorResponse(response, 404, 'No authorization request could be found')
       }
       const requestState = await context.agent.siopGetAuthRequestState({
         correlationId,
-        queryId,
+        definitionId,
         errorOnNotFound: false,
       })
       if (!requestState) {
         console.log(
-          `No authorization request could be found for the given url in the state manager. correlationId: ${correlationId}, definitionId: ${queryId}`,
+          `No authorization request could be found for the given url in the state manager. correlationId: ${correlationId}, definitionId: ${definitionId}`,
         )
         return sendErrorResponse(response, 404, `No authorization request could be found`)
       }
@@ -159,8 +148,8 @@ export function getAuthRequestSIOPv2Endpoint(router: Router, context: IRequiredC
       } finally {
         await context.agent.siopUpdateAuthRequestState({
           correlationId,
-          queryId: queryId,
-          state: 'authorization_request_created',
+          definitionId,
+          state: 'sent',
           error,
         })
       }

package/src/siopv2-rp-api-server.ts

@@ -1,22 +1,23 @@
 import { agentContext } from '@sphereon/ssi-sdk.core'
 import { copyGlobalAuthToEndpoints, ExpressSupport } from '@sphereon/ssi-express-support'
+import { IPresentationExchange } from '@sphereon/ssi-sdk.presentation-exchange'
 import { ISIOPv2RP } from '@sphereon/ssi-sdk.siopv2-oid4vp-rp-auth'
 import { TAgent } from '@veramo/core'
 import express, { Express, Request, Response, Router } from 'express'
 import { getAuthRequestSIOPv2Endpoint, verifyAuthResponseSIOPv2Endpoint } from './siop-api-functions'
 import { IRequiredPlugins, ISIOPv2RPRestAPIOpts } from './types'
 import {
-  authStatusUniversalOID4VPEndpoint,
-  createAuthRequestUniversalOID4VPEndpoint,
+  authStatusWebappEndpoint,
+  createAuthRequestWebappEndpoint,
   getDefinitionsEndpoint,
-  removeAuthRequestStateUniversalOID4VPEndpoint,
-} from './universal-oid4vp-api-functions'
+  removeAuthRequestStateWebappEndpoint,
+} from './webapp-api-functions'
 import swaggerUi from 'swagger-ui-express'
 
 export class SIOPv2RPApiServer {
   private readonly _express: Express
   private readonly _router: Router
-  private readonly _agent: TAgent<ISIOPv2RP>
+  private readonly _agent: TAgent<IPresentationExchange & ISIOPv2RP>
   private readonly _opts?: ISIOPv2RPRestAPIOpts
   private readonly _basePath: string
 
@@ -39,9 +40,9 @@ export class SIOPv2RPApiServer {
 
     // Webapp endpoints
     if (features.includes('rp-status')) {
-      createAuthRequestUniversalOID4VPEndpoint(this._router, context, opts?.endpointOpts?.webappCreateAuthRequest)
-      authStatusUniversalOID4VPEndpoint(this._router, context, opts?.endpointOpts?.webappAuthStatus)
-      removeAuthRequestStateUniversalOID4VPEndpoint(this._router, context, opts?.endpointOpts?.webappDeleteAuthRequest)
+      createAuthRequestWebappEndpoint(this._router, context, opts?.endpointOpts?.webappCreateAuthRequest)
+      authStatusWebappEndpoint(this._router, context, opts?.endpointOpts?.webappAuthStatus)
+      removeAuthRequestStateWebappEndpoint(this._router, context, opts?.endpointOpts?.webappDeleteAuthRequest)
       getDefinitionsEndpoint(this._router, context, opts?.endpointOpts?.webappGetDefinitions)
     }
 
@@ -91,7 +92,7 @@ export class SIOPv2RPApiServer {
     return this._router
   }
 
-  get agent(): TAgent<ISIOPv2RP> {
+  get agent(): TAgent<IPresentationExchange & ISIOPv2RP> {
     return this._agent
   }
 

package/src/types/types.ts

@@ -1,15 +1,11 @@
-import { CreateAuthorizationRequestPayload, CreateAuthorizationResponsePayload } from '@sphereon/did-auth-siop'
 import { GenericAuthArgs, ISingleEndpointOpts } from '@sphereon/ssi-express-support'
-import { IPDManager } from '@sphereon/ssi-sdk.pd-manager'
-import { AuthorizationRequestStateStatus, AuthorizationResponseStateStatus } from '@sphereon/ssi-sdk.siopv2-oid4vp-common'
+import { IPresentationExchange } from '@sphereon/ssi-sdk.presentation-exchange'
 import { ISIOPv2RP } from '@sphereon/ssi-sdk.siopv2-oid4vp-rp-auth'
-import { AdditionalClaims } from '@sphereon/ssi-types'
 import { IAgentContext, ICredentialVerifier } from '@veramo/core'
-import { Request, Response } from 'express'
+import { IPDManager } from '@sphereon/ssi-sdk.pd-manager'
 import { QRCodeOpts } from './QRCode.types'
 
 export type SiopFeatures = 'rp-status' | 'siop'
-
 export interface ISIOPv2RPRestAPIOpts {
   enableFeatures?: SiopFeatures[]
   endpointOpts?: {
@@ -32,58 +28,5 @@ export interface ICreateAuthRequestWebappEndpointOpts extends ISingleEndpointOpt
   responseRedirectURI?: string
 }
 
-export type IRequiredPlugins = ICredentialVerifier & ISIOPv2RP & IPDManager
+export type IRequiredPlugins = ICredentialVerifier & ISIOPv2RP & IPresentationExchange & IPDManager
 export type IRequiredContext = IAgentContext<IRequiredPlugins>
-
-export type CreateAuthorizationRequestPayloadRequest = Request<Record<string, never>, any, CreateAuthorizationRequestPayload, Record<string, never>>
-
-export type CreateAuthorizationResponsePayloadResponse = Response<CreateAuthorizationResponsePayload>
-
-export type DeleteAuthorizationRequest = Request<DeleteAuthorizationRequestPathParameters, any, Record<string, any>, Record<string, any>>
-
-export type DeleteAuthorizationRequestPathParameters = {
-  correlationId: string
-}
-
-export type GetAuthorizationRequestStatus = Request<GetAuthorizationRequestStatusPathParameters, any, Record<string, any>, Record<string, any>>
-
-export type GetAuthorizationRequestStatusPathParameters = {
-  correlationId: string
-}
-
-export type RequestError = {
-  status: number
-  message: string
-  error_details?: string
-}
-
-export interface AuthStatusResponse {
-  status: AuthorizationRequestStateStatus | AuthorizationResponseStateStatus
-  correlation_id: string
-  query_id: string
-  last_updated: number
-  verified_data?: VerifiedData
-  error?: RequestError
-}
-
-export type VerifiedData = {
-  authorization_response?: AuthorizationResponse
-  credential_claims?: AdditionalClaims
-}
-
-export type AuthorizationResponse = {
-  presentation_submission?: Record<string, any>
-  vp_token?: VpToken
-}
-
-export type SingleObjectVpTokenPE = Record<string, any>
-
-export type SingleStringVpTokenPE = string
-
-export type MultipleVpTokens = Array<SingleObjectVpTokenPE> | Array<SingleStringVpTokenPE>
-
-export type MultipleVpTokenDCQL = {
-  [key: string]: MultipleVpTokens
-}
-
-export type VpToken = SingleObjectVpTokenPE | SingleStringVpTokenPE | MultipleVpTokens | MultipleVpTokenDCQL

package/src/webapp-api-functions.ts

@@ -1,40 +1,40 @@
-import { AuthorizationRequestState, AuthorizationResponseStateStatus, AuthorizationResponseStateWithVerifiedData } from '@sphereon/did-auth-siop'
+import { AuthorizationRequestState, AuthorizationResponseStateStatus } from '@sphereon/did-auth-siop'
 import { checkAuth, ISingleEndpointOpts, sendErrorResponse } from '@sphereon/ssi-express-support'
 import { AuthStatusResponse, GenerateAuthRequestURIResponse, uriWithBase } from '@sphereon/ssi-sdk.siopv2-oid4vp-common'
-import { VerifiedDataMode } from '@sphereon/ssi-sdk.siopv2-oid4vp-rp-auth'
-import { shaHasher as defaultHasher } from '@sphereon/ssi-sdk.core'
+import { AuthorizationResponseStateWithVerifiedData, VerifiedDataMode } from '@sphereon/ssi-sdk.siopv2-oid4vp-rp-auth'
 import { Request, Response, Router } from 'express'
 import uuid from 'short-uuid'
 import { ICreateAuthRequestWebappEndpointOpts, IRequiredContext } from './types'
+import { shaHasher as defaultHasher } from '@sphereon/ssi-sdk.core'
 
 export function createAuthRequestWebappEndpoint(router: Router, context: IRequiredContext, opts?: ICreateAuthRequestWebappEndpointOpts) {
   if (opts?.enabled === false) {
     console.log(`createAuthRequest Webapp endpoint is disabled`)
     return
   }
-  const path = opts?.path ?? '/webapp/queries/:queryId/auth-requests'
+  const path = opts?.path ?? '/webapp/definitions/:definitionId/auth-requests'
   router.post(path, checkAuth(opts?.endpoint), async (request: Request, response: Response) => {
     try {
       // if (!request.agent) throw Error('No agent configured')
-      const queryId = request.params.queryId
-      if (!queryId) {
-        return sendErrorResponse(response, 400, 'No queryId query parameter provided')
+      const definitionId = request.params.definitionId
+      if (!definitionId) {
+        return sendErrorResponse(response, 400, 'No definitionId query parameter provided')
       }
       const state: string = request.body.state ?? uuid.uuid()
       const correlationId = request.body.correlationId ?? state
       const qrCodeOpts = request.body.qrCodeOpts ?? opts?.qrCodeOpts
 
-      const requestByReferenceURI = uriWithBase(`/siop/queries/${queryId}/auth-requests/${state}`, {
+      const requestByReferenceURI = uriWithBase(`/siop/definitions/${definitionId}/auth-requests/${state}`, {
         baseURI: opts?.siopBaseURI,
       })
-      const responseURI = uriWithBase(`/siop/queries/${queryId}/auth-responses/${state}`, { baseURI: opts?.siopBaseURI })
+      const responseURI = uriWithBase(`/siop/definitions/${definitionId}/auth-responses/${state}`, { baseURI: opts?.siopBaseURI })
       // first version is for backwards compat
       const responseRedirectURI =
         ('response_redirect_uri' in request.body && (request.body.response_redirect_uri as string | undefined)) ??
         ('responseRedirectURI' in request.body && (request.body.responseRedirectURI as string | undefined))
 
       const authRequestURI = await context.agent.siopCreateAuthRequestURI({
-        queryId,
+        definitionId,
         correlationId,
         state,
         nonce: uuid.uuid(),
@@ -53,7 +53,7 @@ export function createAuthRequestWebappEndpoint(router: Router, context: IRequir
       const authRequestBody: GenerateAuthRequestURIResponse = {
         correlationId,
         state,
-        queryId,
+        definitionId,
         authRequestURI,
         authStatusURI: `${uriWithBase(opts?.webappAuthStatusPath ?? '/webapp/auth-status', { baseURI: opts?.webappBaseURI })}`,
         ...(qrCodeDataUri && { qrCodeDataUri }),
@@ -76,24 +76,26 @@ export function authStatusWebappEndpoint(router: Router, context: IRequiredConte
     try {
       console.log('Received auth-status request...')
       const correlationId: string = request.body.correlationId as string
-      const queryId: string = request.body.queryId as string
+      const definitionId: string = request.body.definitionId as string
 
       const requestState =
-        correlationId && queryId
+        correlationId && definitionId
           ? await context.agent.siopGetAuthRequestState({
               correlationId,
-              queryId,
+              definitionId,
               errorOnNotFound: false,
             })
           : undefined
-      if (!requestState || !queryId || !correlationId) {
-        console.log(`No authentication request mapping could be found for the given URL. correlation: ${correlationId}, queryId: ${queryId}`)
+      if (!requestState || !definitionId || !correlationId) {
+        console.log(
+          `No authentication request mapping could be found for the given URL. correlation: ${correlationId}, definitionId: ${definitionId}`,
+        )
         response.statusCode = 404
         const statusBody: AuthStatusResponse = {
           status: requestState ? requestState.status : 'error',
           error: 'No authentication request mapping could be found for the given URL.',
           correlationId,
-          queryId,
+          definitionId,
           lastUpdated: requestState ? requestState.lastUpdated : Date.now(),
         }
         return response.json(statusBody)
@@ -105,10 +107,10 @@ export function authStatusWebappEndpoint(router: Router, context: IRequiredConte
       }
 
       let responseState
-      if (requestState.status === 'authorization_request_retrieved') {
+      if (requestState.status === 'sent') {
         responseState = (await context.agent.siopGetAuthResponseState({
           correlationId,
-          queryId,
+          definitionId,
           includeVerifiedData: includeVerifiedData,
           errorOnNotFound: false,
         })) as AuthorizationResponseStateWithVerifiedData
@@ -119,7 +121,7 @@ export function authStatusWebappEndpoint(router: Router, context: IRequiredConte
         status: overallState.status,
         ...(overallState.error ? { error: overallState.error?.message } : {}),
         correlationId,
-        queryId,
+        definitionId,
         lastUpdated: overallState.lastUpdated,
         ...(responseState && responseState.status === AuthorizationResponseStateStatus.VERIFIED
           ? {
@@ -146,17 +148,17 @@ export function removeAuthRequestStateWebappEndpoint(router: Router, context: IR
     console.log(`removeAuthStatus Webapp endpoint is disabled`)
     return
   }
-  const path = opts?.path ?? '/webapp/queries/:queryId/auth-requests/:correlationId'
+  const path = opts?.path ?? '/webapp/definitions/:definitionId/auth-requests/:correlationId'
   router.delete(path, checkAuth(opts?.endpoint), async (request: Request, response: Response) => {
     try {
       const correlationId: string = request.params.correlationId
-      const queryId: string = request.params.queryId
-      if (!correlationId || !queryId) {
-        console.log(`No authorization request could be found for the given url. correlationId: ${correlationId}, queryId: ${queryId}`)
+      const definitionId: string = request.params.definitionId
+      if (!correlationId || !definitionId) {
+        console.log(`No authorization request could be found for the given url. correlationId: ${correlationId}, definitionId: ${definitionId}`)
         return sendErrorResponse(response, 404, 'No authorization request could be found')
       }
       response.statusCode = 200
-      return response.json(await context.agent.siopDeleteAuthState({ queryId, correlationId }))
+      return response.json(await context.agent.siopDeleteAuthState({ definitionId, correlationId }))
     } catch (error) {
       return sendErrorResponse(response, 500, error.message, error)
     }
@@ -168,7 +170,7 @@ export function getDefinitionsEndpoint(router: Router, context: IRequiredContext
     console.log(`getDefinitions Webapp endpoint is disabled`)
     return
   }
-  const path = opts?.path ?? '/webapp/queries'
+  const path = opts?.path ?? '/webapp/definitions'
   router.get(path, checkAuth(opts?.endpoint), async (request: Request, response: Response) => {
     try {
       const definitions = await context.agent.pdmGetDefinitions()

package/src/middleware/validationMiddleware.ts

@@ -1,20 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-import { z, ZodError } from 'zod';
-
-export const validateData = (schema: z.ZodObject<any, any>) => {
-  return (req: Request, res: Response, next: NextFunction) => {
-    try {
-      schema.parse(req.body);
-      next();
-    } catch (error) {
-      if (error instanceof ZodError) {
-        const errorMessages = error.issues.map((issue: any) => ({
-          message: `${issue.path.join('.')} is ${issue.message}`,
-        }))
-        res.status(400).json({ status: 400, message: 'Invalid data', error_details: errorMessages[0].message });
-      } else {
-        res.status(500).json({ status: 500, message: 'Internal Server Error' });
-      }
-    }
-  };
-}