From 82901d810c31cbfefa6a9ad3e18c946da7ff7028 Mon Sep 17 00:00:00 2001 From: Niels Klomp Date: Sat, 30 Nov 2024 20:09:34 +0100 Subject: [PATCH] chore: fixes left over from extending key types. We cannot use them yet to generate --- packages/did-provider-key/src/SphereonKeyDidProvider.ts | 4 ++-- packages/key-utils/src/types/key-util-types.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/did-provider-key/src/SphereonKeyDidProvider.ts b/packages/did-provider-key/src/SphereonKeyDidProvider.ts index 3f81eed4..ffd44b40 100644 --- a/packages/did-provider-key/src/SphereonKeyDidProvider.ts +++ b/packages/did-provider-key/src/SphereonKeyDidProvider.ts @@ -49,7 +49,7 @@ export class SphereonKeyDidProvider extends AbstractIdentifierProvider { type?: TKeyType codecName?: 'EBSI' | 'jwk_jcs-pub' | Multicodec.CodecName key?: { - type?: TKeyType + type?: Exclude privateKeyHex: string } } @@ -59,7 +59,7 @@ export class SphereonKeyDidProvider extends AbstractIdentifierProvider { let codecName = (options?.codecName?.toUpperCase() === 'EBSI' ? (JWK_JCS_PUB_NAME as Multicodec.CodecName) : options?.codecName) as | CodeNameType | undefined - const keyType: TKeyType = options?.type ?? options?.key?.type ?? (codecName === JWK_JCS_PUB_NAME ? 'Secp256r1' : 'Secp256k1') + const keyType = (options?.type ?? options?.key?.type ?? (codecName === JWK_JCS_PUB_NAME ? 'Secp256r1' : 'Secp256k1')) as Exclude // console.log(`keytype: ${keyType}, codecName: ${codecName}`) const key = await importProvidedOrGeneratedKey( diff --git a/packages/key-utils/src/types/key-util-types.ts b/packages/key-utils/src/types/key-util-types.ts index 9695b690..1ab227a4 100644 --- a/packages/key-utils/src/types/key-util-types.ts +++ b/packages/key-utils/src/types/key-util-types.ts @@ -36,7 +36,7 @@ export interface IImportProvidedOrGeneratedKeyArgs { } export interface IKeyOpts { key?: Partial // Optional key to import with only privateKeyHex mandatory. If not specified a key with random kid will be created - type?: TKeyType // The key type. Defaults to Secp256k1 + type?: Exclude // The key type. Defaults to Secp256k1 use?: JwkKeyUse // The key use x509?: X509Opts }