@sphereon/ssi-sdk-ext.jwt-service 0.28.1-feature.esm.cjs.8 → 0.28.1-feature.oyd.cmsm.improv.16

package/src/agent/JwtService.ts

@@ -2,10 +2,7 @@ import { IAgentPlugin } from '@veramo/core'
 import debug from 'debug'
 import { importJWK } from 'jose'
 
-// @ts-ignore
-import { fromString } from 'uint8arrays/from-string'
-// @ts-ignore
-import { toString } from 'uint8arrays/to-string'
+import * as u8a from 'uint8arrays'
 import {
   createJwsCompact,
   CreateJwsCompactArgs,
@@ -91,9 +88,9 @@ export class JwtService implements IAgentPlugin {
         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 ? fromString(apuVal, 'base64url') : undefined
+      const apu = apuVal ? u8a.fromString(apuVal, 'base64url') : undefined
       const apvVal = protectedHeader.apv ?? args.apv
-      const apv = apvVal ? fromString(apvVal, 'base64url') : undefined
+      const apv = apvVal ? u8a.fromString(apvVal, 'base64url') : undefined
 
       const pubKey = await importJWK(jwkInfo.jwk)
       const encrypter = new CompactJwtEncrypter({

package/src/functions/JWE.ts

@@ -2,14 +2,8 @@ import { defaultRandomSource, randomBytes, RandomSource } from '@stablelib/rando
 import { base64ToBytes, bytesToBase64url, decodeBase64url } from '@veramo/utils'
 import * as jose from 'jose'
 import { JWEKeyManagementHeaderParameters, JWTDecryptOptions } from 'jose'
-// @ts-ignore
 import type { KeyLike } from 'jose/dist/types/types'
-// @ts-ignore
-import { fromString } from 'uint8arrays/from-string'
-// @ts-ignore
-import { toString } from 'uint8arrays/to-string'
-// @ts-ignore
-import { concat } from 'uint8arrays/concat'
+import * as u8a from 'uint8arrays'
 import {
   JweAlg,
   JweAlgs,
@@ -243,7 +237,7 @@ export class CompactJwtEncrypter implements JweEncrypter {
   }
 
   async encrypt(payload: Uint8Array, jweProtectedHeader: JweProtectedHeader, aad?: Uint8Array | undefined): Promise<EncryptionResult> {
-    const jwt = await this.encryptCompactJWT(JSON.parse(toString(payload)), jweProtectedHeader, aad)
+    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`)
@@ -341,7 +335,7 @@ export async function decryptJwe(jwe: JweJsonGeneral, decrypter: JweDecrypter):
     return Promise.reject(Error(`Decrypter enc '${decrypter.enc}' does not support header enc '${protectedHeader.enc}'`))
   }
   const sealed = toWebCryptoCiphertext(jwe.ciphertext, jwe.tag)
-  const aad = fromString(jwe.aad ? `${jwe.protected}.${jwe.aad}` : jwe.protected)
+  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)
@@ -361,5 +355,5 @@ export async function decryptJwe(jwe: JweJsonGeneral, decrypter: JweDecrypter):
 }
 
 export function toWebCryptoCiphertext(ciphertext: string, tag: string): Uint8Array {
-  return concat([base64ToBytes(ciphertext), base64ToBytes(tag)])
+  return u8a.concat([base64ToBytes(ciphertext), base64ToBytes(tag)])
 }

package/src/functions/index.ts

@@ -13,9 +13,7 @@ import { verifyRawSignature } from '@sphereon/ssi-sdk-ext.key-utils'
 import { JWK } from '@sphereon/ssi-types'
 import { IAgentContext } from '@veramo/core'
 import { base64ToBytes, bytesToBase64url, decodeJoseBlob, encodeJoseBlob } from '@veramo/utils'
-// @ts-ignore
-import { fromString } from 'uint8arrays/from-string'
-
+import * as u8a from 'uint8arrays'
 import {
   CreateJwsCompactArgs,
   CreateJwsFlattenedArgs,
@@ -43,7 +41,7 @@ import {
 const payloadToBytes = (payload: string | JwsPayload | Uint8Array): Uint8Array => {
   const isBytes = payload instanceof Uint8Array
   const isString = typeof payload === 'string'
-  return isBytes ? payload : isString ? fromString(payload, 'base64url') : fromString(JSON.stringify(payload), 'utf-8')
+  return isBytes ? payload : isString ? u8a.fromString(payload, 'base64url') : u8a.fromString(JSON.stringify(payload), 'utf-8')
 }
 
 export const prepareJwsObject = async (args: CreateJwsJsonArgs, context: IRequiredContext): Promise<PreparedJwsObject> => {
@@ -314,7 +312,7 @@ export const verifyJws = async (args: VerifyJwsArgs, context: IAgentContext<IIde
       // If we have a specific KMS agent plugin that can do the verification prefer that over the generic verification
       index++
       let valid: boolean
-      const data = fromString(`${sigWithId.protected}.${jws.payload}`, 'utf-8')
+      const data = u8a.fromString(`${sigWithId.protected}.${jws.payload}`, 'utf-8')
       const jwkInfo = sigWithId.identifier.jwks[0]
       /* if (sigWithId.header?.alg === 'RSA' && contextHasPlugin(context, 'keyManagerVerify')) {
         const publicKeyHex = jwkTtoPublicKeyHex(jwkInfo.jwk)