@sphereon/ssi-sdk.mdl-mdoc 0.34.1-feature.SSISDK.26.54 → 0.34.1-feature.SSISDK.26.RP.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.mdl-mdoc",
-  "version": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
+  "version": "0.34.1-feature.SSISDK.26.RP.55+29260bdc",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -30,11 +30,11 @@
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-sdk-ext.x509-utils": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.26.RP.55+29260bdc",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-feature.SSISDK.26.RP.55+29260bdc",
+    "@sphereon/ssi-sdk-ext.x509-utils": "0.34.1-feature.SSISDK.26.RP.55+29260bdc",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.26.RP.55+29260bdc",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.26.RP.55+29260bdc",
     "@veramo/core": "4.2.0",
     "@veramo/did-manager": "4.2.0",
     "@veramo/utils": "4.2.0",
@@ -49,12 +49,12 @@
   "devDependencies": {
     "@sphereon/oid4vci-client": "0.19.1-feature.SSISDK.13.32",
     "@sphereon/oid4vci-common": "0.19.1-feature.SSISDK.13.32",
-    "@sphereon/ssi-express-support": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-sdk-ext.key-manager": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-sdk-ext.kms-local": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
-    "@sphereon/ssi-sdk.public-key-hosting": "0.34.1-feature.SSISDK.26.54+bb6d50bb",
+    "@sphereon/ssi-express-support": "0.34.1-feature.SSISDK.26.RP.55+29260bdc",
+    "@sphereon/ssi-sdk-ext.key-manager": "0.34.1-feature.SSISDK.26.RP.55+29260bdc",
+    "@sphereon/ssi-sdk-ext.kms-local": "0.34.1-feature.SSISDK.26.RP.55+29260bdc",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.SSISDK.26.RP.55+29260bdc",
+    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.26.RP.55+29260bdc",
+    "@sphereon/ssi-sdk.public-key-hosting": "0.34.1-feature.SSISDK.26.RP.55+29260bdc",
     "@transmute/json-web-signature": "0.7.0-unstable.81",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
@@ -89,5 +89,5 @@
     "EBSI",
     "EBSI Authorization Client"
   ],
-  "gitHead": "bb6d50bb1ba7abdf1a04e0da27edfb9011abcc0e"
+  "gitHead": "29260bdcac297fcdfcb2bf2d2f51c31551571983"
 }

package/src/agent/mDLMdoc.ts

@@ -1,4 +1,4 @@
-import { com } from '@sphereon/kmp-mdoc-core'
+import * as mdoc from '@sphereon/kmp-mdoc-core'
 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'
@@ -121,7 +121,7 @@ export class MDLMdoc implements IAgentPlugin {
       presentationDefinition as IOid4VPPresentationDefinition,
     )
     const docsAndDescriptors: DocumentDescriptorMatchResult[] = []
-    let lastError: com.sphereon.crypto.generic.IVerifyResults<com.sphereon.crypto.cose.ICoseKeyCbor> | undefined = undefined
+    let lastError: mdoc.com.sphereon.crypto.generic.IVerifyResults<mdoc.com.sphereon.crypto.cose.ICoseKeyCbor> | undefined = undefined
     for (let match of allMatches) {
       if (match.document) {
         const result = await validate(match.document)
@@ -194,7 +194,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 = mdoc.com.sphereon.mdoc.data.device.DeviceResponseCbor.Static.cborDecode(decodeFrom(vp_token, Encoding.BASE64URL))
     if (!deviceResponse.documents) {
       return Promise.reject(Error(`No documents found in vp_token`))
     }
@@ -252,7 +252,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(),
+      mdoc.com.sphereon.crypto.cose.CoseSign1Json.Static.fromDTO(input).toCbor(),
       coseKeyInfo,
       requireX5Chain,
     )

package/src/functions/index.ts

@@ -1,4 +1,6 @@
-import { com, Nullable } from '@sphereon/kmp-mdoc-core'
+import * as mdoc from '@sphereon/kmp-mdoc-core'
+import { Nullable } from '@sphereon/kmp-mdoc-core'
+
 import { calculateJwkThumbprint, globalCrypto, verifyRawSignature } from '@sphereon/ssi-sdk-ext.key-utils'
 import {
   CertificateInfo,
@@ -16,24 +18,24 @@ import { Certificate, CryptoEngine, setEngine } from 'pkijs'
 import { fromString } from 'uint8arrays/from-string'
 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
+type CoseKeyCbor = mdoc.com.sphereon.crypto.cose.CoseKeyCbor
+type ICoseKeyCbor = mdoc.com.sphereon.crypto.cose.ICoseKeyCbor
+type ToBeSignedCbor = mdoc.com.sphereon.crypto.cose.ToBeSignedCbor
+const CoseJoseKeyMappingService = mdoc.com.sphereon.crypto.CoseJoseKeyMappingService
+type SignatureAlgorithm = mdoc.com.sphereon.crypto.generic.SignatureAlgorithm
+type ICoseCryptoCallbackJS = mdoc.com.sphereon.crypto.ICoseCryptoCallbackJS
+type IKey = mdoc.com.sphereon.crypto.IKey
+type IX509ServiceJS = mdoc.com.sphereon.crypto.IX509ServiceJS
+type Jwk = mdoc.com.sphereon.crypto.jose.Jwk
+const KeyInfo = mdoc.com.sphereon.crypto.KeyInfo
+type X509VerificationProfile = mdoc.com.sphereon.crypto.X509VerificationProfile
+const DateTimeUtils = mdoc.com.sphereon.kmp.DateTimeUtils
+const decodeFrom = mdoc.com.sphereon.kmp.decodeFrom
+const encodeTo = mdoc.com.sphereon.kmp.encodeTo
+const Encoding = mdoc.com.sphereon.kmp.Encoding
+type LocalDateTimeKMP = mdoc.com.sphereon.kmp.LocalDateTimeKMP
+const SignatureAlgorithm = mdoc.com.sphereon.crypto.generic.SignatureAlgorithm
+const DefaultCallbacks = mdoc.com.sphereon.crypto.DefaultCallbacks
 
 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 = mdoc.com.sphereon.crypto.ResolvedKeyInfo.Static.fromKeyInfo(keyInfo, key)
+      const jwkKeyInfo: mdoc.com.sphereon.crypto.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: mdoc.com.sphereon.crypto.cose.CoseSign1Cbor<CborType>,
+    keyInfo: mdoc.com.sphereon.crypto.IKeyInfo<ICoseKeyCbor>,
     requireX5Chain: Nullable<boolean>,
-  ): Promise<com.sphereon.crypto.generic.IVerifySignatureResult<ICoseKeyCbor>> {
+  ): Promise<mdoc.com.sphereon.crypto.generic.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 = mdoc.com.sphereon.crypto.cose.CoseKeyCbor.Static.fromDTO(coseKeyInfo.key)
     }
 
     const issuerCoseKeyInfo = new KeyInfo<CoseKeyCbor>(
@@ -154,12 +156,12 @@ 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 mdoc.com.sphereon.crypto.generic.IVerifySignatureResult<ICoseKeyCbor>
   }
 
-  resolvePublicKeyAsync<KT extends com.sphereon.crypto.IKey>(
-    keyInfo: com.sphereon.crypto.IKeyInfo<KT>,
-  ): Promise<com.sphereon.crypto.IResolvedKeyInfo<KT>> {
+  resolvePublicKeyAsync<KT extends mdoc.com.sphereon.crypto.IKey>(
+    keyInfo: mdoc.com.sphereon.crypto.IKeyInfo<KT>,
+  ): Promise<mdoc.com.sphereon.crypto.IResolvedKeyInfo<KT>> {
     if (keyInfo.key) {
       return Promise.resolve(CoseJoseKeyMappingService.toResolvedKeyInfo(keyInfo, keyInfo.key))
     }
@@ -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<mdoc.com.sphereon.crypto.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 mdoc.com.sphereon.crypto.IX509VerificationResult<KeyType>
   }
 
   setTrustedCerts = (trustedCertsInPEM?: Array<string>) => {

package/src/types/ImDLMdoc.ts

@@ -1,33 +1,33 @@
-import { com } from '@sphereon/kmp-mdoc-core'
+import * as mdoc from '@sphereon/kmp-mdoc-core'
 import { PresentationDefinitionV2, PresentationSubmission } from '@sphereon/pex-models'
 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
+export type IKey = mdoc.com.sphereon.crypto.IKey
+export type CoseSign1Json = mdoc.com.sphereon.crypto.cose.CoseSign1Json
+export type CoseSign1Cbor<Any> = mdoc.com.sphereon.crypto.cose.CoseSign1Cbor<Any>
+export type ICoseKeyCbor = mdoc.com.sphereon.crypto.cose.ICoseKeyCbor
+export type ICoseKeyJson = mdoc.com.sphereon.crypto.cose.ICoseKeyJson
+export type IKeyInfo<KT extends IKey = IKey> = mdoc.com.sphereon.crypto.IKeyInfo<KT>
+export type IVerifyResults<KT extends IKey> = mdoc.com.sphereon.crypto.generic.IVerifyResults<KT>
+export type IVerifySignatureResult<KT extends IKey> = mdoc.com.sphereon.crypto.generic.IVerifySignatureResult<KT>
+export type DocumentJson = mdoc.com.sphereon.mdoc.data.device.DocumentJson
+export type DocumentCbor = mdoc.com.sphereon.mdoc.data.device.DocumentCbor
+export const CborByteString = mdoc.com.sphereon.cbor.CborByteString
+export const CoseKeyCbor = mdoc.com.sphereon.crypto.cose.CoseKeyCbor
+export const CoseCryptoServiceJS = mdoc.com.sphereon.crypto.CoseCryptoServiceJS
+export const CoseJoseKeyMappingService = mdoc.com.sphereon.crypto.CoseJoseKeyMappingService
+export const KeyInfo = mdoc.com.sphereon.crypto.KeyInfo
+export const DateTimeUtils = mdoc.com.sphereon.kmp.DateTimeUtils
+export const decodeFrom = mdoc.com.sphereon.kmp.decodeFrom
+export const encodeTo = mdoc.com.sphereon.kmp.encodeTo
+export const Encoding = mdoc.com.sphereon.kmp.Encoding
+export const MdocValidations = mdoc.com.sphereon.mdoc.data.MdocValidations
+export const MdocOid4vpService = mdoc.com.sphereon.mdoc.oid4vp.MdocOid4vpServiceJs
+export const Jwk = mdoc.com.sphereon.crypto.jose.Jwk
+export type DocumentDescriptorMatchResult = mdoc.com.sphereon.mdoc.oid4vp.DocumentDescriptorMatchResult
+export type IOid4VPPresentationDefinition = mdoc.com.sphereon.mdoc.oid4vp.IOid4VPPresentationDefinition
+export const Oid4VPPresentationSubmission = mdoc.com.sphereon.mdoc.oid4vp.Oid4VPPresentationSubmission
 
 export interface ImDLMdoc extends IPluginMethodMap {
   // TODO: Extract cert methods to its own plugin