@sphereon/ssi-sdk.siopv2-oid4vp-rp-rest-api 0.32.1-next.18 → 0.32.1-next.287

package/dist/webapp-api-functions.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -15,6 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAuthRequestWebappEndpoint = createAuthRequestWebappEndpoint;
 exports.authStatusWebappEndpoint = authStatusWebappEndpoint;
 exports.removeAuthRequestStateWebappEndpoint = removeAuthRequestStateWebappEndpoint;
+exports.getDefinitionsEndpoint = getDefinitionsEndpoint;
 const did_auth_siop_1 = require("@sphereon/did-auth-siop");
 const ssi_express_support_1 = require("@sphereon/ssi-express-support");
 const ssi_sdk_siopv2_oid4vp_common_1 = require("@sphereon/ssi-sdk.siopv2-oid4vp-common");
@@ -29,28 +53,37 @@ function createAuthRequestWebappEndpoint(router, context, opts) {
     }
     const path = (_a = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _a !== void 0 ? _a : '/webapp/definitions/:definitionId/auth-requests';
     router.post(path, (0, ssi_express_support_1.checkAuth)(opts === null || opts === void 0 ? void 0 : opts.endpoint), (request, response) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b, _c, _d, _e;
         try {
             // if (!request.agent) throw Error('No agent configured')
             const definitionId = request.params.definitionId;
-            const state = short_uuid_1.default.uuid();
-            const correlationId = state;
-            const requestByReferenceURI = (0, ssi_sdk_siopv2_oid4vp_common_1.uriWithBase)(`/siop/definitions/${definitionId}/auth-requests/${correlationId}`, {
+            if (!definitionId) {
+                return (0, ssi_express_support_1.sendErrorResponse)(response, 400, 'No definitionId query parameter provided');
+            }
+            const state = (_a = request.body.state) !== null && _a !== void 0 ? _a : short_uuid_1.default.uuid();
+            const correlationId = (_b = request.body.correlationId) !== null && _b !== void 0 ? _b : state;
+            const qrCodeOpts = (_c = request.body.qrCodeOpts) !== null && _c !== void 0 ? _c : opts === null || opts === void 0 ? void 0 : opts.qrCodeOpts;
+            const requestByReferenceURI = (0, ssi_sdk_siopv2_oid4vp_common_1.uriWithBase)(`/siop/definitions/${definitionId}/auth-requests/${state}`, {
                 baseURI: opts === null || opts === void 0 ? void 0 : opts.siopBaseURI,
             });
-            const responseURI = (0, ssi_sdk_siopv2_oid4vp_common_1.uriWithBase)(`/siop/definitions/${definitionId}/auth-responses/${correlationId}`, { baseURI: opts === null || opts === void 0 ? void 0 : opts.siopBaseURI });
-            const responseRedirectURI = 'response_redirect_uri' in request.body && request.body.response_redirect_uri;
+            const responseURI = (0, ssi_sdk_siopv2_oid4vp_common_1.uriWithBase)(`/siop/definitions/${definitionId}/auth-responses/${state}`, { baseURI: opts === null || opts === void 0 ? void 0 : opts.siopBaseURI });
+            // first version is for backwards compat
+            const responseRedirectURI = (_d = ('response_redirect_uri' in request.body && request.body.response_redirect_uri)) !== null && _d !== void 0 ? _d : ('responseRedirectURI' in request.body && request.body.responseRedirectURI);
             const authRequestURI = yield context.agent.siopCreateAuthRequestURI(Object.assign({ definitionId,
                 correlationId,
-                state, nonce: opts === null || opts === void 0 ? void 0 : opts.nonce, requestByReferenceURI, responseURIType: 'response_uri', responseURI }, (responseRedirectURI && { responseRedirectURI })));
-            const authRequestBody = {
-                correlationId,
+                state, nonce: short_uuid_1.default.uuid(), requestByReferenceURI, responseURIType: 'response_uri', responseURI }, (responseRedirectURI && { responseRedirectURI })));
+            let qrCodeDataUri;
+            if (qrCodeOpts) {
+                const { AwesomeQR } = yield Promise.resolve().then(() => __importStar(require('awesome-qr')));
+                const qrCode = new AwesomeQR(Object.assign(Object.assign({}, qrCodeOpts), { text: authRequestURI }));
+                qrCodeDataUri = `data:image/png;base64,${(yield qrCode.draw()).toString('base64')}`;
+            }
+            const authRequestBody = Object.assign({ correlationId,
+                state,
                 definitionId,
-                authRequestURI,
-                authStatusURI: `${(0, ssi_sdk_siopv2_oid4vp_common_1.uriWithBase)((_a = opts === null || opts === void 0 ? void 0 : opts.webappAuthStatusPath) !== null && _a !== void 0 ? _a : '/webapp/auth-status', { baseURI: opts === null || opts === void 0 ? void 0 : opts.webappBaseURI })}`,
-            };
+                authRequestURI, authStatusURI: `${(0, ssi_sdk_siopv2_oid4vp_common_1.uriWithBase)((_e = opts === null || opts === void 0 ? void 0 : opts.webappAuthStatusPath) !== null && _e !== void 0 ? _e : '/webapp/auth-status', { baseURI: opts === null || opts === void 0 ? void 0 : opts.webappBaseURI })}` }, (qrCodeDataUri && { qrCodeDataUri }));
             console.log(`Auth Request URI data to send back: ${JSON.stringify(authRequestBody)}`);
-            return response.send(authRequestBody);
+            return response.json(authRequestBody);
         }
         catch (error) {
             return (0, ssi_express_support_1.sendErrorResponse)(response, 500, 'Could not create an authorization request URI', error);
@@ -87,7 +120,7 @@ function authStatusWebappEndpoint(router, context, opts) {
                     definitionId,
                     lastUpdated: requestState ? requestState.lastUpdated : Date.now(),
                 };
-                return response.send(statusBody);
+                return response.json(statusBody);
             }
             let includeVerifiedData = ssi_sdk_siopv2_oid4vp_rp_auth_1.VerifiedDataMode.NONE;
             if ('includeVerifiedData' in request.body) {
@@ -110,13 +143,13 @@ function authStatusWebappEndpoint(router, context, opts) {
                     verifiedData: responseState.verifiedData,
                 }
                 : {}));
-            console.log(`Will send auth status: ${JSON.stringify(statusBody)}`);
+            console.debug(`Will send auth status: ${JSON.stringify(statusBody)}`);
             if (overallState.status === 'error') {
                 response.statusCode = 500;
-                return response.send(statusBody);
+                return response.json(statusBody);
             }
             response.statusCode = 200;
-            return response.send(statusBody);
+            return response.json(statusBody);
         }
         catch (error) {
             return (0, ssi_express_support_1.sendErrorResponse)(response, 500, error.message, error);
@@ -139,7 +172,25 @@ function removeAuthRequestStateWebappEndpoint(router, context, opts) {
                 return (0, ssi_express_support_1.sendErrorResponse)(response, 404, 'No authorization request could be found');
             }
             response.statusCode = 200;
-            return response.send(context.agent.siopDeleteAuthState({ definitionId, correlationId }));
+            return response.json(yield context.agent.siopDeleteAuthState({ definitionId, correlationId }));
+        }
+        catch (error) {
+            return (0, ssi_express_support_1.sendErrorResponse)(response, 500, error.message, error);
+        }
+    }));
+}
+function getDefinitionsEndpoint(router, context, opts) {
+    var _a;
+    if ((opts === null || opts === void 0 ? void 0 : opts.enabled) === false) {
+        console.log(`getDefinitions Webapp endpoint is disabled`);
+        return;
+    }
+    const path = (_a = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _a !== void 0 ? _a : '/webapp/definitions';
+    router.get(path, (0, ssi_express_support_1.checkAuth)(opts === null || opts === void 0 ? void 0 : opts.endpoint), (request, response) => __awaiter(this, void 0, void 0, function* () {
+        try {
+            const definitions = yield context.agent.pdmGetDefinitions();
+            response.statusCode = 200;
+            return response.json(definitions);
         }
         catch (error) {
             return (0, ssi_express_support_1.sendErrorResponse)(response, 500, error.message, error);

package/dist/webapp-api-functions.js.map

@@ -1 +1 @@
-{"version":3,"file":"webapp-api-functions.js","sourceRoot":"","sources":["../src/webapp-api-functions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webapp-api-functions.js","sourceRoot":"","sources":["../src/webapp-api-functions.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.siopv2-oid4vp-rp-rest-api",
-  "version": "0.32.1-next.18+7d08055e",
+  "version": "0.32.1-next.287+5f85ee8f",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,18 +11,19 @@
     "start:dev": "ts-node __tests__/RestAPI.ts"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-next.233",
-    "@sphereon/ssi-express-support": "0.32.1-next.18+7d08055e",
-    "@sphereon/ssi-sdk.core": "0.32.1-next.18+7d08055e",
-    "@sphereon/ssi-sdk.credential-validation": "0.32.1-next.18+7d08055e",
-    "@sphereon/ssi-sdk.kv-store-temp": "0.32.1-next.18+7d08055e",
-    "@sphereon/ssi-sdk.pd-manager": "0.32.1-next.18+7d08055e",
-    "@sphereon/ssi-sdk.presentation-exchange": "0.32.1-next.18+7d08055e",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.32.1-next.18+7d08055e",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-rp-auth": "0.32.1-next.18+7d08055e",
-    "@sphereon/ssi-types": "0.32.1-next.18+7d08055e",
+    "@sphereon/did-auth-siop": "0.17.0",
+    "@sphereon/ssi-express-support": "0.32.1-next.287+5f85ee8f",
+    "@sphereon/ssi-sdk.core": "0.32.1-next.287+5f85ee8f",
+    "@sphereon/ssi-sdk.credential-validation": "0.32.1-next.287+5f85ee8f",
+    "@sphereon/ssi-sdk.kv-store-temp": "0.32.1-next.287+5f85ee8f",
+    "@sphereon/ssi-sdk.pd-manager": "0.32.1-next.287+5f85ee8f",
+    "@sphereon/ssi-sdk.presentation-exchange": "0.32.1-next.287+5f85ee8f",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.32.1-next.287+5f85ee8f",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-rp-auth": "0.32.1-next.287+5f85ee8f",
+    "@sphereon/ssi-types": "0.32.1-next.287+5f85ee8f",
     "@veramo/core": "4.2.0",
     "@veramo/credential-w3c": "4.2.0",
+    "awesome-qr": "^2.1.5-rc.0",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
@@ -30,16 +31,18 @@
     "dotenv-flow": "^3.3.0",
     "express": "^4.19.2",
     "short-uuid": "^4.2.2",
+    "swagger-ui-express": "^5.0.1",
     "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@decentralized-identity/ion-sdk": "^0.6.0",
+    "@sphereon/did-auth-siop-adapter": "0.17.0",
     "@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.27.0",
-    "@sphereon/ssi-sdk.data-store": "0.32.1-next.18+7d08055e",
-    "@sphereon/ssi-sdk.vc-handler-ld-local": "0.32.1-next.18+7d08055e",
+    "@sphereon/ssi-sdk-ext.did-provider-jwk": "0.28.0",
+    "@sphereon/ssi-sdk.data-store": "0.32.1-next.287+5f85ee8f",
+    "@sphereon/ssi-sdk.vc-handler-ld-local": "0.32.1-next.287+5f85ee8f",
     "@types/body-parser": "^1.19.5",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
@@ -51,6 +54,7 @@
     "@types/node": "^20.17.1",
     "@types/passport": "^1.0.16",
     "@types/passport-http-bearer": "^1.0.41",
+    "@types/swagger-ui-express": "^4.1.7",
     "@types/uuid": "^9.0.8",
     "@veramo/data-store": "4.2.0",
     "@veramo/did-manager": "4.2.0",
@@ -62,13 +66,14 @@
     "@veramo/key-manager": "4.2.0",
     "@veramo/kms-local": "4.2.0",
     "@veramo/utils": "4.2.0",
+    "debug": "^4.4.0",
     "did-resolver": "^4.1.0",
     "morgan": "^1.10.0",
     "nock": "^13.5.4",
     "passport": "^0.6.0",
     "passport-http-bearer": "^1.0.1",
     "ts-node": "^10.9.2",
-    "typeorm": "^0.3.20"
+    "typeorm": "^0.3.21"
   },
   "files": [
     ".yalc/**/*",
@@ -98,5 +103,5 @@
     "Authenticator"
   ],
   "nx": {},
-  "gitHead": "7d08055e7c148eff0a031196ea1007519f6398b9"
+  "gitHead": "5f85ee8fef1e0fce3d20d150f187b00c7c70f093"
 }

package/src/siop-api-functions.ts

@@ -1,9 +1,46 @@
 import { AuthorizationResponsePayload, PresentationDefinitionLocation } from '@sphereon/did-auth-siop'
 import { checkAuth, ISingleEndpointOpts, sendErrorResponse } from '@sphereon/ssi-express-support'
-import { PresentationSubmission } from '@sphereon/ssi-types'
+import { CredentialMapper } from '@sphereon/ssi-types'
+import { AuthorizationChallengeValidationResponse } from '@sphereon/ssi-sdk.siopv2-oid4vp-common'
 import { Request, Response, Router } from 'express'
 import { IRequiredContext } from './types'
 
+const parseAuthorizationResponse = (request: Request): AuthorizationResponsePayload => {
+  const contentType = request.header('content-type')
+
+  if (contentType === 'application/json') {
+    const payload = typeof request.body === 'string' ? JSON.parse(request.body) : request.body
+    return payload as AuthorizationResponsePayload
+  }
+
+  if (contentType === 'application/x-www-form-urlencoded') {
+    const payload = request.body as AuthorizationResponsePayload
+
+    // Parse presentation_submission if it's a string
+    if (typeof payload.presentation_submission === 'string') {
+      console.log(`Supplied presentation_submission was a string instead of JSON. Correcting, but external party should fix their implementation!`)
+      payload.presentation_submission = JSON.parse(payload.presentation_submission)
+    }
+
+    // when using FORM_URL_ENCODED, vp_token comes back as string not matter whether the input was string, object or array. Handled below.
+    if (typeof payload.vp_token === 'string') {
+      const { vp_token } = payload
+
+      // The only use case where vp_object is an object is JsonLdAsString atm. For arrays, any objects will be parsed along with the array
+      // (Leaving the vp_token JsonLdAsString causes problems because the original credential will remain string and will be interpreted as JWT in some parts of the code)
+      if ((vp_token.startsWith('[') && vp_token.endsWith(']')) || CredentialMapper.isJsonLdAsString(vp_token)) {
+        payload.vp_token = JSON.parse(vp_token)
+      }
+    }
+
+    return payload
+  }
+
+  throw new Error(
+    `Unsupported content type: ${contentType}. Currently only application/x-www-form-urlencoded and application/json (for direct_post) are supported`,
+  )
+}
+
 export function verifyAuthResponseSIOPv2Endpoint(
   router: Router,
   context: IRequiredContext,
@@ -31,23 +68,10 @@ export function verifyAuthResponseSIOPv2Endpoint(
         return response.send()
       }
 
-      const authorizationResponse =
-        typeof request.body === 'string' ? (JSON.parse(request.body) as AuthorizationResponsePayload) : (request.body as AuthorizationResponsePayload)
-      if (typeof authorizationResponse.presentation_submission === 'string') {
-        console.log(`Supplied presentation_submission was a string instead of JSON. Correcting, but external party should fix their implementation!`)
-        authorizationResponse.presentation_submission = JSON.parse(authorizationResponse.presentation_submission) as PresentationSubmission
-      }
-      if (typeof authorizationResponse.vp_token === 'string') {
-        // arrays pass as string when using FORM_URL_ENCODED
-        if (authorizationResponse.vp_token.startsWith('[') && authorizationResponse.vp_token.endsWith(']')) {
-          authorizationResponse.vp_token = JSON.parse(authorizationResponse.vp_token)
-        } else {
-          authorizationResponse.vp_token = [authorizationResponse.vp_token]
-        }
-      }
+      const authorizationResponse = parseAuthorizationResponse(request)
       console.log(`URI: ${JSON.stringify(authorizationResponse)}`)
 
-      const definition = definitionItems[0].definitionPayload
+      const definitionItem = definitionItems[0]
       const verifiedResponse = await context.agent.siopVerifyAuthResponse({
         authorizationResponse,
         correlationId,
@@ -55,9 +79,10 @@ export function verifyAuthResponseSIOPv2Endpoint(
         presentationDefinitions: [
           {
             location: opts?.presentationDefinitionLocation ?? PresentationDefinitionLocation.TOPLEVEL_PRESENTATION_DEF,
-            definition,
+            definition: definitionItem.definitionPayload,
           },
         ],
+        dcqlQuery: definitionItem.dcqlPayload,
       })
 
       const wrappedPresentation = verifiedResponse?.oid4vpSubmission?.presentations[0]
@@ -65,8 +90,17 @@ export function verifyAuthResponseSIOPv2Endpoint(
         // const credentialSubject = wrappedPresentation.presentation.verifiableCredential[0]?.credential?.credentialSubject
         // console.log(JSON.stringify(credentialSubject, null, 2))
         console.log('PRESENTATION:' + JSON.stringify(wrappedPresentation.presentation, null, 2))
-        const responseRedirectURI = await context.agent.siopGetRedirectURI({ correlationId, definitionId, state: verifiedResponse.state })
         response.statusCode = 200
+
+        const authorizationChallengeValidationResponse: AuthorizationChallengeValidationResponse = {
+          presentation_during_issuance_session: verifiedResponse.correlationId,
+        }
+        if (authorizationResponse.is_first_party) {
+          response.setHeader('Content-Type', 'application/json')
+          return response.send(JSON.stringify(authorizationChallengeValidationResponse))
+        }
+
+        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 }))

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

@@ -3,17 +3,25 @@ import { copyGlobalAuthToEndpoints, ExpressSupport } from '@sphereon/ssi-express
 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, Router } from 'express'
+import express, { Express, Request, Response, Router } from 'express'
 import { getAuthRequestSIOPv2Endpoint, verifyAuthResponseSIOPv2Endpoint } from './siop-api-functions'
 import { IRequiredPlugins, ISIOPv2RPRestAPIOpts } from './types'
-import { authStatusWebappEndpoint, createAuthRequestWebappEndpoint, removeAuthRequestStateWebappEndpoint } from './webapp-api-functions'
+import {
+  authStatusWebappEndpoint,
+  createAuthRequestWebappEndpoint,
+  getDefinitionsEndpoint,
+  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<IPresentationExchange & ISIOPv2RP>
   private readonly _opts?: ISIOPv2RPRestAPIOpts
+  private readonly _basePath: string
 
+  private readonly OID4VP_SWAGGER_URL = 'https://api.swaggerhub.com/apis/SphereonInt/OID4VP/0.1.0'
   constructor(args: { agent: TAgent<IRequiredPlugins>; expressSupport: ExpressSupport; opts?: ISIOPv2RPRestAPIOpts }) {
     const { agent, opts } = args
     this._agent = agent
@@ -35,6 +43,7 @@ export class SIOPv2RPApiServer {
       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)
     }
 
     // SIOPv2 endpoints
@@ -42,9 +51,39 @@ export class SIOPv2RPApiServer {
       getAuthRequestSIOPv2Endpoint(this._router, context, opts?.endpointOpts?.siopGetAuthRequest)
       verifyAuthResponseSIOPv2Endpoint(this._router, context, opts?.endpointOpts?.siopVerifyAuthResponse)
     }
-    this._express.use(opts?.endpointOpts?.basePath ?? '', this.router)
+    this._basePath = opts?.endpointOpts?.basePath ?? ''
+    this._express.use(this._basePath, this.router)
+    this._express.set('trust proxy', opts?.endpointOpts?.trustProxy ?? true)
+    this.setupSwaggerUi()
   }
 
+  private setupSwaggerUi() {
+    fetch(this.OID4VP_SWAGGER_URL)
+      .then((res) => res.json())
+      .then((swagger) => {
+        const apiDocs = `${this._basePath}/api-docs`
+        console.log(`[OID4P] API docs available at ${apiDocs}`)
+
+        this._router.use(
+          '/api-docs',
+          (req: Request, res: Response, next: any) => {
+            const regex = `${apiDocs.replace(/\//, '\/')}`.replace('/oid4vp', '').replace(/\/api-docs.*/, '')
+            swagger.servers = [{ url: `${req.protocol}://${req.get('host')}${regex}`, description: 'This server' }]
+            // @ts-ignore
+            req.swaggerDoc = swagger
+            next()
+          },
+          swaggerUi.serveFiles(swagger, options),
+          swaggerUi.setup(),
+        )
+      })
+      .catch((err) => {
+        console.log(`[OID4VP] Unable to fetch swagger document: ${err}. Will not host api-docs on this instance`)
+      })
+    const options = {
+      // customCss: '.swagger-ui .topbar { display: none }',
+    }
+  }
   get express(): Express {
     return this._express
   }

package/src/types/QRCode.types.ts

@@ -0,0 +1,227 @@
+export interface ComponentOptions {
+  /**
+   * Component options for data/ECC.
+   */
+  data?: {
+    /**
+     * Scale factor for data/ECC dots.
+     * @default 1
+     */
+    scale?: number
+  }
+
+  /**
+   * Component options for timing patterns.
+   */
+  timing?: {
+    /**
+     * Scale factor for timing patterns.
+     * @default 1
+     */
+    scale?: number
+
+    /**
+     * Protector for timing patterns.
+     * @default false
+     */
+    protectors?: boolean
+  }
+
+  /**
+   * Component options for alignment patterns.
+   */
+  alignment?: {
+    /**
+     * Scale factor for alignment patterns.
+     * @default 1
+     */
+    scale?: number
+
+    /**
+     * Protector for alignment patterns.
+     * @default false
+     */
+    protectors?: boolean
+  }
+
+  /**
+   * Component options for alignment pattern on the bottom-right corner.
+   */
+  cornerAlignment?: {
+    /**
+     * Scale factor for alignment pattern on the bottom-right corner.
+     * @default 1
+     */
+    scale?: number
+
+    /**
+     * Protector for alignment pattern on the bottom-right corner.
+     * @default true
+     */
+    protectors?: boolean
+  }
+}
+
+export interface QRCodeOpts {
+  /**
+   * Size of the QR code in pixel.
+   *
+   * @defaultValue 400
+   */
+  size?: number
+
+  /**
+   * Size of margins around the QR code body in pixel.
+   *
+   * @defaultValue 20
+   */
+  margin?: number
+
+  /**
+   * Error correction level of the QR code.
+   *
+   * Accepts a value provided by _QRErrorCorrectLevel_.
+   *
+   * For more information, please refer to [https://www.qrcode.com/en/about/error_correction.html](https://www.qrcode.com/en/about/error_correction.html).
+   *
+   * @defaultValue 0
+   */
+  correctLevel?: number
+
+  /**
+   * **This is an advanced option.**
+   *
+   * Specify the mask pattern to be used in QR code encoding.
+   *
+   * Accepts a value provided by _QRMaskPattern_.
+   *
+   * To find out all eight mask patterns, please refer to [https://en.wikipedia.org/wiki/File:QR_Code_Mask_Patterns.svg](https://en.wikipedia.org/wiki/File:QR_Code_Mask_Patterns.svg)
+   *
+   * For more information, please refer to [https://en.wikiversity.org/wiki/Reed%E2%80%93Solomon_codes_for_coders#Masking](https://en.wikiversity.org/wiki/Reed%E2%80%93Solomon_codes_for_coders#Masking).
+   */
+  maskPattern?: number
+
+  /**
+   * **This is an advanced option.**
+   *
+   * Specify the version to be used in QR code encoding.
+   *
+   * Accepts an integer in range [1, 40].
+   *
+   * For more information, please refer to [https://www.qrcode.com/en/about/version.html](https://www.qrcode.com/en/about/version.html).
+   */
+  version?: number
+
+  /**
+   * Options to control components in the QR code.
+   *
+   * @deafultValue undefined
+   */
+  components?: ComponentOptions
+
+  /**
+   * Color of the blocks on the QR code.
+   *
+   * Accepts a CSS <color>.
+   *
+   * For more information about CSS <color>, please refer to [https://developer.mozilla.org/en-US/docs/Web/CSS/color_value](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value).
+   *
+   * @defaultValue "#000000"
+   */
+  colorDark?: string
+
+  /**
+   * Color of the empty areas on the QR code.
+   *
+   * Accepts a CSS <color>.
+   *
+   * For more information about CSS <color>, please refer to [https://developer.mozilla.org/en-US/docs/Web/CSS/color_value](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value).
+   *
+   * @defaultValue "#ffffff"
+   */
+  colorLight?: string
+
+  /**
+   * Automatically calculate the _colorLight_ value from the QR code's background.
+   *
+   * @defaultValue true
+   */
+  autoColor?: boolean
+
+  /**
+   * Background image to be used in the QR code.
+   *
+   * Accepts a `data:` string in web browsers or a Buffer in Node.js.
+   *
+   * @defaultValue undefined
+   */
+  backgroundImage?: string | Buffer
+
+  /**
+   * Color of the dimming mask above the background image.
+   *
+   * Accepts a CSS <color>.
+   *
+   * For more information about CSS <color>, please refer to [https://developer.mozilla.org/en-US/docs/Web/CSS/color_value](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value).
+   *
+   * @defaultValue "rgba(0, 0, 0, 0)"
+   */
+  backgroundDimming?: string
+
+  /**
+   * GIF background image to be used in the QR code.
+   *
+   * @defaultValue undefined
+   */
+  gifBackground?: ArrayBuffer
+
+  /**
+   * Use a white margin instead of a transparent one which reveals the background of the QR code on margins.
+   *
+   * @defaultValue true
+   */
+  whiteMargin?: boolean
+
+  /**
+   * Logo image to be displayed at the center of the QR code.
+   *
+   * Accepts a `data:` string in web browsers or a Buffer in Node.js.
+   *
+   * When set to `undefined` or `null`, the logo is disabled.
+   *
+   * @defaultValue undefined
+   */
+  logoImage?: string | Buffer
+
+  /**
+   * Ratio of the logo size to the QR code size.
+   *
+   * @defaultValue 0.2
+   */
+  logoScale?: number
+
+  /**
+   * Size of margins around the logo image in pixels.
+   *
+   * @defaultValue 6
+   */
+  logoMargin?: number
+
+  /**
+   * Corner radius of the logo image in pixels.
+   *
+   * @defaultValue 8
+   */
+  logoCornerRadius?: number
+
+  /**
+   * @deprecated
+   *
+   * Ratio of the real size to the full size of the blocks.
+   *
+   * This can be helpful when you want to make more parts of the background visible.
+   *
+   * @deafultValue 0.4
+   */
+  dotScale?: number
+}