feat: Add static bearer token callback function option

Sphereon-Opensource · Dec 21, 2023 · 2d5cd5a · 2d5cd5a
1 parent 9e3fc6a
commit 2d5cd5a
Show file tree

Hide file tree

Showing 45 changed files with 491 additions and 157 deletions.
diff --git a/packages/agent-config/CHANGELOG.md b/packages/agent-config/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.agent-config
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.agent-config

diff --git a/packages/contact-manager-rest-api/CHANGELOG.md b/packages/contact-manager-rest-api/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.contact-manager-rest-api
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.contact-manager-rest-api

diff --git a/packages/contact-manager/CHANGELOG.md b/packages/contact-manager/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.contact-manager
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.contact-manager

diff --git a/packages/data-store/CHANGELOG.md b/packages/data-store/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.data-store
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.data-store

diff --git a/packages/data-store/tsconfig.json b/packages/data-store/tsconfig.json
@@ -11,7 +11,8 @@
   "references": [
     {
       "path": "../ssi-sdk-core"
-    }, {
+    },
+    {
       "path": "../ssi-types"
     }
   ]

diff --git a/packages/dev/CHANGELOG.md b/packages/dev/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.dev
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.dev

diff --git a/packages/issuance-branding/CHANGELOG.md b/packages/issuance-branding/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.issuance-branding
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.issuance-branding

diff --git a/packages/kv-store/CHANGELOG.md b/packages/kv-store/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.kv-store-temp
 
-
-
-
-
 ## [0.17.4](https://github.com/uport-project/veramo/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.kv-store-temp

diff --git a/packages/ms-authenticator/CHANGELOG.md b/packages/ms-authenticator/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.ms-authenticator
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.ms-authenticator

diff --git a/packages/ms-request-api/CHANGELOG.md b/packages/ms-request-api/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.ms-request-api
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.ms-request-api

diff --git a/packages/oid4vci-issuer-rest-api/CHANGELOG.md b/packages/oid4vci-issuer-rest-api/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.oid4vci-issuer-rest-api
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.oid4vci-issuer-rest-api

diff --git a/packages/oid4vci-issuer-rest-client/CHANGELOG.md b/packages/oid4vci-issuer-rest-client/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.oid4vci-issuer-rest-client
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-OpenSource/ssi-sdk/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.oid4vci-issuer-rest-client

diff --git a/packages/oid4vci-issuer-rest-client/src/agent/OID4VCIRestClient.ts b/packages/oid4vci-issuer-rest-client/src/agent/OID4VCIRestClient.ts
@@ -37,10 +37,10 @@ export class OID4VCIRestClient implements IAgentPlugin {
       Accept: 'application/json',
     }
     if (this.authOpts?.enabled === true) {
-      if (!this.authOpts.staticBearerToken) {
+      if (!this.authOpts.bearerToken) {
         throw Error(`Cannot have authentication enabled, whilst not enabling static bearer tokens at this point`)
       }
-      headers.Authorization = `Bearer ${this.authOpts.staticBearerToken}`
+      headers.Authorization = `Bearer ${this.authOpts.bearerToken}`
     }
     return headers
   }

diff --git a/packages/oid4vci-issuer-rest-client/src/types/IOID4VCIRestClient.ts b/packages/oid4vci-issuer-rest-client/src/types/IOID4VCIRestClient.ts
@@ -18,7 +18,7 @@ export interface IOID4VCIClientCreateOfferUriRequestArgs extends IOID4VCIClientC
 
 export interface IRestClientAuthenticationOpts {
   enabled?: boolean
-  staticBearerToken?: string
+  bearerToken?: () => Promise<string> | string
 }
 
 export interface IOID4VCIClientGetIssueStatusArgs {

diff --git a/packages/oid4vci-issuer-store/CHANGELOG.md b/packages/oid4vci-issuer-store/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.oid4vci-issuer-store
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.oid4vci-issuer-store

diff --git a/packages/oid4vci-issuer/CHANGELOG.md b/packages/oid4vci-issuer/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.oid4vci-issuer
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.oid4vci-issuer

diff --git a/packages/presentation-exchange/CHANGELOG.md b/packages/presentation-exchange/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.presentation-exchange
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.presentation-exchange

diff --git a/packages/qr-code-generator/CHANGELOG.md b/packages/qr-code-generator/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.qr-code-generator
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.qr-code-generator

diff --git a/packages/siopv2-oid4vp-common/CHANGELOG.md b/packages/siopv2-oid4vp-common/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.siopv2-oid4vp-common
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.siopv2-oid4vp-common

diff --git a/packages/siopv2-oid4vp-op-auth/CHANGELOG.md b/packages/siopv2-oid4vp-op-auth/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.siopv2-oid4vp-op-auth
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.siopv2-oid4vp-op-auth

diff --git a/packages/siopv2-oid4vp-rp-auth/CHANGELOG.md b/packages/siopv2-oid4vp-rp-auth/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.siopv2-oid4vp-rp-auth
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.siopv2-oid4vp-rp-auth

diff --git a/packages/siopv2-oid4vp-rp-rest-api/CHANGELOG.md b/packages/siopv2-oid4vp-rp-rest-api/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.siopv2-oid4vp-rp-rest-api
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.siopv2-oid4vp-rp-rest-api

diff --git a/packages/siopv2-oid4vp-rp-rest-client/CHANGELOG.md b/packages/siopv2-oid4vp-rp-rest-client/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.siopv2-oid4vp-rp-rest-client
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-OpenSource/ssi-sdk/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.siopv2-oid4vp-rp-rest-client

diff --git a/packages/siopv2-oid4vp-rp-rest-client/src/agent/SIOPv2OID4VPRPRestClient.ts b/packages/siopv2-oid4vp-rp-rest-client/src/agent/SIOPv2OID4VPRPRestClient.ts
@@ -39,10 +39,10 @@ export class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
       Accept: 'application/json',
     }
     if (this.authOpts?.enabled === true) {
-      if (!this.authOpts.staticBearerToken) {
+      if (!this.authOpts.bearerToken) {
         throw Error(`Cannot have authentication enabled, whilst not enabling static bearer tokens at this point`)
       }
-      headers.Authorization = `Bearer ${this.authOpts.staticBearerToken}`
+      headers.Authorization = `Bearer ${this.authOpts.bearerToken}`
     }
     return headers
   }

diff --git a/packages/siopv2-oid4vp-rp-rest-client/src/types/ISIOPv2OID4VPRPRestClient.ts b/packages/siopv2-oid4vp-rp-rest-client/src/types/ISIOPv2OID4VPRPRestClient.ts
@@ -29,7 +29,7 @@ export interface ISiopClientGetAuthStatusArgs {
 
 export interface Siopv2RestClientAuthenticationOpts {
   enabled?: boolean
-  staticBearerToken?: string
+  bearerToken?: () => Promise<string> | string
 }
 
 export interface Siopv2RestClientOpts {

diff --git a/packages/ssi-express-support/CHANGELOG.md b/packages/ssi-express-support/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-express-support
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-express-support

diff --git a/packages/ssi-express-support/src/express-utils.ts b/packages/ssi-express-support/src/express-utils.ts
@@ -1,36 +1,43 @@
 import express, { NextFunction } from 'express'
 export function sendErrorResponse(response: express.Response, statusCode: number, message: string | object, error?: any) {
-  if (!message) {
+  let msg = message
+  if (!msg) {
     console.error('Message was null when calling sendErrorResponse. This should not happen')
-    message = 'An unexpected error occurred'
+    msg = 'An unexpected error occurred'
     statusCode = 500
   } else {
-    console.error(`sendErrorResponse: ${typeof message === 'string' ? message : JSON.stringify(message)}`)
+    console.error(`sendErrorResponse: ${typeof msg === 'string' ? msg : JSON.stringify(msg)}`)
   }
   if (error) {
-    console.error(JSON.stringify(error))
+    if (error instanceof Error) {
+      console.error(error.message)
+    }
+    console.error(`error: ${JSON.stringify(error)}`)
   }
-  if(statusCode == 500) {
+  if (statusCode === 500) {
     console.error(Error().stack)
   }
   if (response.headersSent) {
     console.error(`sendErrorResponse headers already sent`)
     return response
   }
   response.statusCode = statusCode
-  if (typeof message === 'string' && !message.startsWith('{')) {
-    message = { error: message }
+  if (typeof msg === 'string' && !msg.startsWith('{')) {
+    msg = { error: msg }
   }
-  if (typeof message === 'string' && message.startsWith('{')) {
+  if (typeof msg === 'string' && msg.startsWith('{')) {
     response.header('Content-Type', 'application/json')
-    return response.status(statusCode).end(message)
+    return response.status(statusCode).end(msg)
   }
-  return response.status(statusCode).json(message)
+  return response.status(statusCode).json(msg)
 }
 
 export const jsonErrorHandler = (err: any, req: express.Request, res: express.Response, next: NextFunction) => {
   const statusCode: number = 'statusCode' in err ? err.statusCode : 500
-  const errorMsg = typeof err === 'string' ? err : err.message ?? err
+  let errorMsg = typeof err === 'string' ? err : err.message ?? err
+  if (typeof errorMsg !== 'string') {
+    errorMsg = JSON.stringify(errorMsg)
+  }
   if (res.headersSent) {
     console.log('Headers already sent, when calling error handler. Will defer to next error handler')
     console.log(`Error was: ${JSON.stringify(err)}`)

diff --git a/packages/ssi-sdk-core/CHANGELOG.md b/packages/ssi-sdk-core/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.core
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-OpenSource/ssi-sdk/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.core

diff --git a/packages/ssi-sdk-core/src/utils/database.ts b/packages/ssi-sdk-core/src/utils/database.ts
@@ -3,8 +3,8 @@ export const flattenArray = <T>(args: { items: Array<T | Array<T>> }): Array<T>
 export const flattenMigrations = <T>(args: { migrations: Array<T | Array<T>> }): Array<T> => args.migrations.flat() as Array<T>
 
 type QueryRunnerType = {
-    query(query: string, parameters: any[] | undefined, useStructuredResult: true): Promise<any>
-    query(query: string, parameters?: any[]): Promise<any>
+  query(query: string, parameters: any[] | undefined, useStructuredResult: true): Promise<any>
+  query(query: string, parameters?: any[]): Promise<any>
 }
 
 /**

diff --git a/packages/ssi-types/CHANGELOG.md b/packages/ssi-types/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-types
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-OpenSource/ssi-sdk/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-types

diff --git a/packages/uni-resolver-registrar-api/CHANGELOG.md b/packages/uni-resolver-registrar-api/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.uni-resolver-registrar-api
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.uni-resolver-registrar-api

diff --git a/packages/vc-handler-ld-local/CHANGELOG.md b/packages/vc-handler-ld-local/CHANGELOG.md
@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.vc-handler-ld-local
 
-
-
-
-
 ## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.vc-handler-ld-local
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

		Note: Version bump only for package @sphereon/ssi-sdk.agent-config





		## [0.17.4](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.17.3...v0.17.4) (2023-10-01)

		Note: Version bump only for package @sphereon/ssi-sdk.agent-config
Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,8 @@ @@
       "references": [
         {
           "path": "../ssi-sdk-core"
-        }, {
+        },
+        {
           "path": "../ssi-types"
         }
       ]
@@ Expand Down @@