@sphereon/ssi-sdk-ext.jwt-service 0.24.1-unstable.130 → 0.24.1-unstable.133

package/src/agent/JwtService.ts

@@ -1,55 +1,111 @@
-import { IAgentPlugin } from '@veramo/core'
+import {IAgentPlugin} from '@veramo/core'
 import {
-  createJwsCompact,
-  CreateJwsCompactArgs,
-  CreateJwsFlattenedArgs,
-  CreateJwsJsonArgs,
-  createJwsJsonFlattened,
-  createJwsJsonGeneral,
-  IJwsValidationResult,
-  IJwtService,
-  IRequiredContext,
-  JwsCompactResult,
-  JwsJsonFlattened,
-  JwsJsonGeneral,
-  PreparedJwsObject,
-  prepareJwsObject,
-  schema,
-  verifyJws,
-  VerifyJwsArgs,
+    createJwsCompact,
+    CreateJwsCompactArgs,
+    CreateJwsFlattenedArgs,
+    CreateJwsJsonArgs,
+    createJwsJsonFlattened,
+    createJwsJsonGeneral,
+    DecryptJweCompactJwtArgs,
+    EncryptJweCompactJwtArgs,
+    IJwsValidationResult,
+    IJwtService,
+    IRequiredContext,
+    jweAlg,
+    jweEnc,
+    JwsJsonFlattened,
+    JwsJsonGeneral,
+    JwtCompactResult,
+    JwtLogger,
+    PreparedJwsObject,
+    prepareJwsObject,
+    schema,
+    verifyJws,
+    VerifyJwsArgs,
 } from '..'
+import {CompactJwtEncrypter} from "../functions/JWE";
+
+import * as u8a from 'uint8arrays'
 
 /**
  * @public
  */
 export class JwtService implements IAgentPlugin {
-  readonly schema = schema.IJwtService
-  readonly methods: IJwtService = {
-    jwtPrepareJws: this.jwtPrepareJws.bind(this),
-    jwtCreateJwsJsonGeneralSignature: this.jwtCreateJwsJsonGeneralSignature.bind(this),
-    jwtCreateJwsJsonFlattenedSignature: this.jwtCreateJwsJsonFlattenedSignature.bind(this),
-    jwtCreateJwsCompactSignature: this.jwtCreateJwsCompactSignature.bind(this),
-    jwtVerifyJwsSignature: this.jwtVerifyJwsSignature.bind(this),
-  }
-
-  private async jwtPrepareJws(args: CreateJwsJsonArgs, context: IRequiredContext): Promise<PreparedJwsObject> {
-    return await prepareJwsObject(args, context)
-  }
-
-  private async jwtCreateJwsJsonGeneralSignature(args: CreateJwsJsonArgs, context: IRequiredContext): Promise<JwsJsonGeneral> {
-    return await createJwsJsonGeneral(args, context)
-  }
-
-  private async jwtCreateJwsJsonFlattenedSignature(args: CreateJwsFlattenedArgs, context: IRequiredContext): Promise<JwsJsonFlattened> {
-    return await createJwsJsonFlattened(args, context)
-  }
-
-  private async jwtCreateJwsCompactSignature(args: CreateJwsCompactArgs, context: IRequiredContext): Promise<JwsCompactResult> {
-    // We wrap it in a json object for remote REST calls
-    return { jwt: await createJwsCompact(args, context) }
-  }
-
-  private async jwtVerifyJwsSignature(args: VerifyJwsArgs, context: IRequiredContext): Promise<IJwsValidationResult> {
-    return await verifyJws(args, context)
-  }
+    readonly schema = schema.IJwtService
+    readonly methods: IJwtService = {
+        jwtPrepareJws: this.jwtPrepareJws.bind(this),
+        jwtCreateJwsJsonGeneralSignature: this.jwtCreateJwsJsonGeneralSignature.bind(this),
+        jwtCreateJwsJsonFlattenedSignature: this.jwtCreateJwsJsonFlattenedSignature.bind(this),
+        jwtCreateJwsCompactSignature: this.jwtCreateJwsCompactSignature.bind(this),
+        jwtVerifyJwsSignature: this.jwtVerifyJwsSignature.bind(this),
+        jwtEncryptJweCompactJwt: this.jwtEncryptJweCompactJwt.bind(this),
+        jwtDecryptJweCompactJwt: this.jwtDecryptJweCompactJwt.bind(this)
+    }
+
+    private async jwtPrepareJws(args: CreateJwsJsonArgs, context: IRequiredContext): Promise<PreparedJwsObject> {
+        return await prepareJwsObject(args, context)
+    }
+
+    private async jwtCreateJwsJsonGeneralSignature(args: CreateJwsJsonArgs, context: IRequiredContext): Promise<JwsJsonGeneral> {
+        return await createJwsJsonGeneral(args, context)
+    }
+
+    private async jwtCreateJwsJsonFlattenedSignature(args: CreateJwsFlattenedArgs, context: IRequiredContext): Promise<JwsJsonFlattened> {
+        return await createJwsJsonFlattened(args, context)
+    }
+
+    private async jwtCreateJwsCompactSignature(args: CreateJwsCompactArgs, context: IRequiredContext): Promise<JwtCompactResult> {
+        // We wrap it in a json object for remote REST calls
+        return {jwt: await createJwsCompact(args, context)}
+    }
+
+    private async jwtVerifyJwsSignature(args: VerifyJwsArgs, context: IRequiredContext): Promise<IJwsValidationResult> {
+        return await verifyJws(args, context)
+    }
+
+    private async jwtEncryptJweCompactJwt(args: EncryptJweCompactJwtArgs, context: IRequiredContext): Promise<JwtCompactResult> {
+        const {payload, protectedHeader = {alg: args.alg, enc: args.enc}, recipientKey, issuer, expirationTime, audience} = args
+
+        console.log(JSON.stringify(args, null, 2))
+
+        const alg = jweAlg(args.alg) ?? jweAlg(protectedHeader.alg) ?? 'ECDH-ES'
+        const enc = jweEnc(args.enc) ?? jweEnc(protectedHeader.enc) ?? 'A256GCM'
+        const encJwks = recipientKey.jwks.length === 1 ? [recipientKey.jwks[0]] : recipientKey.jwks.filter(jwk => (jwk.kid && (jwk.kid === jwk.jwk.kid || jwk.kid === jwk.jwkThumbprint)) || jwk.jwk.use === 'enc')
+        if (encJwks.length === 0) {
+            return Promise.reject(Error(`No public JWK found that can be used to encrypt against`))
+        }
+        const jwkInfo = encJwks[0]
+        if (encJwks.length > 0) {
+            JwtLogger.warning(`More than one JWK with 'enc' usage found. Selected the first one as no 'kid' was provided`, encJwks)
+        }
+        if (jwkInfo.jwk.kty?.startsWith('EC') !== true || !alg.startsWith('ECDH')) {
+            return Promise.reject(Error(`Currently only ECDH-ES is supported for encryption. JWK alg ${jwkInfo.jwk.kty}, header alg ${alg}`)) // TODO: Probably we support way more already
+        }
+        const apuVal = protectedHeader.apu ?? args.apu
+        const apu = apuVal ? u8a.fromString(apuVal, 'base64url') : undefined
+        const apvVal = protectedHeader.apv ?? args.apv
+        const apv = apvVal ? u8a.fromString(apvVal, 'base64url') : undefined
+
+        const pubKey = await crypto.subtle.importKey('jwk', jwkInfo.jwk, {
+            name: 'ECDH',
+            namedCurve: 'P-256',
+        }, true, [])
+        const encrypter = new CompactJwtEncrypter({
+            enc,
+            alg,
+            keyManagementParams: {apu, apv},
+            key: pubKey,
+            issuer,
+            expirationTime,
+            audience
+        })
+
+        const jwe = await encrypter.encryptCompactJWT(payload, {})
+        return {jwt: jwe}
+    }
+
+    private async jwtDecryptJweCompactJwt(args: DecryptJweCompactJwtArgs, context: IRequiredContext): Promise<JwtCompactResult> {
+
+        return {jwt: "FIXME"}
+    }
 }

package/src/functions/JWE.ts

@@ -0,0 +1,358 @@
+import {defaultRandomSource, randomBytes, RandomSource} from '@stablelib/random'
+import {base64ToBytes, bytesToBase64url, decodeBase64url} from "@veramo/utils";
+import * as jose from "jose";
+import {JWEKeyManagementHeaderParameters, JWTDecryptOptions} from "jose";
+import type {KeyLike} from "jose/dist/types/types";
+import * as u8a from 'uint8arrays'
+import {
+    JweAlg,
+    JweAlgs,
+    JweEnc,
+    JweEncs,
+    JweHeader,
+    JweJsonGeneral,
+    JweProtectedHeader,
+    JweRecipient,
+    JweRecipientUnprotectedHeader,
+    JwsPayload
+} from "../types/IJwtService";
+
+
+export interface EncryptionResult {
+    ciphertext: Uint8Array
+    tag: Uint8Array
+    iv: Uint8Array
+    protectedHeader?: string
+    recipients?: JweRecipient[]
+    cek?: Uint8Array
+}
+
+
+export const generateContentEncryptionKey = async ({alg, randomSource = defaultRandomSource}: {
+    alg: JweEnc,
+    randomSource?: RandomSource
+}): Promise<Uint8Array> => {
+    let length: number
+    switch (alg) {
+        case "A128GCM":
+            length = 16
+            break
+        case "A192GCM":
+            length = 24
+            break
+        case "A128CBC-HS256":
+        case "A256GCM":
+            length = 32
+            break
+        case "A192CBC-HS384":
+            length = 48
+            break
+        case "A256CBC-HS512":
+            length = 64
+            break
+        default:
+            length = 32
+    }
+    return randomBytes(length, randomSource)
+}
+
+/*
+export const generateContentEncryptionKeyfdsdf = async ({type = 'Secp256r1', ...rest}: {
+    type?: Extract<TKeyType, 'Secp256r1' | 'RSA'>,
+    kms?: string
+}, context: IAgentContext<ISphereonKeyManager>): Promise<EphemeralPublicKey> => {
+
+    const kms = rest.kms ?? await context.agent.keyManagerGetDefaultKeyManagementSystem()
+    const key = await context.agent.keyManagerCreate({kms, type, opts: {ephemeral: true}})
+    const jwk = toJwkFromKey(key, {use: JwkKeyUse.Encryption, noKidThumbprint: true})
+}
+*/
+export interface JwtEncrypter {
+    alg: string
+    enc: string
+    encrypt: (payload: JwsPayload, protectedHeader: JweProtectedHeader, aad?: Uint8Array) => Promise<EncryptionResult>
+    encryptCek?: (cek: Uint8Array) => Promise<JweRecipient>
+}
+
+
+export interface JweEncrypter {
+    alg: string
+    enc: string
+    encrypt: (payload: Uint8Array, protectedHeader: JweProtectedHeader, aad?: Uint8Array) => Promise<EncryptionResult>
+    encryptCek?: (cek: Uint8Array) => Promise<JweRecipient>
+}
+
+export interface JweDecrypter {
+    alg: string
+    enc: string
+    decrypt: (sealed: Uint8Array, iv: Uint8Array, aad?: Uint8Array, recipient?: JweRecipient) => Promise<Uint8Array | null>
+}
+
+function jweAssertValid(jwe: JweJsonGeneral) {
+    if (!(jwe.protected && jwe.iv && jwe.ciphertext && jwe.tag)) {
+        throw Error('JWE is missing properties: protected, iv, ciphertext and/or tag')
+    }
+    if (jwe.recipients) {
+        jwe.recipients.map((recipient: JweRecipient) => {
+            if (!(recipient.header && recipient.encrypted_key)) {
+                throw Error('Malformed JWE recipients; no header and encrypted key present')
+            }
+        })
+    }
+}
+
+function jweEncode({ciphertext, tag, iv, protectedHeader, recipients, aad, unprotected}: EncryptionResult & {
+    aad?: Uint8Array,
+    unprotected?: JweHeader
+}): JweJsonGeneral {
+    if (!recipients || recipients.length === 0) {
+        throw Error(`No recipient found`)
+    }
+    return {
+        ...(unprotected && {unprotected}),
+        protected: <string>protectedHeader,
+        iv: bytesToBase64url(iv),
+        ciphertext: bytesToBase64url(ciphertext),
+        ...(tag && {tag: bytesToBase64url(tag)}),
+        ...(aad && {aad: bytesToBase64url(aad)}),
+        recipients
+    } satisfies JweJsonGeneral
+}
+
+export class CompactJwtEncrypter implements JweEncrypter {
+    private _alg: JweAlg | undefined;
+    private _enc: JweEnc | undefined;
+    private _keyManagementParams: JWEKeyManagementHeaderParameters | undefined
+    private recipientKey: Uint8Array | jose.KeyLike //,EphemeralPublicKey | BaseJWK;
+    private expirationTime
+    private issuer: string | undefined
+    private audience: string | string[] | undefined
+
+    constructor(args: {
+        key: Uint8Array | jose.KeyLike /*EphemeralPublicKey | BaseJWK*/,
+        alg?: JweAlg,
+        enc?: JweEnc,
+        keyManagementParams?: JWEKeyManagementHeaderParameters,
+        expirationTime?: number | string | Date
+        issuer?: string
+        audience?: string | string[]
+    }) {
+        if (args?.alg) {
+            this._alg = args.alg
+        }
+        if (args?.enc) {
+            this._enc = args.enc
+        }
+        this._keyManagementParams = args.keyManagementParams
+        this.recipientKey = args.key
+        this.expirationTime = args.expirationTime ?? '10 minutes'
+        this.issuer = args.issuer
+        this.audience = args.audience
+    }
+
+    get enc(): string {
+        if (!this._enc) {
+            throw Error(`enc not set`)
+        }
+        return this._enc;
+    }
+
+    set enc(value: JweEnc | string) {
+        // @ts-ignore
+        if (!JweEncs.includes(value)) {
+            throw Error(`invalid JWE enc value ${value}`)
+        }
+        this._enc = value as JweEnc;
+    }
+
+    get alg(): string {
+        if (!this._alg) {
+            throw Error(`alg not set`)
+        }
+        return this._alg;
+    }
+
+    set alg(value: JweAlg | string) {
+        // @ts-ignore
+        if (!JweAlgs.includes(value)) {
+            throw Error(`invalid JWE alg value ${value}`)
+        }
+        this._alg = value as JweAlg;
+    }
+
+    async encryptCompactJWT(
+        payload: JwsPayload,
+        jweProtectedHeader: JweProtectedHeader,
+        aad?: Uint8Array | undefined
+    ): Promise<string> {
+        const protectedHeader = {
+            ...jweProtectedHeader,
+            alg: jweProtectedHeader.alg ?? this._alg,
+            enc: jweProtectedHeader.enc ?? this._enc
+        }
+        if (!protectedHeader.alg || !protectedHeader.enc) {
+            return Promise.reject(Error(`no 'alg' or 'enc' value set for the protected JWE header!`))
+        }
+        this.enc = protectedHeader.enc
+        this.alg = protectedHeader.alg
+        if (payload.exp) {
+            this.expirationTime = payload.exp
+        }
+        if (payload.iss) {
+            this.issuer = payload.iss
+        }
+        if (payload.aud) {
+            this.audience = payload.aud
+        }
+        const encrypt = new jose.EncryptJWT(payload).setProtectedHeader({
+            ...protectedHeader,
+            alg: this.alg,
+            enc: this.enc
+        })
+        if (this._alg!.startsWith('ECDH')) {
+            if (!this._keyManagementParams) {
+                return Promise.reject(Error(`ECDH requires key management params`))
+            }
+            encrypt.setKeyManagementParameters(this._keyManagementParams!)
+        }
+        // We always set the expiration time for encrypted JWTs (values are set above)
+        encrypt.setExpirationTime(this.expirationTime)
+        if (this.issuer) {
+            encrypt.setIssuer(this.issuer)
+        }
+        if (this.audience) {
+            encrypt.setAudience(this.audience)
+        }
+        return await encrypt.encrypt(this.recipientKey)
+    }
+
+    public static async decryptCompactJWT(jwt: string, key: KeyLike | Uint8Array, options?: JWTDecryptOptions) {
+        return await jose.jwtDecrypt(jwt, key, options)
+    }
+
+    async encrypt(
+        payload: Uint8Array,
+        jweProtectedHeader: JweProtectedHeader,
+        aad?: Uint8Array | undefined
+    ): Promise<EncryptionResult> {
+        const jwt = await this.encryptCompactJWT(JSON.parse(u8a.toString(payload)), jweProtectedHeader, aad)
+        const [protectedHeader, encryptedKey, ivB64, payloadB64, tagB64,] = jwt.split('.')
+        //[jwe.protected, jwe.encrypted_key, jwe.iv, jwe.ciphertext, jwe.tag].join('.');
+        console.log(`FIXME: TO EncryptionResult`)
+
+        return {
+            protectedHeader,
+            tag: base64ToBytes(tagB64),
+            ciphertext: base64ToBytes(payloadB64),
+            iv: base64ToBytes(ivB64),
+            recipients: [
+
+                {
+                    //fixme
+                    // header: protectedHeader,
+                    ...(encryptedKey && { encrypted_key: encryptedKey})
+
+                }
+            ]
+        }
+
+    }
+
+    // encryptCek?: ((cek: Uint8Array) => Promise<JweRecipient>) | undefined;
+
+}
+
+export async function createJwe(
+    cleartext: Uint8Array,
+    encrypters: JweEncrypter[],
+    protectedHeader: JweProtectedHeader,
+    aad?: Uint8Array
+): Promise<JweJsonGeneral> {
+    if (encrypters.length === 0) {
+        throw Error('JWE needs at least 1 encryptor')
+    }
+    if (encrypters.find(enc => enc.alg === 'dir' || enc.alg === 'ECDH-ES')) {
+        if (encrypters.length !== 1) {
+            throw Error(`JWE can only do "dir" or "ECDH-ES" encryption with one key. ${encrypters.length} supplied`)
+        }
+        const encryptionResult = await encrypters[0].encrypt(cleartext, protectedHeader, aad)
+        return jweEncode({...encryptionResult, aad})
+    } else {
+        const tmpEnc = encrypters[0].enc
+        if (!encrypters.reduce((acc, encrypter) => acc && encrypter.enc === tmpEnc, true)) {
+            throw new Error('invalid_argument: Incompatible encrypters passed')
+        }
+        let cek: Uint8Array | undefined = undefined
+        let jwe: JweJsonGeneral | undefined = undefined
+        for (const encrypter of encrypters) {
+            if (!cek) {
+                const encryptionResult = await encrypter.encrypt(cleartext, protectedHeader, aad)
+                cek = encryptionResult.cek
+                jwe = jweEncode({...encryptionResult, aad})
+            } else {
+                const recipient = await encrypter.encryptCek?.(cek)
+                if (recipient) {
+                    jwe?.recipients?.push(recipient)
+                }
+            }
+        }
+        if (!jwe) {
+            throw Error(`No JWE constructed`)
+        }
+        return jwe
+    }
+}
+
+/**
+ * Merges all headers, so we get a unified header.
+ *
+ * @param protectedHeader
+ * @param unprotectedHeader
+ * @param recipientUnprotectedHeader
+ */
+export function jweMergeHeaders({protectedHeader, unprotectedHeader, recipientUnprotectedHeader}: {
+    protectedHeader?: JweProtectedHeader,
+    unprotectedHeader?: JweHeader,
+    recipientUnprotectedHeader?: JweRecipientUnprotectedHeader
+}): JweHeader {
+    // TODO: Check that all headers/params are disjoint!
+    const header = {...protectedHeader, ...unprotectedHeader, ...recipientUnprotectedHeader}
+
+    if (!header.alg || !header.enc) {
+        throw Error(`Either 'alg' or 'enc' are missing from the headers`)
+    }
+    return header as JweHeader
+}
+
+export async function decryptJwe(jwe: JweJsonGeneral, decrypter: JweDecrypter): Promise<Uint8Array> {
+    jweAssertValid(jwe)
+    const protectedHeader: JweProtectedHeader = JSON.parse(decodeBase64url(jwe.protected))
+    if (protectedHeader?.enc !== decrypter.enc) {
+        return Promise.reject(Error(`Decrypter enc '${decrypter.enc}' does not support header enc '${protectedHeader.enc}'`))
+    } else if (!jwe.tag) {
+        return Promise.reject(Error(`Decrypter enc '${decrypter.enc}' does not support header enc '${protectedHeader.enc}'`))
+    }
+    const sealed = toWebCryptoCiphertext(jwe.ciphertext, jwe.tag)
+    const aad = u8a.fromString(jwe.aad ? `${jwe.protected}.${jwe.aad}` : jwe.protected)
+    let cleartext = null
+    if (protectedHeader.alg === 'dir' && decrypter.alg === 'dir') {
+        cleartext = await decrypter.decrypt(sealed, base64ToBytes(jwe.iv), aad)
+    } else if (!jwe.recipients || jwe.recipients.length === 0) {
+        throw Error('missing recipients for JWE')
+    } else {
+        for (let i = 0; !cleartext && i < jwe.recipients.length; i++) {
+            const recipient: JweRecipient = jwe.recipients[i]
+            recipient.header = {...recipient.header, ...protectedHeader} as JweRecipientUnprotectedHeader
+            if (recipient.header.alg === decrypter.alg) {
+                cleartext = await decrypter.decrypt(sealed, base64ToBytes(jwe.iv), aad, recipient)
+            }
+        }
+    }
+    if (cleartext === null) throw new Error('failure: Failed to decrypt')
+    return cleartext
+}
+
+
+export function toWebCryptoCiphertext(ciphertext: string, tag: string): Uint8Array {
+    return u8a.concat([base64ToBytes(ciphertext), base64ToBytes(tag)])
+}

package/src/functions/index.ts

@@ -33,13 +33,13 @@ import {
   JwsJsonGeneral,
   JwsJsonGeneralWithIdentifiers,
   JwsJsonSignature, JwsJsonSignatureWithIdentifier,
-  JwtHeader,
-  JwtPayload,
+  JwsHeader,
+  JwsPayload,
   PreparedJwsObject,
-  VerifyJwsArgs,
+  VerifyJwsArgs, JweHeader,
 } from '../types/IJwtService'
 
-const payloadToBytes = (payload: string | JwtPayload | Uint8Array): Uint8Array => {
+const payloadToBytes = (payload: string | JwsPayload | Uint8Array): Uint8Array => {
   const isBytes = payload instanceof Uint8Array
   const isString = typeof payload === 'string'
   return isBytes ? payload : isString ? u8a.fromString(payload, 'base64url') : u8a.fromString(JSON.stringify(payload), 'utf-8')
@@ -50,7 +50,7 @@ export const prepareJwsObject = async (args: CreateJwsJsonArgs, context: IRequir
 
   const { noIdentifierInHeader = false } = issuer
   const identifier = await ensureManagedIdentifierResult(issuer, context)
-  await checkAndUpdateJwtHeader({ mode, identifier, noIdentifierInHeader, header: protectedHeader }, context)
+  await checkAndUpdateJwsHeader({ mode, identifier, noIdentifierInHeader, header: protectedHeader }, context)
   const isBytes = payload instanceof Uint8Array
   const isString = typeof payload === 'string'
   if (!isBytes && !isString) {
@@ -138,7 +138,7 @@ export const createJwsJsonGeneral = async (args: CreateJwsJsonArgs, context: IRe
  * @param context
  */
 
-export const checkAndUpdateJwtHeader = async (
+export const checkAndUpdateJwsHeader = async (
   {
     mode = 'auto',
     identifier,
@@ -148,7 +148,7 @@ export const checkAndUpdateJwtHeader = async (
     mode?: JwsIdentifierMode
     identifier: ManagedIdentifierResult
     noIdentifierInHeader?: boolean
-    header: JwtHeader
+    header: JwsHeader
   },
   context: IRequiredContext
 ) => {
@@ -179,7 +179,7 @@ const checkAndUpdateX5cHeader = async (
     identifier,
     noIdentifierInHeader = false,
   }: {
-    header: JwtHeader
+    header: JwsHeader | JweHeader
     identifier: ManagedIdentifierResult
     noIdentifierInHeader?: boolean
   },
@@ -208,7 +208,7 @@ const checkAndUpdateDidHeader = async (
     identifier,
     noIdentifierInHeader = false,
   }: {
-    header: JwtHeader
+    header: JwsHeader | JweHeader
     identifier: ManagedIdentifierResult
     noIdentifierInHeader?: boolean
   },
@@ -237,7 +237,7 @@ const checkAndUpdateJwkHeader = async (
     identifier,
     noIdentifierInHeader = false,
   }: {
-    header: JwtHeader
+    header: JwsHeader | JweHeader
     identifier: ManagedIdentifierResult
     noIdentifierInHeader?: boolean
   },
@@ -246,7 +246,7 @@ const checkAndUpdateJwkHeader = async (
   const { jwk } = header
   if (jwk) {
     // let's resolve the provided x5c to be sure
-    const jwkIdentifier = await context.agent.identifierManagedGetByJwk({ identifier: jwk })
+    const jwkIdentifier = await context.agent.identifierManagedGetByJwk({ identifier: jwk as JWK })
     if (jwkIdentifier.kmsKeyRef !== identifier.kmsKeyRef) {
       return Promise.reject(Error(`A jwk header was present, but its value did not match the provided signing jwk or kid!`))
     }
@@ -265,7 +265,7 @@ const checkAndUpdateKidHeader = async (
     identifier,
     noIdentifierInHeader = false,
   }: {
-    header: JwtHeader
+    header: JwsHeader | JweHeader
     identifier: ManagedIdentifierResult
     noIdentifierInHeader?: boolean
   },
@@ -376,7 +376,7 @@ export const toJwsJsonGeneral = async ({ jws }: { jws: Jws }, context: IAgentCon
 }
 
 async function resolveExternalIdentifierFromJwsHeader(
-  protectedHeader: JwtHeader,
+  protectedHeader: JwsHeader,
   context: IAgentContext<IIdentifierResolution>,
   args: {
     jws: Jws
@@ -422,7 +422,7 @@ export const toJwsJsonGeneralWithIdentifiers = async (
   const jws = await toJwsJsonGeneral(args, context)
   const signatures = (await Promise.all(
     jws.signatures.map(async (signature) => {
-      const protectedHeader: JwtHeader = decodeJoseBlob(signature.protected)
+      const protectedHeader: JwsHeader = decodeJoseBlob(signature.protected)
       const identifier = args.jwk
         ? await resolveExternalJwkIdentifier({ identifier: args.jwk }, context)
         : await resolveExternalIdentifierFromJwsHeader(protectedHeader, context, args)
@@ -432,6 +432,6 @@ export const toJwsJsonGeneralWithIdentifiers = async (
       return undefined
     })
   )).filter(signature => signature !== undefined ) as JwsJsonSignatureWithIdentifier[]
-  
+
   return { payload: jws.payload, signatures }
 }

package/src/index.ts

@@ -1,8 +1,12 @@
+import {Loggers} from "@sphereon/ssi-types";
+
 /**
  * @internal
  */
 const schema = require('../plugin.schema.json')
 export { schema }
+
+export const JwtLogger = Loggers.DEFAULT.get('sphereon:sdk:jwt')
 /**
  * @public
  */