fix credential request json

Signed-off-by: Kevin <kevin.dinh@lissi.id>

Author: Dindexx

src/WalletFramework.Oid4Vc/Oid4Vci/CredRequest/Implementations/CredentialRequestService.cs

@@ -86,7 +86,7 @@ async Task<Validation<CredentialResponse>> ICredentialRequestService.RequestCred
                     clientOptions);
 
                 var result = new SdJwtCredentialRequest(vciRequest, sdJwt.Vct);
-                return result.AsJson();
+                return result.EncodeToJson();
             },
             async mdoc =>
             {

src/WalletFramework.Oid4Vc/Oid4Vci/CredRequest/Models/CredentialRequest.cs

@@ -1,5 +1,5 @@
 using LanguageExt;
-using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using WalletFramework.Oid4Vc.Oid4Vci.CredConfiguration.Models;
 
 namespace WalletFramework.Oid4Vc.Oid4Vci.CredRequest.Models;
@@ -14,12 +14,30 @@ public record CredentialRequest(Option<ProofOfPossession> Proof, Format Format)
     /// <summary>
     ///     Gets the proof of possession of the key material the issued credential shall be bound to.
     /// </summary>
-    [JsonProperty("proof")]
     public Option<ProofOfPossession> Proof { get; } = Proof;
 
     /// <summary>
     ///     Gets the format of the credential to be issued.
     /// </summary>
-    [JsonProperty("format")]
     public Format Format { get; } = Format;
 }
+
+public static class CredentialRequestFun
+{
+    private const string ProofJsonKey = "proof";
+    private const string FormatJsonKey = "format";
+    
+    public static JObject EncodeToJson(this CredentialRequest request)
+    {
+        var result = new JObject();
+
+        request.Proof.IfSome(proof =>
+        {
+            result.Add(ProofJsonKey, JObject.FromObject(proof));
+        });
+        
+        result.Add(FormatJsonKey, request.Format.ToString());
+
+        return result;
+    }
+}

src/WalletFramework.Oid4Vc/Oid4Vci/CredRequest/Models/Mdoc/MdocCredentialRequest.cs

@@ -27,16 +27,9 @@ public static class MdocCredentialRequestFun
 {
     public static string AsJson(this MdocCredentialRequest request)
     {
-        var json = new JObject();
-
-        var vciRequest = JObject.FromObject(request.VciRequest);
-        foreach (var property in vciRequest.Properties())
-        {
-            json.Add(property);
-        }
+        var json = request.VciRequest.EncodeToJson();
 
-        var vct = JToken.FromObject(request.DocType);
-        json.Add("doctype", vct);
+        json.Add("doctype", request.DocType.ToString());
 
         return json.ToString();
     }

src/WalletFramework.Oid4Vc/Oid4Vci/CredRequest/Models/SdJwt/SdJwtCredentialRequest.cs

@@ -1,4 +1,3 @@
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using WalletFramework.SdJwtVc.Models;
 
@@ -11,7 +10,6 @@ public record SdJwtCredentialRequest
     /// <summary>
     ///     Gets the verifiable credential type (vct).
     /// </summary>
-    [JsonProperty("vct")]
     public Vct Vct { get; }
 
     internal SdJwtCredentialRequest(CredentialRequest vciRequest, Vct vct)
@@ -23,18 +21,11 @@ internal SdJwtCredentialRequest(CredentialRequest vciRequest, Vct vct)
 
 public static class SdJwtCredentialRequestFun
 {
-    public static string AsJson(this SdJwtCredentialRequest request)
+    public static string EncodeToJson(this SdJwtCredentialRequest request)
     {
-        var json = new JObject();
-        
-        var vciRequest = JObject.FromObject(request.VciRequest);
-        foreach (var property in vciRequest.Properties())
-        {
-            json.Add(property);
-        }
+        var json = request.VciRequest.EncodeToJson();
 
-        var vct = JToken.FromObject(request.Vct);
-        json.Add("vct", vct);
+        json.Add("vct", request.Vct.ToString());
 
         return json.ToString();
     }

test/WalletFramework.Oid4Vc.Tests/Oid4Vci/AuthFlow/AuthFlowSessionRecordTests.cs

@@ -9,7 +9,7 @@
 using WalletFramework.Oid4Vc.Oid4Vci.Authorization.Models;
 using WalletFramework.Oid4Vc.Oid4Vci.CredOffer.Models;
 using WalletFramework.Oid4Vc.Tests.Oid4Vci.AuthFlow.Samples;
-using WalletFramework.Oid4Vc.Tests.Oid4Vci.Samples;
+using WalletFramework.Oid4Vc.Tests.Oid4Vci.Issuer.Samples;
 
 namespace WalletFramework.Oid4Vc.Tests.Oid4Vci.AuthFlow;
 

test/WalletFramework.Oid4Vc.Tests/Oid4Vci/AuthFlow/Samples/AuthFlowSamples.cs

@@ -1,5 +1,5 @@
 using Newtonsoft.Json.Linq;
-using WalletFramework.Oid4Vc.Tests.Oid4Vci.Samples;
+using WalletFramework.Oid4Vc.Tests.Oid4Vci.Issuer.Samples;
 
 namespace WalletFramework.Oid4Vc.Tests.Oid4Vci.AuthFlow.Samples;
 

test/WalletFramework.Oid4Vc.Tests/Oid4Vci/CredConfiguration/MdocConfigurationTests.cs renamed to test/WalletFramework.Oid4Vc.Tests/Oid4Vci/CredConfiguration/Mdoc/MdocConfigurationTests.cs

@@ -1,10 +1,10 @@
 using FluentAssertions;
 using WalletFramework.Core.Functional;
 using WalletFramework.Core.Json.Errors;
-using WalletFramework.Oid4Vc.Tests.Oid4Vci.Samples.Mdoc;
+using WalletFramework.Oid4Vc.Tests.Oid4Vci.CredConfiguration.Mdoc.Samples;
 using static WalletFramework.Oid4Vc.Oid4Vci.CredConfiguration.Models.Mdoc.MdocConfiguration;
 
-namespace WalletFramework.Oid4Vc.Tests.Oid4Vci.CredConfiguration;
+namespace WalletFramework.Oid4Vc.Tests.Oid4Vci.CredConfiguration.Mdoc;
 
 public class MdocConfigurationTests
 {

test/WalletFramework.Oid4Vc.Tests/Oid4Vci/Samples/Mdoc/MdocConfigurationSample.cs renamed to test/WalletFramework.Oid4Vc.Tests/Oid4Vci/CredConfiguration/Mdoc/Samples/MdocConfigurationSample.cs

@@ -13,7 +13,7 @@
 using static WalletFramework.Oid4Vc.Oid4Vci.CredConfiguration.Models.Format;
 using static WalletFramework.MdocLib.NameSpace;
 
-namespace WalletFramework.Oid4Vc.Tests.Oid4Vci.Samples.Mdoc;
+namespace WalletFramework.Oid4Vc.Tests.Oid4Vci.CredConfiguration.Mdoc.Samples;
 
 public static class MdocConfigurationSample
 {

test/WalletFramework.Oid4Vc.Tests/Oid4Vci/Samples/SdJwt/SdJwtConfigurationSample.cs renamed to test/WalletFramework.Oid4Vc.Tests/Oid4Vci/CredConfiguration/SdJwt/Samples/SdJwtConfigurationSample.cs

@@ -3,7 +3,7 @@
 using WalletFramework.Oid4Vc.Oid4Vci.CredConfiguration.Models;
 using WalletFramework.SdJwtVc.Models;
 
-namespace WalletFramework.Oid4Vc.Tests.Oid4Vci.Samples.SdJwt;
+namespace WalletFramework.Oid4Vc.Tests.Oid4Vci.CredConfiguration.SdJwt.Samples;
 
 public static class SdJwtConfigurationSample
 {

test/WalletFramework.Oid4Vc.Tests/Oid4Vci/CredConfiguration/SdJwtConfigurationTests.cs renamed to test/WalletFramework.Oid4Vc.Tests/Oid4Vci/CredConfiguration/SdJwt/SdJwtConfigurationTests.cs

@@ -1,10 +1,10 @@
-namespace WalletFramework.Oid4Vc.Tests.Oid4Vci.CredConfiguration;
+namespace WalletFramework.Oid4Vc.Tests.Oid4Vci.CredConfiguration.SdJwt;
 
 public class SdJwtConfigurationTests
 {
+    // TODO: Implement this
     [Fact]
     public void Can_Parse()
     {
-        
     }
 }