From 5f6c93457231f30861500abcacffec789777b69f Mon Sep 17 00:00:00 2001 From: Johannes Tuerk Date: Wed, 27 Aug 2025 11:25:23 +0200 Subject: [PATCH 1/2] fix json string formatting Signed-off-by: Johannes Tuerk --- src/WalletFramework.Oid4Vc/Oid4Vp/Models/WalletMetadata.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/WalletFramework.Oid4Vc/Oid4Vp/Models/WalletMetadata.cs b/src/WalletFramework.Oid4Vc/Oid4Vp/Models/WalletMetadata.cs index c505f430..09ecc5c7 100644 --- a/src/WalletFramework.Oid4Vc/Oid4Vp/Models/WalletMetadata.cs +++ b/src/WalletFramework.Oid4Vc/Oid4Vp/Models/WalletMetadata.cs @@ -1,3 +1,4 @@ +using Newtonsoft.Json; using Newtonsoft.Json.Linq; namespace WalletFramework.Oid4Vc.Oid4Vp.Models; @@ -47,11 +48,11 @@ public static WalletMetadata CreateDefault() public string ToJsonString() { - return new JObject + return JsonConvert.SerializeObject(new JObject { [VpFormatsSupportedIdentifier] = JObject.FromObject(VpFormatsSupported), [ClientIdPrefixesSupportedIdentifier] = new JArray {ClientIdPrefixesSupported.Select(x => x.AsString())}, [ClientIdSchemesSupportedIdentifier] = new JArray {ClientIdPrefixesSupported.Select(x => x.AsString())}, - }.ToString(); + }); } } From 113afadc9d4090940286c94d9a820c2d7ea3cc9d Mon Sep 17 00:00:00 2001 From: Johannes Tuerk Date: Wed, 27 Aug 2025 11:26:16 +0200 Subject: [PATCH 2/2] revert tx data linking behaviour (only take one) Signed-off-by: Johannes Tuerk --- .../Oid4Vp/TransactionDatas/TransactionDataFun.cs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/WalletFramework.Oid4Vc/Oid4Vp/TransactionDatas/TransactionDataFun.cs b/src/WalletFramework.Oid4Vc/Oid4Vp/TransactionDatas/TransactionDataFun.cs index 1d86bc19..55e40b62 100644 --- a/src/WalletFramework.Oid4Vc/Oid4Vp/TransactionDatas/TransactionDataFun.cs +++ b/src/WalletFramework.Oid4Vc/Oid4Vp/TransactionDatas/TransactionDataFun.cs @@ -1,7 +1,6 @@ using LanguageExt; using WalletFramework.Core.Base64Url; using WalletFramework.Core.Functional; -using WalletFramework.Core.Functional.Enumerable; using WalletFramework.Oid4Vc.Oid4Vp.Errors; using WalletFramework.Oid4Vc.Oid4Vp.Models; using WalletFramework.Oid4Vc.Oid4Vp.TransactionDatas.Errors; @@ -123,12 +122,12 @@ internal static Validation + var found = indexedCandidates.FirstOrDefault(tuple => { return new[] { tuple.candidate }.FindCandidateForTransactionData(txData).IsSuccess; - }).ToList(); + }); - if (findings.IsEmpty()) + if (found == default) { return new InvalidTransactionDataError( $"No credentials found that satisfy the transaction data with type {txData.GetTransactionDataType().AsString()}", @@ -136,11 +135,8 @@ internal static Validation