@sphereon/ssi-sdk.mdl-mdoc 0.33.1-feature.vcdm2.tsup.32 → 0.33.1-next.2

package/src/agent/mDLMdoc.ts

@@ -3,31 +3,34 @@ import { calculateJwkThumbprint } from '@sphereon/ssi-sdk-ext.key-utils'
 import { CertificateInfo, getCertificateInfo, pemOrDerToX509Certificate, X509ValidationResult } from '@sphereon/ssi-sdk-ext.x509-utils'
 import { JWK } from '@sphereon/ssi-types'
 import { IAgentPlugin } from '@veramo/core'
-import { MdocOid4vpPresentArgs, MdocOid4VPPresentationAuth, MdocOid4vpRPVerifyArgs, MdocOid4vpRPVerifyResult, MdocOid4vpService, schema } from '..'
+import { MdocOid4vpPresentArgs, MdocOid4VPPresentationAuth, MdocOid4vpRPVerifyArgs, MdocOid4vpRPVerifyResult, schema } from '..'
 import { CoseCryptoService, X509CallbackService } from '../functions'
 import {
-  CborByteString,
-  CoseCryptoServiceJS,
-  CoseJoseKeyMappingService,
-  CoseKeyCbor,
-  DateTimeUtils,
-  decodeFrom,
-  DocumentCbor,
-  DocumentDescriptorMatchResult,
-  encodeTo,
-  Encoding,
   GetX509CertificateInfoArgs,
   ImDLMdoc,
-  IOid4VPPresentationDefinition,
   IRequiredContext,
-  IVerifySignatureResult,
-  KeyInfo,
   KeyType,
-  Oid4VPPresentationSubmission,
-  MdocValidations,
   MdocVerifyIssuerSignedArgs,
   VerifyCertificateChainArgs,
 } from '../types/ImDLMdoc'
+import CborByteString = com.sphereon.cbor.CborByteString
+import CoseKeyCbor = com.sphereon.crypto.cose.CoseKeyCbor
+import CoseSign1Json = com.sphereon.crypto.cose.CoseSign1Json
+import CoseCryptoServiceJS = com.sphereon.crypto.CoseCryptoServiceJS
+import CoseJoseKeyMappingService = com.sphereon.crypto.CoseJoseKeyMappingService
+import IVerifySignatureResult = com.sphereon.crypto.generic.IVerifySignatureResult
+import KeyInfo = com.sphereon.crypto.KeyInfo
+import DateTimeUtils = com.sphereon.kmp.DateTimeUtils
+import decodeFrom = com.sphereon.kmp.decodeFrom
+import encodeTo = com.sphereon.kmp.encodeTo
+import Encoding = com.sphereon.kmp.Encoding
+import DeviceResponseCbor = com.sphereon.mdoc.data.device.DeviceResponseCbor
+import DocumentCbor = com.sphereon.mdoc.data.device.DocumentCbor
+import MdocValidations = com.sphereon.mdoc.data.MdocValidations
+import DocumentDescriptorMatchResult = com.sphereon.mdoc.oid4vp.DocumentDescriptorMatchResult
+import IOid4VPPresentationDefinition = com.sphereon.mdoc.oid4vp.IOid4VPPresentationDefinition
+import MdocOid4vpService = com.sphereon.mdoc.oid4vp.MdocOid4vpServiceJs
+import Oid4VPPresentationSubmission = com.sphereon.mdoc.oid4vp.Oid4VPPresentationSubmission
 
 export const mdocSupportMethods: Array<string> = [
   'x509VerifyCertificateChain',
@@ -194,7 +197,7 @@ export class MDLMdoc implements IAgentPlugin {
    */
   private async mdocOid4vpRPVerify(args: MdocOid4vpRPVerifyArgs, _context: IRequiredContext): Promise<MdocOid4vpRPVerifyResult> {
     const { vp_token, presentation_submission, trustAnchors } = args
-    const deviceResponse = com.sphereon.mdoc.data.device.DeviceResponseCbor.Static.cborDecode(decodeFrom(vp_token, Encoding.BASE64URL))
+    const deviceResponse = DeviceResponseCbor.Static.cborDecode(decodeFrom(vp_token, Encoding.BASE64URL))
     if (!deviceResponse.documents) {
       return Promise.reject(Error(`No documents found in vp_token`))
     }
@@ -252,7 +255,7 @@ export class MDLMdoc implements IAgentPlugin {
     const { input, keyInfo, requireX5Chain } = args
     const coseKeyInfo = keyInfo && CoseJoseKeyMappingService.toCoseKeyInfo(keyInfo)
     const verification = await new CoseCryptoServiceJS(new CoseCryptoService(context)).verify1(
-      com.sphereon.crypto.cose.CoseSign1Json.Static.fromDTO(input).toCbor(),
+      CoseSign1Json.Static.fromDTO(input).toCbor(),
       coseKeyInfo,
       requireX5Chain,
     )

package/src/functions/index.ts

@@ -12,28 +12,30 @@ import {
 import { JWK } from '@sphereon/ssi-types'
 import * as crypto from 'crypto'
 import { Certificate, CryptoEngine, setEngine } from 'pkijs'
-// @ts-ignore
-import { fromString } from 'uint8arrays/from-string'
+import * as u8a from 'uint8arrays'
 import { IRequiredContext, VerifyCertificateChainArgs } from '../types/ImDLMdoc'
-
-type CoseKeyCbor = com.sphereon.crypto.cose.CoseKeyCbor
-type ICoseKeyCbor = com.sphereon.crypto.cose.ICoseKeyCbor
-type ToBeSignedCbor = com.sphereon.crypto.cose.ToBeSignedCbor
-const CoseJoseKeyMappingService = com.sphereon.crypto.CoseJoseKeyMappingService
-type SignatureAlgorithm = com.sphereon.crypto.generic.SignatureAlgorithm
-type ICoseCryptoCallbackJS = com.sphereon.crypto.ICoseCryptoCallbackJS
-type IKey = com.sphereon.crypto.IKey
-type IX509ServiceJS = com.sphereon.crypto.IX509ServiceJS
-type Jwk = com.sphereon.crypto.jose.Jwk
-const KeyInfo = com.sphereon.crypto.KeyInfo
-type X509VerificationProfile = com.sphereon.crypto.X509VerificationProfile
-const DateTimeUtils = com.sphereon.kmp.DateTimeUtils
-const decodeFrom = com.sphereon.kmp.decodeFrom
-const encodeTo = com.sphereon.kmp.encodeTo
-const Encoding = com.sphereon.kmp.Encoding
-type LocalDateTimeKMP = com.sphereon.kmp.LocalDateTimeKMP
-const SignatureAlgorithm = com.sphereon.crypto.generic.SignatureAlgorithm
-const DefaultCallbacks = com.sphereon.crypto.DefaultCallbacks
+import CoseKeyCbor = com.sphereon.crypto.cose.CoseKeyCbor
+import CoseSign1Cbor = com.sphereon.crypto.cose.CoseSign1Cbor
+import ICoseKeyCbor = com.sphereon.crypto.cose.ICoseKeyCbor
+import ToBeSignedCbor = com.sphereon.crypto.cose.ToBeSignedCbor
+import CoseJoseKeyMappingService = com.sphereon.crypto.CoseJoseKeyMappingService
+import DefaultCallbacks = com.sphereon.crypto.DefaultCallbacks
+import IVerifySignatureResult = com.sphereon.crypto.generic.IVerifySignatureResult
+import SignatureAlgorithm = com.sphereon.crypto.generic.SignatureAlgorithm
+import ICoseCryptoCallbackJS = com.sphereon.crypto.ICoseCryptoCallbackJS
+import IKey = com.sphereon.crypto.IKey
+import IKeyInfo = com.sphereon.crypto.IKeyInfo
+import IX509ServiceJS = com.sphereon.crypto.IX509ServiceJS
+import IX509VerificationResult = com.sphereon.crypto.IX509VerificationResult
+import Jwk = com.sphereon.crypto.jose.Jwk
+import KeyInfo = com.sphereon.crypto.KeyInfo
+import ResolvedKeyInfo = com.sphereon.crypto.ResolvedKeyInfo
+import X509VerificationProfile = com.sphereon.crypto.X509VerificationProfile
+import DateTimeUtils = com.sphereon.kmp.DateTimeUtils
+import decodeFrom = com.sphereon.kmp.decodeFrom
+import encodeTo = com.sphereon.kmp.encodeTo
+import Encoding = com.sphereon.kmp.Encoding
+import LocalDateTimeKMP = com.sphereon.kmp.LocalDateTimeKMP
 
 export class CoseCryptoService implements ICoseCryptoCallbackJS {
   constructor(private context?: IRequiredContext) {}
@@ -53,8 +55,8 @@ export class CoseCryptoService implements ICoseCryptoCallbackJS {
       if (key == null) {
         return Promise.reject(Error('No key present in keyInfo. This implementation cannot sign without a key!'))
       }
-      const resolvedKeyInfo = com.sphereon.crypto.ResolvedKeyInfo.Static.fromKeyInfo(keyInfo, key)
-      const jwkKeyInfo: com.sphereon.crypto.ResolvedKeyInfo<Jwk> = CoseJoseKeyMappingService.toResolvedJwkKeyInfo(resolvedKeyInfo)
+      const resolvedKeyInfo = ResolvedKeyInfo.Static.fromKeyInfo(keyInfo, key)
+      const jwkKeyInfo: ResolvedKeyInfo<Jwk> = CoseJoseKeyMappingService.toResolvedJwkKeyInfo(resolvedKeyInfo)
 
       const kid = jwkKeyInfo.kid ?? calculateJwkThumbprint({ jwk: jwkKeyInfo.key.toJsonDTO() }) ?? jwkKeyInfo.key.getKidAsString(true)
       if (!kid) {
@@ -72,10 +74,10 @@ export class CoseCryptoService implements ICoseCryptoCallbackJS {
   }
 
   async verify1Async<CborType>(
-    input: com.sphereon.crypto.cose.CoseSign1Cbor<CborType>,
-    keyInfo: com.sphereon.crypto.IKeyInfo<ICoseKeyCbor>,
+    input: CoseSign1Cbor<CborType>,
+    keyInfo: IKeyInfo<ICoseKeyCbor>,
     requireX5Chain: Nullable<boolean>,
-  ): Promise<com.sphereon.crypto.generic.IVerifySignatureResult<ICoseKeyCbor>> {
+  ): Promise<IVerifySignatureResult<ICoseKeyCbor>> {
     const getCertAndKey = async (
       x5c: Nullable<Array<string>>,
     ): Promise<{
@@ -126,7 +128,7 @@ export class CoseCryptoService implements ICoseCryptoCallbackJS {
       if (kid === null) {
         kid = coseKeyInfo.key.getKidAsString(false)
       }
-      issuerCoseKey = com.sphereon.crypto.cose.CoseKeyCbor.Static.fromDTO(coseKeyInfo.key)
+      issuerCoseKey = CoseKeyCbor.Static.fromDTO(coseKeyInfo.key)
     }
 
     const issuerCoseKeyInfo = new KeyInfo<CoseKeyCbor>(
@@ -143,8 +145,8 @@ export class CoseCryptoService implements ICoseCryptoCallbackJS {
     const recalculatedToBeSigned = input.toBeSignedJson(issuerCoseKeyInfo, SignatureAlgorithm.Static.fromCose(coseAlg))
     const key = CoseJoseKeyMappingService.toJoseJwk(issuerCoseKeyInfo.key!).toJsonDTO<JWK>()
     const valid = await verifyRawSignature({
-      data: fromString(recalculatedToBeSigned.base64UrlValue, 'base64url'),
-      signature: fromString(sign1Json.signature, 'base64url'),
+      data: u8a.fromString(recalculatedToBeSigned.base64UrlValue, 'base64url'),
+      signature: u8a.fromString(sign1Json.signature, 'base64url'),
       key,
     })
 
@@ -154,7 +156,7 @@ export class CoseCryptoService implements ICoseCryptoCallbackJS {
       error: !valid,
       message: `Signature of '${issuerCert ? getSubjectDN(issuerCert).DN : kid}' was ${valid ? '' : 'in'}valid`,
       keyInfo: issuerCoseKeyInfo,
-    } satisfies com.sphereon.crypto.generic.IVerifySignatureResult<ICoseKeyCbor>
+    } satisfies IVerifySignatureResult<ICoseKeyCbor>
   }
 
   resolvePublicKeyAsync<KT extends com.sphereon.crypto.IKey>(
@@ -210,7 +212,7 @@ export class X509CallbackService implements IX509ServiceJS {
     trustedCerts: Nullable<string[]>,
     verificationProfile?: X509VerificationProfile | undefined,
     verificationTime?: Nullable<LocalDateTimeKMP>,
-  ): Promise<com.sphereon.crypto.IX509VerificationResult<KeyType>> {
+  ): Promise<IX509VerificationResult<KeyType>> {
     const verificationAt = verificationTime ?? DateTimeUtils.Static.DEFAULT.dateTimeLocal()
     let chain: Array<string | Uint8Array> = []
     if (chainDER && chainDER.length > 0) {
@@ -236,7 +238,7 @@ export class X509CallbackService implements IX509ServiceJS {
       message: result.message,
       error: result.error,
       verificationTime: verificationAt,
-    } satisfies com.sphereon.crypto.IX509VerificationResult<KeyType>
+    } satisfies IX509VerificationResult<KeyType>
   }
 
   setTrustedCerts = (trustedCertsInPEM?: Array<string>) => {
@@ -253,12 +255,9 @@ export class X509CallbackService implements IX509ServiceJS {
 }
 
 const defaultCryptoEngine = () => {
-  // @ts-ignore
   if (typeof self !== 'undefined') {
-    // @ts-ignore
     if ('crypto' in self) {
       let engineName = 'webcrypto'
-      // @ts-ignore
       if ('webkitSubtle' in self.crypto) {
         engineName = 'safari'
       }

package/src/types/ImDLMdoc.ts

@@ -3,31 +3,14 @@ import { PresentationDefinitionV2, PresentationSubmission } from '@sphereon/pex-
 import { ISphereonKeyManager } from '@sphereon/ssi-sdk-ext.key-manager'
 import { CertificateInfo, SubjectAlternativeGeneralName, X509ValidationResult } from '@sphereon/ssi-sdk-ext.x509-utils'
 import { IAgentContext, IDIDManager, IPluginMethodMap, IResolver } from '@veramo/core'
-export type IKey = com.sphereon.crypto.IKey
-export type CoseSign1Json = com.sphereon.crypto.cose.CoseSign1Json
-export type CoseSign1Cbor<Any> = com.sphereon.crypto.cose.CoseSign1Cbor<Any>
-export type ICoseKeyCbor = com.sphereon.crypto.cose.ICoseKeyCbor
-export type ICoseKeyJson = com.sphereon.crypto.cose.ICoseKeyJson
-export type IKeyInfo<KT extends IKey = IKey> = com.sphereon.crypto.IKeyInfo<KT>
-export type IVerifyResults<KT extends IKey> = com.sphereon.crypto.generic.IVerifyResults<KT>
-export type IVerifySignatureResult<KT extends IKey> = com.sphereon.crypto.generic.IVerifySignatureResult<KT>
-export type DocumentJson = com.sphereon.mdoc.data.device.DocumentJson
-export type DocumentCbor = com.sphereon.mdoc.data.device.DocumentCbor
-export const CborByteString = com.sphereon.cbor.CborByteString
-export const CoseKeyCbor = com.sphereon.crypto.cose.CoseKeyCbor
-export const CoseCryptoServiceJS = com.sphereon.crypto.CoseCryptoServiceJS
-export const CoseJoseKeyMappingService = com.sphereon.crypto.CoseJoseKeyMappingService
-export const KeyInfo = com.sphereon.crypto.KeyInfo
-export const DateTimeUtils = com.sphereon.kmp.DateTimeUtils
-export const decodeFrom = com.sphereon.kmp.decodeFrom
-export const encodeTo = com.sphereon.kmp.encodeTo
-export const Encoding = com.sphereon.kmp.Encoding
-export const MdocValidations = com.sphereon.mdoc.data.MdocValidations
-export const MdocOid4vpService = com.sphereon.mdoc.oid4vp.MdocOid4vpServiceJs
-export const Jwk = com.sphereon.crypto.jose.Jwk
-export type DocumentDescriptorMatchResult = com.sphereon.mdoc.oid4vp.DocumentDescriptorMatchResult
-export type IOid4VPPresentationDefinition = com.sphereon.mdoc.oid4vp.IOid4VPPresentationDefinition
-export const Oid4VPPresentationSubmission = com.sphereon.mdoc.oid4vp.Oid4VPPresentationSubmission
+import CoseSign1Json = com.sphereon.crypto.cose.CoseSign1Json
+import ICoseKeyCbor = com.sphereon.crypto.cose.ICoseKeyCbor
+import ICoseKeyJson = com.sphereon.crypto.cose.ICoseKeyJson
+import IKeyInfo = com.sphereon.crypto.IKeyInfo
+import IVerifyResults = com.sphereon.crypto.generic.IVerifyResults
+import IVerifySignatureResult = com.sphereon.crypto.generic.IVerifySignatureResult
+import DocumentJson = com.sphereon.mdoc.data.device.DocumentJson
+import DocumentCbor = com.sphereon.mdoc.data.device.DocumentCbor
 
 export interface ImDLMdoc extends IPluginMethodMap {
   // TODO: Extract cert methods to its own plugin