@sphereon/ssi-sdk.kms-rest-client 0.36.1-feature.SSISDK.82.and.SSISDK.70.35 → 0.36.1-next.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sphereon/ssi-sdk.kms-rest-client",
   "description": "contains the client side to call REST endpoints of a KMS server",
-  "version": "0.36.1-feature.SSISDK.82.and.SSISDK.70.35+b3c0abff",
+  "version": "0.36.1-next.11+262d209a",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -28,7 +28,7 @@
     "generate-plugin-schema": "tsx ../../packages/dev/bin/sphereon.js dev generate-plugin-schema"
   },
   "dependencies": {
-    "@sphereon/ssi-types": "0.36.1-feature.SSISDK.82.and.SSISDK.70.35+b3c0abff",
+    "@sphereon/ssi-types": "0.36.1-next.11+262d209a",
     "cross-fetch": "^3.1.8"
   },
   "devDependencies": {
@@ -56,5 +56,5 @@
     "KMS",
     "REST"
   ],
-  "gitHead": "b3c0abff5a63fc40d620b95888ce8fdd006b5d00"
+  "gitHead": "262d209a803fecfba1ad5878724c4f6f91f86cec"
 }

package/src/agent/KmsRestClient.ts

@@ -1,66 +1,66 @@
-import { Loggers } from '@sphereon/ssi-types'
 import { IAgentPlugin } from '@veramo/core'
+import { Loggers } from '@sphereon/ssi-types'
 import { fetch } from 'cross-fetch'
+import type {
+  kmsClientGetResolverArgs,
+  KmsClientListResolversArgs,
+  IKmsRestClient,
+  KmsClientResolveKeyArgs,
+  KmsClientCreateRawSignatureArgs,
+  KmsClientGetKeyArgs,
+  KmsClientListKeysArgs,
+  KmsClientStoreKeyArgs,
+  KmsClientGenerateKeyArgs,
+  KmsClientDeleteKeyArgs,
+  KmsClientGetKeyProviderArgs,
+  KmsClientListKeyProvidersArgs,
+  KmsClientProviderListKeysArgs,
+  KmsClientProviderStoreKeyArgs,
+  KmsClientProviderGenerateKeyArgs,
+  KmsClientProviderGetKeyArgs,
+  KmsClientProviderDeleteKeyArgs,
+  RestClientAuthenticationOpts,
+  KmsRestClientArgs,
+  KmsClientIsValidRawSignatureArgs,
+} from '../types/IKmsRestClient'
 import type {
   CreateRawSignature,
   CreateRawSignatureResponse,
   GenerateKey,
   GenerateKeyGlobal,
-  GenerateKeyResponse,
-  GetKeyResponse,
-  KeyProviderResponse,
   ListKeyProvidersResponse,
   ListKeysResponse,
   ListResolversResponse,
   ResolvedKeyInfo,
   ResolvePublicKey,
   Resolver,
+  VerifyRawSignatureResponse,
   StoreKey,
-  StoreKeyResponse,
   VerifyRawSignature,
-  VerifyRawSignatureResponse,
+  KeyProviderResponse,
+  GenerateKeyResponse,
+  StoreKeyResponse,
+  GetKeyResponse,
 } from '../models'
 import {
   CreateRawSignatureResponseFromJSONTyped,
   CreateRawSignatureToJSONTyped,
   GenerateKeyGlobalToJSONTyped,
-  GenerateKeyResponseFromJSONTyped,
   GenerateKeyToJSONTyped,
+  GenerateKeyResponseFromJSONTyped,
   GetKeyResponseFromJSONTyped,
   KeyProviderResponseFromJSONTyped,
   ListKeyProvidersResponseFromJSONTyped,
   ListKeysResponseFromJSONTyped,
   ListResolversResponseFromJSONTyped,
-  ResolvedKeyInfoFromJSONTyped,
   ResolvePublicKeyToJSONTyped,
+  ResolvedKeyInfoFromJSONTyped,
   ResolverFromJSONTyped,
-  StoreKeyResponseFromJSONTyped,
   StoreKeyToJSONTyped,
+  StoreKeyResponseFromJSONTyped,
   VerifyRawSignatureResponseFromJSONTyped,
   VerifyRawSignatureToJSONTyped,
 } from '../models'
-import {
-  IKmsRestClient,
-  KmsClientCreateRawSignatureArgs,
-  KmsClientDeleteKeyArgs,
-  KmsClientGenerateKeyArgs,
-  KmsClientGetKeyArgs,
-  KmsClientGetKeyProviderArgs,
-  KmsClientGetResolverArgs,
-  KmsClientIsValidRawSignatureArgs,
-  KmsClientListKeyProvidersArgs,
-  KmsClientListKeysArgs,
-  KmsClientListResolversArgs,
-  KmsClientProviderDeleteKeyArgs,
-  KmsClientProviderGenerateKeyArgs,
-  KmsClientProviderGetKeyArgs,
-  KmsClientProviderListKeysArgs,
-  KmsClientProviderStoreKeyArgs,
-  KmsClientResolveKeyArgs,
-  KmsClientStoreKeyArgs,
-  KmsRestClientArgs,
-  RestClientAuthenticationOpts,
-} from '../types/IKmsRestClient'
 
 const logger = Loggers.DEFAULT.get('sphereon:ssi-sdk:kms:rest-client')
 
@@ -106,13 +106,12 @@ export class KmsRestClient implements IAgentPlugin {
   }
 
   /** {@inheritDoc IKmsRestClient.kmsGetResolver} */
-  private async kmsClientGetResolver(args: KmsClientGetResolverArgs): Promise<Resolver> {
+  private async kmsClientGetResolver(args: kmsClientGetResolverArgs): Promise<Resolver> {
     const baseUrl = this.assertedAgentBaseUrl(args.baseUrl)
     const url = KmsRestClient.urlWithBase(`/resolvers/${args.resolverId}`, baseUrl)
 
     const response = await fetch(url, {
       method: 'GET',
-      headers: await this.createHeaders({ tenantId: args.tenantId, userId: args.userId }),
     })
     logger.debug(`get resolver response: ${response}`)
 
@@ -130,7 +129,6 @@ export class KmsRestClient implements IAgentPlugin {
 
     const response = await fetch(url, {
       method: 'GET',
-      headers: await this.createHeaders({ tenantId: args?.tenantId, userId: args?.userId }),
     })
     logger.debug(`list resolvers response: ${response}`)
 
@@ -154,7 +152,7 @@ export class KmsRestClient implements IAgentPlugin {
     } satisfies ResolvePublicKey
     const response = await fetch(url, {
       method: 'POST',
-      headers: await this.createHeaders({ contentType: 'application/json', tenantId: args.tenantId, userId: args.userId }),
+      headers: await this.createHeaders({ 'Content-Type': 'application/json' }),
       body: JSON.stringify(ResolvePublicKeyToJSONTyped(body)),
     })
     logger.debug(`resolve key response: ${response}`)
@@ -169,7 +167,7 @@ export class KmsRestClient implements IAgentPlugin {
   /** {@inheritDoc IKmsRestClient.kmsCreateRawSignature} */
   private async kmsClientCreateRawSignature(args: KmsClientCreateRawSignatureArgs): Promise<CreateRawSignatureResponse> {
     const baseUrl = this.assertedAgentBaseUrl(args.baseUrl)
-    const url = KmsRestClient.urlWithBase(`/signatures/raw/create`, baseUrl)
+    const url = KmsRestClient.urlWithBase(`/signatures/raw`, baseUrl)
 
     const body = {
       keyInfo: args.keyInfo,
@@ -177,7 +175,7 @@ export class KmsRestClient implements IAgentPlugin {
     } satisfies CreateRawSignature
     const response = await fetch(url, {
       method: 'POST',
-      headers: await this.createHeaders({ contentType: 'application/json', tenantId: args.tenantId, userId: args.userId }),
+      headers: await this.createHeaders({ 'Content-Type': 'application/json' }),
       body: JSON.stringify(CreateRawSignatureToJSONTyped(body)),
     })
     logger.debug(`create raw signature response: ${response}`)
@@ -201,7 +199,7 @@ export class KmsRestClient implements IAgentPlugin {
     } satisfies VerifyRawSignature
     const response = await fetch(url, {
       method: 'POST',
-      headers: await this.createHeaders({ contentType: 'application/json', tenantId: args.tenantId, userId: args.userId }),
+      headers: await this.createHeaders({ 'Content-Type': 'application/json' }),
       body: JSON.stringify(VerifyRawSignatureToJSONTyped(body)),
     })
     logger.debug(`verify raw signature response: ${response}`)
@@ -220,7 +218,6 @@ export class KmsRestClient implements IAgentPlugin {
 
     const response = await fetch(url, {
       method: 'GET',
-      headers: await this.createHeaders({ tenantId: args.tenantId, userId: args.userId }),
     })
     logger.debug(`get key response: ${response}`)
 
@@ -237,7 +234,6 @@ export class KmsRestClient implements IAgentPlugin {
     const url = this.addSearchParams(KmsRestClient.urlWithBase('/keys', baseUrl), { ...(args?.providerId && { providerId: args.providerId }) })
     const response = await fetch(url, {
       method: 'GET',
-      headers: await this.createHeaders({ tenantId: args?.tenantId, userId: args?.userId }),
     })
     logger.debug(`list keys response: ${response}`)
 
@@ -259,7 +255,7 @@ export class KmsRestClient implements IAgentPlugin {
     } satisfies StoreKey
     const response = await fetch(url, {
       method: 'POST',
-      headers: await this.createHeaders({ contentType: 'application/json', tenantId: args.tenantId, userId: args.userId }),
+      headers: await this.createHeaders({ 'Content-Type': 'application/json' }),
       body: JSON.stringify(StoreKeyToJSONTyped(body)),
     })
     logger.debug(`store key response: ${response}`)
@@ -284,7 +280,7 @@ export class KmsRestClient implements IAgentPlugin {
     } satisfies GenerateKeyGlobal
     const response = await fetch(url, {
       method: 'POST',
-      headers: await this.createHeaders({ contentType: 'application/json', tenantId: args.tenantId, userId: args.userId }),
+      headers: await this.createHeaders({ 'Content-Type': 'application/json' }),
       body: JSON.stringify(GenerateKeyGlobalToJSONTyped(body)),
     })
     logger.debug(`generate key response: ${response}`)
@@ -303,7 +299,6 @@ export class KmsRestClient implements IAgentPlugin {
 
     const response = await fetch(url, {
       method: 'DELETE',
-      headers: await this.createHeaders({ tenantId: args.tenantId, userId: args.userId }),
     })
     logger.debug(`delete key response: ${response}`)
 
@@ -321,7 +316,6 @@ export class KmsRestClient implements IAgentPlugin {
 
     const response = await fetch(url, {
       method: 'GET',
-      headers: await this.createHeaders({ tenantId: args.tenantId, userId: args.userId }),
     })
     logger.debug(`get provider response: ${response}`)
 
@@ -339,7 +333,6 @@ export class KmsRestClient implements IAgentPlugin {
 
     const response = await fetch(url, {
       method: 'GET',
-      headers: await this.createHeaders({ tenantId: args?.tenantId, userId: args?.userId }),
     })
     logger.debug(`list providers response: ${response}`)
 
@@ -357,7 +350,6 @@ export class KmsRestClient implements IAgentPlugin {
 
     const response = await fetch(url, {
       method: 'GET',
-      headers: await this.createHeaders({ tenantId: args.tenantId, userId: args.userId }),
     })
     logger.debug(`list provider keys response: ${response}`)
 
@@ -379,7 +371,7 @@ export class KmsRestClient implements IAgentPlugin {
     } satisfies StoreKey
     const response = await fetch(url, {
       method: 'POST',
-      headers: await this.createHeaders({ contentType: 'application/json', tenantId: args.tenantId, userId: args.userId }),
+      headers: await this.createHeaders({ 'Content-Type': 'application/json' }),
       body: JSON.stringify(StoreKeyToJSONTyped(body)),
     })
     logger.debug(`provider store key response: ${response}`)
@@ -404,7 +396,7 @@ export class KmsRestClient implements IAgentPlugin {
     } satisfies GenerateKey
     const response = await fetch(url, {
       method: 'POST',
-      headers: await this.createHeaders({ contentType: 'application/json', tenantId: args.tenantId, userId: args.userId }),
+      headers: await this.createHeaders({ 'Content-Type': 'application/json' }),
       body: JSON.stringify(GenerateKeyToJSONTyped(body)),
     })
     logger.debug(`provider generate key response: ${response}`)
@@ -423,7 +415,6 @@ export class KmsRestClient implements IAgentPlugin {
 
     const response = await fetch(url, {
       method: 'GET',
-      headers: await this.createHeaders({ tenantId: args.tenantId, userId: args.userId }),
     })
     logger.debug(`get provider key response: ${response}`)
 
@@ -441,7 +432,6 @@ export class KmsRestClient implements IAgentPlugin {
 
     const response = await fetch(url, {
       method: 'DELETE',
-      headers: await this.createHeaders({ tenantId: args.tenantId, userId: args.userId }),
     })
     logger.debug(`delete key response: ${response}`)
 
@@ -461,14 +451,11 @@ export class KmsRestClient implements IAgentPlugin {
     throw new Error('No base url has been provided')
   }
 
-  private async createHeaders(args?: { contentType?: string; tenantId?: string; userId?: string }): Promise<HeadersInit> {
+  private async createHeaders(existing?: Record<string, any>): Promise<HeadersInit> {
     const headers: HeadersInit = {
-      ...(args?.contentType ? { 'Content-Type': args.contentType } : {}),
-      ...(args?.tenantId ? { 'X-Tenant-ID': args.tenantId } : {}),
-      ...(args?.userId ? { 'X-User-ID': args.userId } : {}),
+      ...existing,
       Accept: 'application/json',
     }
-
     if (this.authOpts?.enabled === true) {
       if (!this.authOpts.bearerToken) {
         throw Error(`Cannot have authentication enabled, whilst not enabling static bearer tokens at this point`)

package/src/types/IKmsRestClient.ts

@@ -1,5 +1,5 @@
-import type { BearerTokenArg } from '@sphereon/ssi-types'
 import { IAgentContext, IPluginMethodMap } from '@veramo/core'
+import type { BearerTokenArg } from '@sphereon/ssi-types'
 import {
   CreateRawSignature,
   CreateRawSignatureResponse,
@@ -21,7 +21,7 @@ import {
 } from '../models'
 
 export interface IKmsRestClient extends IPluginMethodMap {
-  kmsClientGetResolver(args: KmsClientGetResolverArgs): Promise<Resolver>
+  kmsClientGetResolver(args: kmsClientGetResolverArgs): Promise<Resolver>
   kmsClientListResolvers(args?: KmsClientListResolversArgs): Promise<ListResolversResponse>
   kmsClientResolveKey(args: KmsClientResolveKeyArgs): Promise<ResolvedKeyInfo>
   kmsClientCreateRawSignature(args: KmsClientCreateRawSignatureArgs): Promise<CreateRawSignatureResponse>
@@ -40,69 +40,86 @@ export interface IKmsRestClient extends IPluginMethodMap {
   kmsClientProviderDeleteKey(args: KmsClientProviderDeleteKeyArgs): Promise<boolean>
 }
 
-export type BaseArgs = {
+export type KmsClientListResolversArgs = {
   baseUrl?: string
-  tenantId?: string
-  userId?: string
-}
-
-export type OptionalProviderContextArgs = BaseArgs & {
-  providerId?: string
 }
 
-export type ProviderContextArgs = BaseArgs & {
-  providerId: string
-}
-
-export type KmsClientListResolversArgs = BaseArgs
-
-export type KmsClientGetResolverArgs = BaseArgs & {
+export type kmsClientGetResolverArgs = {
+  baseUrl?: string
   resolverId: string
 }
 
-export type KmsClientResolveKeyArgs = BaseArgs & {
+export type KmsClientResolveKeyArgs = {
+  baseUrl?: string
   resolverId: String
 } & ResolvePublicKey
 
-export type KmsClientCreateRawSignatureArgs = BaseArgs & CreateRawSignature
+export type KmsClientCreateRawSignatureArgs = {
+  baseUrl?: string
+} & CreateRawSignature
 
-export type KmsClientIsValidRawSignatureArgs = BaseArgs & VerifyRawSignature
+export type KmsClientIsValidRawSignatureArgs = {
+  baseUrl?: string
+} & VerifyRawSignature
 
-export type KmsClientGetKeyArgs = BaseArgs &
-  OptionalProviderContextArgs & {
-    aliasOrKid: string
-  }
+export type KmsClientGetKeyArgs = {
+  baseUrl?: string
+  aliasOrKid: string
+}
 
-export type KmsClientListKeysArgs = BaseArgs & OptionalProviderContextArgs
+export type KmsClientListKeysArgs = {
+  baseUrl?: string
+  providerId?: string
+}
 
-export type KmsClientStoreKeyArgs = BaseArgs & StoreKey
+export type KmsClientStoreKeyArgs = {
+  baseUrl?: string
+} & StoreKey
 
-export type KmsClientGenerateKeyArgs = BaseArgs & OptionalProviderContextArgs & GenerateKeyGlobal
+export type KmsClientGenerateKeyArgs = {
+  baseUrl?: string
+} & GenerateKeyGlobal
 
-export type KmsClientDeleteKeyArgs = BaseArgs &
-  OptionalProviderContextArgs & {
-    aliasOrKid: string
-  }
+export type KmsClientDeleteKeyArgs = {
+  baseUrl?: string
+  aliasOrKid: string
+}
 
-export type KmsClientGetKeyProviderArgs = BaseArgs & ProviderContextArgs
+export type KmsClientGetKeyProviderArgs = {
+  baseUrl?: string
+  providerId: string
+}
 
-export type KmsClientListKeyProvidersArgs = BaseArgs
+export type KmsClientListKeyProvidersArgs = {
+  baseUrl?: string
+}
 
-export type KmsClientProviderListKeysArgs = BaseArgs & ProviderContextArgs
+export type KmsClientProviderListKeysArgs = {
+  baseUrl?: string
+  providerId: string
+}
 
-export type KmsClientProviderStoreKeyArgs = BaseArgs & ProviderContextArgs & StoreKey
+export type KmsClientProviderStoreKeyArgs = {
+  baseUrl?: string
+  providerId: string
+} & StoreKey
 
-export type KmsClientProviderGenerateKeyArgs = BaseArgs & ProviderContextArgs & GenerateKey
+export type KmsClientProviderGenerateKeyArgs = {
+  baseUrl?: string
+  providerId: string
+} & GenerateKey
 
-export type KmsClientProviderGetKeyArgs = BaseArgs &
-  ProviderContextArgs & {
-    aliasOrKid: string
-  }
+export type KmsClientProviderGetKeyArgs = {
+  baseUrl?: string
+  providerId: string
+  aliasOrKid: string
+}
 
-export type KmsClientProviderDeleteKeyArgs = BaseArgs &
-  ProviderContextArgs & {
-    aliasOrKid: string
-  }
+export type KmsClientProviderDeleteKeyArgs = {
+  baseUrl?: string
+  providerId: string
+  aliasOrKid: string
+}
 
 export type RestClientAuthenticationOpts = {
   enabled?: boolean