fix: more things

Signed-off-by: Martin Auer <martin.auer97@gmail.com>

packages/core/src/modules/mdoc/Mdoc.ts

@@ -82,9 +82,7 @@ export class Mdoc {
   }
 
   public static fromIssuerSignedBase64(issuerSignedBase64: string) {
-    const hexEncodedMdoc = TypedArrayEncoder.fromBase64(issuerSignedBase64).toString('hex')
-
-    return this.fromIssuerSignedHex(hexEncodedMdoc)
+    return new Mdoc(TypedArrayEncoder.fromBase64(issuerSignedBase64))
   }
 
   public get issuerSignedHex() {
@@ -100,8 +98,12 @@ export class Mdoc {
 
     const cryptoServiceJS = com.sphereon.crypto.CryptoServiceJS
 
-    // TODO: This way of of registering and working with the x509/cose services is subject to race-conditions
-    // TODO: This is a known issue and beeing worked on by sphereon
+    if (agentContext.contextCorrelationId !== 'default') {
+      // TODO: This way of of registering and working with the x509/cose services is subject to race-conditions
+      // TODO: This is a known issue and beeing worked on by sphereon
+      throw new MdocError('Multitenancy is currently not supported for Mdoc.')
+    }
+
     cryptoServiceJS.X509.register(new MdocX509CallbackService(agentContext, trustedCertificates))
     cryptoServiceJS.COSE.register(new MdocCoseCallbackService(agentContext))
 

packages/core/src/modules/mdoc/MdocModule.ts

@@ -13,7 +13,7 @@ export class MdocModule implements Module {
   public readonly api = MdocApi
 
   /**
-   * Registers the dependencies of the sd-jwt-vc module on the dependency manager.
+   * Registers the dependencies of the mdoc module on the dependency manager.
    */
   public register(dependencyManager: DependencyManager) {
     // Warn about experimental module

packages/core/src/modules/mdoc/MdocOptions.ts

@@ -2,4 +2,5 @@ import type { Mdoc } from './Mdoc'
 
 export type MdocVerifyOptions = {
   mdoc: Mdoc
+  trustedCertificates?: [string, ...string[]]
 }

packages/core/src/modules/mdoc/MdocService.ts

@@ -32,8 +32,11 @@ export class MdocService {
     return Mdoc.fromIssuerSignedHex(hexEncodedMdoc)
   }
 
-  public async verify(agentContext: AgentContext, { mdoc }: MdocVerifyOptions) {
-    const { trustedCertificates } = agentContext.dependencyManager.resolve(X509ModuleConfig)
+  public async verify(agentContext: AgentContext, options: MdocVerifyOptions) {
+    const { mdoc } = options
+    const trustedCertificates =
+      options.trustedCertificates ?? agentContext.dependencyManager.resolve(X509ModuleConfig).trustedCertificates
+
     if (!trustedCertificates) {
       throw new MdocError('Mdoc Verification failed. Missing trusted certificates.')
     }

packages/core/src/modules/mdoc/__tests__/mdoc.service.test.ts

@@ -20,30 +20,11 @@ describe('mdoc service test', () => {
     expect(namespaces).toBeDefined()
     const eudiPidNamespace = namespaces['eu.europa.ec.eudi.pid.1']
     expect(eudiPidNamespace).toBeDefined()
+    // TODO: ADD checks once sphereno fixed the namespace structure
     //expect(Object.keys(eudiPidNamespace)).toHaveLength(22)
     //expect(eudiPidNamespace['family_name']).toEqual('MUSTERMANN')
   })
 
-  test('can verify mdl.me Issuer Signed structure', async () => {
-    //const decodedJson = decode(
-    //TypedArrayEncoder.fromHex(
-    //'b900036776657273696f6e63312e3069646f63756d656e747381b9000367646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6c6973737565725369676e6564b900026a6e616d65537061636573b90001716f72672e69736f2e31383031332e352e318cd8185867b90004686469676573744944006672616e646f6d5820e489ebe4d99b1edbaabae79bd495eff428c7fdd20a75ddb1eef50e89cbe8abea71656c656d656e744964656e7469666965726b66616d696c795f6e616d656c656c656d656e7456616c756565536d697468d8185865b90004686469676573744944016672616e646f6d5820e0ee8716f75224b2e390c1af93814a6b2e64a4297bea2e0fe0fe27215e0642bd71656c656d656e744964656e7469666965726a676976656e5f6e616d656c656c656d656e7456616c7565644a6f686ed818586eb90004686469676573744944026672616e646f6d5820765c155e4a2e3f5e26aca6dc2af1059e762ca71d9fea700622b1a0cd9f4a5f7771656c656d656e744964656e7469666965726a62697274685f646174656c656c656d656e7456616c7565d903ec6a313938302d30362d3135d818586eb90004686469676573744944036672616e646f6d5820736033cbe053f4d2b28a9e5d48a0299b821b38af7052e2c519ac9e33a5377c5d71656c656d656e744964656e7469666965726a69737375655f646174656c656c656d656e7456616c7565d903ec6a323032332d30332d3031d818586fb90004686469676573744944046672616e646f6d5820c12f1094c34862f43ba502b8094d36571ec0df4ebe7f6814b6ec074695161faa71656c656d656e744964656e7469666965726b6578706972795f646174656c656c656d656e7456616c7565d903ec6a323032382d30332d3331d8185868b90004686469676573744944056672616e646f6d58207f2860fc7e2673e7b41c23fda4ead48b4db8f510a1af5e6d65bca8ecda07ec2f71656c656d656e744964656e7469666965726f69737375696e675f636f756e7472796c656c656d656e7456616c7565625553d818586eb90004686469676573744944066672616e646f6d582054d91d9de971d05bd611a4b60d43d3d4b88eeb495bf9983febb1ba047967121771656c656d656e744964656e7469666965727169737375696e675f617574686f726974796c656c656d656e7456616c7565664e5920444d56d8185873b90004686469676573744944076672616e646f6d5820aee2dd131c8a000cd234ed842ce1b4cf13d5abd801278ff76b7cd35a4610850571656c656d656e744964656e7469666965727469737375696e675f6a7572697364696374696f6e6c656c656d656e7456616c7565684e657720596f726bd8185871b90004686469676573744944086672616e646f6d5820694798e9920715f2821ed477e08bec5884d8c73aa06ec59b083e62db81bce69671656c656d656e744964656e7469666965726f646f63756d656e745f6e756d6265726c656c656d656e7456616c75656b30312d3333332d37303730d8185863b90004686469676573744944096672616e646f6d58207f3e751dd77f62af8719abb1dd547a34dff4536ce5dc7a0dfbce5bea64b5dc2871656c656d656e744964656e74696669657268706f7274726169746c656c656d656e7456616c75656462737472d81858b1b900046864696765737449440a6672616e646f6d5820c974f2750b1108e3aa424e0f2f2d75862b4fe3905926c4ef38a9049830a794e671656c656d656e744964656e7469666965727264726976696e675f70726976696c656765736c656c656d656e7456616c756581b900037576656869636c655f63617465676f72795f636f646561436a69737375655f646174656a323032332d30332d30316b6578706972795f646174656a323032382d30332d3331d818587ab900046864696765737449440b6672616e646f6d5820732a551ca3a640f54225fb327f8b2be11ef5a6abc4e84b11a120abc27189425d71656c656d656e744964656e74696669657276756e5f64697374696e6775697368696e675f7369676e6c656c656d656e7456616c75656d7462642d75732e6e792e646d766a697373756572417574688443a10126a20442313118218159022e3082022a308201d0a003020102021457c6ccd308bde43eca3744f2a87138dabbb884e8300a06082a8648ce3d0403023053310b30090603550406130255533111300f06035504080c084e657720596f726b310f300d06035504070c06416c62616e79310f300d060355040a0c064e5920444d56310f300d060355040b0c064e5920444d56301e170d3233303931343134353531385a170d3333303931313134353531385a3053310b30090603550406130255533111300f06035504080c084e657720596f726b310f300d06035504070c06416c62616e79310f300d060355040a0c064e5920444d56310f300d060355040b0c064e5920444d563059301306072a8648ce3d020106082a8648ce3d03010703420004893c2d8347906dc6cd69b7f636af4bfd533f96184f0aadacd10830da4471dbdb60ac170d1cfc534fae2d9dcd488f7747fdf978d925ea31e9e9083c382ba9ed53a38181307f301d0603551d0e04160414ab6d2e03b91d492240338fbccadefd9333eaf6c7301f0603551d23041830168014ab6d2e03b91d492240338fbccadefd9333eaf6c7300f0603551d130101ff040530030101ff302c06096086480186f842010d041f161d4f70656e53534c2047656e657261746564204365727469666963617465300a06082a8648ce3d0403020348003045022009fd0cab97b03e78f64e74d7dcee88668c476a0afc5aa2cebffe07d3be772ea9022100da38abc98a080f49f24ffece1fffc8a6cdd5b2c0b5da8fc7b767ac3a95dcb83e590319d818590314b900066776657273696f6e63312e306f646967657374416c676f726974686d675348412d3235366c76616c756544696765737473b900026f6f72672e637573746f6d2e74657374a10058209a5d928fdfd31cd8856843d4eb7697d2562dcc47d428067e81700ea3ada7cac4716f72672e69736f2e31383031332e352e31ac0058205c204814d6d07f82254f9a168cec60aba73d0519a29f695da989bcbfc4678e7201582017cbff2ffef61cd276e0b76a9370d56e1c4aef284a79f5bc0a5d1faa5fd0148602582021e81173edf1ea33735093b33e486b6b2dc84b5735856ad022512eeda240a9fc035820c902c1d90f5583f223f353938c460c5fa11553ee77034e69e78c992e1a94bc06045820820caae12904ac2e1220b4b5def9732f46f3e7ecb74a047f853c98420377ea08055820e0ae15e29966cb09cbfe17bde19be10742cf268c3d232f049a198569571c4d7206582065240ccb8948c8a369d81365e7d55e2e5ef8a42f11a135d9532919600ab5f5d6075820820917290ab590c12c5183f250599c7b28610428a7fe02d5f7bfba5e0b7dd6ad0858205c2826bb301e3e984345679cd9de551627a8c9d8b8f3fd929f7e9b65139e46c2095820356abf222eff02e18792888c695a4d39180f8ae3af4e6abaea3c298312445c950a582079d4076a45e341ce9b2ef73a028c7e1d0de3bd41911fa5fc1e5a6f2225472d8c0b5820bb28a9c7003d5dadf82f56944636ff68ffd44686169f0afe597cea95d6bfd3d26d6465766963654b6579496e666fb90001696465766963654b6579a40102215820881879ca7a238b19bf0f4c1f8c00e9a2e19ba7a6f73eae92b851d4de1b508559225820a314b538039127b5cd50735f54519e33c134450545c5603ad9f263facc56d377200167646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6c76616c6964697479496e666fb90003667369676e6564c074323032332d30392d32365431373a31313a31385a6976616c696446726f6dc074323032332d30392d32365431373a31313a31385a6a76616c6964556e74696cc074323037332d30392d32365431373a31313a31385a5840a93de9b2b72375033066c4f3a5eb135e6866ce425c4d7a9de334a2fff06fc79c324081824b3bcd471a32936a52ba4fa2e47666461841f26b027e88de41becb946c6465766963655369676e6564b900026a6e616d65537061636573d81843b900006a64657669636541757468b900016f6465766963655369676e61747572658443a10126a10442313158d4d81858d0847444657669636541757468656e7469636174696f6e83f6f68466313233343536782b437131616e506238765a55356a354330643768637362754a4c4270496177554a4944515269324562776234785c687474703a2f2f6c6f63616c686f73743a343030302f6170692f70726573656e746174696f6e5f726571756573742f64633839393964662d643665612d346338342d393938352d3337613862383161383265632f63616c6c6261636b6761626364656667756f72672e69736f2e31383031332e352e312e6d444cd81843b900005840c944b61ef99e49251a8660da564eb9188dc19530dec7dda6fe57aebf768257bea761fba4c9555f4d3d0d3832fc2a5a714818143858eaa9072b6592e78e52c7006673746174757300'
-    //)
-    //)
-    //const issuerSigned = decodedJson.documents[0].issuerSigned
-
-    //const base64UrlEncodedIssuerSignedStructured = TypedArrayEncoder.toBase64(encode(issuerSigned))
-    const base64UrlEncodedIssuerSignedStructured =
-      'uQACam5hbWVTcGFjZXO5AAFxb3JnLmlzby4xODAxMy41LjGM2BhYZ7kABGhkaWdlc3RJRABmcmFuZG9tWCDkievk2Zse26q655vUle/0KMf90gp13bHu9Q6Jy+ir6nFlbGVtZW50SWRlbnRpZmllcmtmYW1pbHlfbmFtZWxlbGVtZW50VmFsdWVlU21pdGjYGFhluQAEaGRpZ2VzdElEAWZyYW5kb21YIODuhxb3UiSy45DBr5OBSmsuZKQpe+ouD+D+JyFeBkK9cWVsZW1lbnRJZGVudGlmaWVyamdpdmVuX25hbWVsZWxlbWVudFZhbHVlZEpvaG7YGFhuuQAEaGRpZ2VzdElEAmZyYW5kb21YIHZcFV5KLj9eJqym3CrxBZ52LKcdn+pwBiKxoM2fSl93cWVsZW1lbnRJZGVudGlmaWVyamJpcnRoX2RhdGVsZWxlbWVudFZhbHVl2QPsajE5ODAtMDYtMTXYGFhuuQAEaGRpZ2VzdElEA2ZyYW5kb21YIHNgM8vgU/TSsoqeXUigKZuCGzivcFLixRmsnjOlN3xdcWVsZW1lbnRJZGVudGlmaWVyamlzc3VlX2RhdGVsZWxlbWVudFZhbHVl2QPsajIwMjMtMDMtMDHYGFhvuQAEaGRpZ2VzdElEBGZyYW5kb21YIMEvEJTDSGL0O6UCuAlNNlcewN9Ovn9oFLbsB0aVFh+qcWVsZW1lbnRJZGVudGlmaWVya2V4cGlyeV9kYXRlbGVsZW1lbnRWYWx1ZdkD7GoyMDI4LTAzLTMx2BhYaLkABGhkaWdlc3RJRAVmcmFuZG9tWCB/KGD8fiZz57QcI/2k6tSLTbj1EKGvXm1lvKjs2gfsL3FlbGVtZW50SWRlbnRpZmllcm9pc3N1aW5nX2NvdW50cnlsZWxlbWVudFZhbHVlYlVT2BhYbrkABGhkaWdlc3RJRAZmcmFuZG9tWCBU2R2d6XHQW9YRpLYNQ9PUuI7rSVv5mD/rsboEeWcSF3FlbGVtZW50SWRlbnRpZmllcnFpc3N1aW5nX2F1dGhvcml0eWxlbGVtZW50VmFsdWVmTlkgRE1W2BhYc7kABGhkaWdlc3RJRAdmcmFuZG9tWCCu4t0THIoADNI07YQs4bTPE9Wr2AEnj/drfNNaRhCFBXFlbGVtZW50SWRlbnRpZmllcnRpc3N1aW5nX2p1cmlzZGljdGlvbmxlbGVtZW50VmFsdWVoTmV3IFlvcmvYGFhxuQAEaGRpZ2VzdElECGZyYW5kb21YIGlHmOmSBxXygh7Ud+CL7FiE2Mc6oG7Fmwg+YtuBvOaWcWVsZW1lbnRJZGVudGlmaWVyb2RvY3VtZW50X251bWJlcmxlbGVtZW50VmFsdWVrMDEtMzMzLTcwNzDYGFhjuQAEaGRpZ2VzdElECWZyYW5kb21YIH8+dR3Xf2Kvhxmrsd1UejTf9FNs5dx6DfvOW+pktdwocWVsZW1lbnRJZGVudGlmaWVyaHBvcnRyYWl0bGVsZW1lbnRWYWx1ZWRic3Ry2BhYsbkABGhkaWdlc3RJRApmcmFuZG9tWCDJdPJ1CxEI46pCTg8vLXWGK0/jkFkmxO84qQSYMKeU5nFlbGVtZW50SWRlbnRpZmllcnJkcml2aW5nX3ByaXZpbGVnZXNsZWxlbWVudFZhbHVlgbkAA3V2ZWhpY2xlX2NhdGVnb3J5X2NvZGVhQ2ppc3N1ZV9kYXRlajIwMjMtMDMtMDFrZXhwaXJ5X2RhdGVqMjAyOC0wMy0zMdgYWHq5AARoZGlnZXN0SUQLZnJhbmRvbVggcypVHKOmQPVCJfsyf4sr4R71pqvE6EsRoSCrwnGJQl1xZWxlbWVudElkZW50aWZpZXJ2dW5fZGlzdGluZ3Vpc2hpbmdfc2lnbmxlbGVtZW50VmFsdWVtdGJkLXVzLm55LmRtdmppc3N1ZXJBdXRohEOhASa5AAJhNEIxMWIzM4FZAi4wggIqMIIB0KADAgECAhRXxszTCL3kPso3RPKocTjau7iE6DAKBggqhkjOPQQDAjBTMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxDzANBgNVBAcMBkFsYmFueTEPMA0GA1UECgwGTlkgRE1WMQ8wDQYDVQQLDAZOWSBETVYwHhcNMjMwOTE0MTQ1NTE4WhcNMzMwOTExMTQ1NTE4WjBTMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxDzANBgNVBAcMBkFsYmFueTEPMA0GA1UECgwGTlkgRE1WMQ8wDQYDVQQLDAZOWSBETVYwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASJPC2DR5Btxs1pt/Y2r0v9Uz+WGE8KrazRCDDaRHHb22CsFw0c/FNPri2dzUiPd0f9+XjZJeox6ekIPDgrqe1To4GBMH8wHQYDVR0OBBYEFKttLgO5HUkiQDOPvMre/ZMz6vbHMB8GA1UdIwQYMBaAFKttLgO5HUkiQDOPvMre/ZMz6vbHMA8GA1UdEwEB/wQFMAMBAf8wLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMAoGCCqGSM49BAMCA0gAMEUCIAn9DKuXsD549k5019zuiGaMR2oK/Fqizr/+B9O+dy6pAiEA2jiryYoID0nyT/7OH//Ips3VssC12o/Ht2esOpXcuD5ZAxnYGFkDFLkABmd2ZXJzaW9uYzEuMG9kaWdlc3RBbGdvcml0aG1nU0hBLTI1Nmx2YWx1ZURpZ2VzdHO5AAJvb3JnLmN1c3RvbS50ZXN0oQBYIJpdko/f0xzYhWhD1Ot2l9JWLcxH1CgGfoFwDqOtp8rEcW9yZy5pc28uMTgwMTMuNS4xrABYIFwgSBTW0H+CJU+aFozsYKunPQUZop9pXamJvL/EZ45yAVggF8v/L/72HNJ24Ldqk3DVbhxK7yhKefW8Cl0fql/QFIYCWCAh6BFz7fHqM3NQk7M+SGtrLchLVzWFatAiUS7tokCp/ANYIMkCwdkPVYPyI/NTk4xGDF+hFVPudwNOaeeMmS4alLwGBFggggyq4SkErC4SILS13vlzL0bz5+y3SgR/hTyYQgN36ggFWCDgrhXimWbLCcv+F73hm+EHQs8mjD0jLwSaGYVpVxxNcgZYIGUkDMuJSMijadgTZefVXi5e+KQvEaE12VMpGWAKtfXWB1ggggkXKQq1kMEsUYPyUFmceyhhBCin/gLV97+6Xgt91q0IWCBcKCa7MB4+mENFZ5zZ3lUWJ6jJ2Ljz/ZKffptlE55GwglYIDVqvyIu/wLhh5KIjGlaTTkYD4rjr05quuo8KYMSRFyVClggedQHakXjQc6bLvc6Aox+HQ3jvUGRH6X8HlpvIiVHLYwLWCC7KKnHAD1drfgvVpRGNv9o/9RGhhafCv5ZfOqV1r/T0m1kZXZpY2VLZXlJbmZvuQABaWRldmljZUtleaQBAiFYIIgYecp6I4sZvw9MH4wA6aLhm6em9z6ukrhR1N4bUIVZIlggoxS1OAORJ7XNUHNfVFGeM8E0RQVFxWA62fJj+sxW03cgAWdkb2NUeXBldW9yZy5pc28uMTgwMTMuNS4xLm1ETGx2YWxpZGl0eUluZm+5AANmc2lnbmVkwHQyMDIzLTA5LTI2VDE3OjExOjE4Wml2YWxpZEZyb23AdDIwMjMtMDktMjZUMTc6MTE6MThaanZhbGlkVW50aWzAdDIwNzMtMDktMjZUMTc6MTE6MThaWECpPemytyN1AzBmxPOl6xNeaGbOQlxNep3jNKL/8G/HnDJAgYJLO81HGjKTalK6T6LkdmZGGEHyawJ+iN5BvsuU'
-
-    const mdoc = Mdoc.fromIssuerSignedBase64(base64UrlEncodedIssuerSignedStructured)
-
-    const verify = await mdoc.verify(agent.context, {
-      trustedCertificates: [sprindFunkeX509TrustedCertificate],
-    })
-    expect(verify.isValid).toBeTruthy()
-  })
-
   test('can verify sprindFunkeTestVector Issuer Signed structure', async () => {
     const mdoc = Mdoc.fromIssuerSignedBase64(sprindFunkeTestVectorBase64Url)
     //const decoded = decode(TypedArrayEncoder.fromBase64(sprindFunkeTestVectorBase64Url))

packages/core/src/modules/mdoc/repository/MdocRecord.ts

@@ -27,9 +27,7 @@ export type MdocRecordStorageProps = {
 export class MdocRecord extends BaseRecord<DefaultMdocRecordTags> {
   public static readonly type = 'MdocRecord'
   public readonly type = MdocRecord.type
-
   public issuerSignedHex!: string
-  public docType!: string
 
   public constructor(props: MdocRecordStorageProps) {
     super()

packages/openid4vc/src/openid4vc-holder/OpenId4VciHolderService.ts

@@ -158,7 +158,7 @@ export class OpenId4VciHolderService {
   private getAuthDetailsFromOfferedCredential(
     offeredCredential: OpenId4VciCredentialSupported,
     authDetailsLocation: string | undefined
-  ): AuthorizationDetails | undefined {
+  ): AuthorizationDetails {
     const { format } = offeredCredential
     const type = 'openid_credential'
 
@@ -192,6 +192,8 @@ export class OpenId4VciHolderService {
         claims: offeredCredential.claims,
         doctype: offeredCredential.doctype,
       } satisfies AuthorizationDetailsMsoMdoc
+    } else {
+      throw new CredoError(`Cannot create authorization_details. Unsupported credential format '${format}'.`)
     }
   }
 

packages/openid4vc/src/shared/issuerMetadataUtils.ts

@@ -60,10 +60,8 @@ export function credentialConfigurationSupportedToCredentialSupported(
   }
 
   if (config.format === 'mso_mdoc') {
-    return { id, ...config }
-  }
-
-  if (config.format === 'jwt_vc_json' || config.format === 'jwt_vc') {
+    return { ...baseConfig, format: 'mso_mdoc', doctype: config.doctype, claims: config.claims }
+  } else if (config.format === 'jwt_vc_json' || config.format === 'jwt_vc') {
     return {
       ...baseConfig,
       format: config.format,
@@ -106,10 +104,6 @@ export function credentialSupportedToCredentialConfigurationSupported(
   agentContext: AgentContext,
   credentialSupported: OpenId4VciCredentialSupportedWithId
 ): OpenId4VciCredentialConfigurationSupported {
-  if (credentialSupported.format === 'mso_mdoc') {
-    return { ...credentialSupported }
-  }
-
   const supportedJwaSignatureAlgorithms = getSupportedJwaSignatureAlgorithms(agentContext)
 
   // We assume the jwt proof_types_supported is the same as the cryptographic_suites_supported when converting from v11 to v13
@@ -135,7 +129,14 @@ export function credentialSupportedToCredentialConfigurationSupported(
     order: credentialSupported.order,
   }
 
-  if (credentialSupported.format === 'jwt_vc_json' || credentialSupported.format === 'jwt_vc') {
+  if (credentialSupported.format === 'mso_mdoc') {
+    return {
+      ...baseCredentialConfigurationSupported,
+      doctype: credentialSupported.doctype,
+      format: credentialSupported.format,
+      claims: credentialSupported.claims,
+    }
+  } else if (credentialSupported.format === 'jwt_vc_json' || credentialSupported.format === 'jwt_vc') {
     return {
       ...baseCredentialConfigurationSupported,
       format: credentialSupported.format,

packages/openid4vc/src/shared/models/index.ts

@@ -6,7 +6,6 @@ import type {
 } from '@sphereon/did-auth-siop'
 import type {
   AssertedUniformCredentialOffer,
-  CredentialConfigurationSupportedMsoMdocV1_0_13,
   CredentialConfigurationSupportedV1_0_13,
   CredentialIssuerMetadataV1_0_11,
   CredentialIssuerMetadataV1_0_13,
@@ -21,7 +20,7 @@ import type {
 } from '@sphereon/oid4vci-common'
 
 export type OpenId4VciCredentialSupportedWithId = OpenId4VciCredentialSupported & { id: string }
-export type OpenId4VciCredentialSupported = CredentialsSupportedLegacy | CredentialConfigurationSupportedMsoMdocV1_0_13
+export type OpenId4VciCredentialSupported = CredentialsSupportedLegacy
 export type OpenId4VciCredentialConfigurationSupported = CredentialConfigurationSupportedV1_0_13
 export type OpenId4VciCredentialConfigurationsSupported = Record<string, OpenId4VciCredentialConfigurationSupported>
 export type OpenId4VciTxCode = TxCode