Merge branch 'main' of github.com:openwallet-foundation-labs/wallet-framework-dotnet into client-attestation

Signed-off-by: Johannes Tuerk <johannes.tuerk@lissi.id>

Author: JoTiTu

src/WalletFramework.Oid4Vc/FormattingExtensions.cs

@@ -1,27 +1,26 @@
 using Newtonsoft.Json;
 
-namespace WalletFramework.Oid4Vc
+namespace WalletFramework.Oid4Vc;
+
+/// <summary>
+/// Formatting extensions
+/// </summary>
+public static class FormattingExtensions
 {
     /// <summary>
-    /// Formatting extensions
+    /// Converts an <see cref="object"/> to json string using default converter.
     /// </summary>
-    public static class FormattingExtensions
-    {
-        /// <summary>
-        /// Converts an <see cref="object"/> to json string using default converter.
-        /// </summary>
-        /// <param name="obj">The object.</param>
-        /// <returns></returns>
-        public static string ToJson(this object obj) =>
-            JsonConvert.SerializeObject(obj, Formatting.None);
+    /// <param name="obj">The object.</param>
+    /// <returns></returns>
+    public static string ToJson(this object obj) =>
+        JsonConvert.SerializeObject(obj, Formatting.None);
 
-        /// <summary>
-        /// Converts an object to json string using the provided <see cref="JsonSerializerSettings"/>
-        /// </summary>
-        /// <returns>The json.</returns>
-        /// <param name="obj">Object.</param>
-        /// <param name="settings">SerializerSettings.</param>
-        public static string ToJson(this object obj, JsonSerializerSettings settings) =>
-            JsonConvert.SerializeObject(obj, settings);
-    }
-}
+    /// <summary>
+    /// Converts an object to json string using the provided <see cref="JsonSerializerSettings"/>
+    /// </summary>
+    /// <returns>The json.</returns>
+    /// <param name="obj">Object.</param>
+    /// <param name="settings">SerializerSettings.</param>
+    public static string ToJson(this object obj, JsonSerializerSettings settings) =>
+        JsonConvert.SerializeObject(obj, settings);
+}

src/WalletFramework.Oid4Vc/IsExternalInit.cs

@@ -1,9 +1,8 @@
 // ReSharper disable once CheckNamespace
-namespace System.Runtime.CompilerServices
+namespace System.Runtime.CompilerServices;
+
+// This is needed for the init property setter. This can be removed when updating to a newer C# Version.
+// https://stackoverflow.com/questions/64749385/predefined-type-system-runtime-compilerservices-isexternalinit-is-not-defined
+internal static class IsExternalInit
 {
-    // This is needed for the init property setter. This can be removed when updating to a newer C# Version.
-    // https://stackoverflow.com/questions/64749385/predefined-type-system-runtime-compilerservices-isexternalinit-is-not-defined
-    internal static class IsExternalInit
-    {
-    }
-}
+}

src/WalletFramework.Oid4Vc/Oid4Vci/Authorization/DPop/Abstractions/IDPopHttpClient.cs

@@ -6,6 +6,6 @@ public interface IDPopHttpClient
 {
     internal Task<DPopHttpResponse> Post(
         Uri requestUri,
-        HttpContent content,
-        DPopConfig config);
+        DPopConfig config,
+        Func<HttpContent> getContent);
 }

src/WalletFramework.Oid4Vc/Oid4Vci/Authorization/DPop/Implementations/DPopHttpClient.cs

@@ -40,10 +40,10 @@ public DPopHttpClient(
 
     public async Task<DPopHttpResponse> Post(
         Uri requestUri,
-        HttpContent content,
-        DPopConfig config)
+        DPopConfig config,
+        Func<HttpContent> getContent)
     {
-        var dPop = await GenerateDPopAsync(
+        var dPop = await GenerateDPopHeaderAsync(
             config.KeyId,
             config.Audience,
             config.Nonce.ToNullable(),
@@ -53,9 +53,7 @@ public async Task<DPopHttpResponse> Post(
             token => _httpClient.WithDPopHeader(dPop).WithAuthorizationHeader(token),
             () => _httpClient.WithDPopHeader(dPop));
 
-        var response = await httpClient.PostAsync(
-            requestUri,
-            content);
+        var response = await httpClient.PostAsync(requestUri, getContent());
 
         await ThrowIfInvalidGrantError(response);
 
@@ -64,15 +62,15 @@ public async Task<DPopHttpResponse> Post(
         {
             config = config with { Nonce = new DPopNonce(nonceStr) };
 
-            var newDpop = await GenerateDPopAsync(
+            var newDpop = await GenerateDPopHeaderAsync(
                 config.KeyId, 
                 config.Audience, 
                 config.Nonce.ToNullable(), 
                 config.OAuthToken.ToNullable()?.AccessToken);
 
             httpClient.WithDPopHeader(newDpop);
 
-            response = await httpClient.PostAsync(requestUri, content);
+            response = await httpClient.PostAsync(requestUri, getContent());
         }
 
         await ThrowIfInvalidGrantError(response);
@@ -118,7 +116,7 @@ or System.Net.HttpStatusCode.Unauthorized
         return null;
     }
 
-    private async Task<string> GenerateDPopAsync(KeyId keyId, string audience, string? nonce, string? accessToken)
+    private async Task<string> GenerateDPopHeaderAsync(KeyId keyId, string audience, string? nonce, string? accessToken)
     {
         var header = new Dictionary<string, object>
         {

src/WalletFramework.Oid4Vc/Oid4Vci/Authorization/Implementations/TokenService.cs

@@ -38,8 +38,8 @@ public async Task<OneOf<OAuthToken, DPopToken>> RequestToken(
 
             var result = await _dPopHttpClient.Post(
                 uri,
-                tokenRequest.ToFormUrlEncoded(),
-                config);
+                config,
+                tokenRequest.ToFormUrlEncoded);
 
             var token = DeserializeObject<OAuthToken>(await result.ResponseMessage.Content.ReadAsStringAsync()) 
                         ?? throw new InvalidOperationException("Failed to deserialize the token response");

src/WalletFramework.Oid4Vc/Oid4Vci/Authorization/Models/OAuthToken.cs

@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using WalletFramework.Oid4Vc.Oid4Vci.AuthFlow;
 using WalletFramework.Oid4Vc.Oid4Vci.AuthFlow.Models;
 
 namespace WalletFramework.Oid4Vc.Oid4Vci.Authorization.Models;

src/WalletFramework.Oid4Vc/Oid4Vci/CredConfiguration/Models/SdJwt/SdJwtConfiguration.cs

@@ -1,4 +1,3 @@
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using WalletFramework.Core.Functional;
 using WalletFramework.Core.Json;

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

@@ -102,7 +102,7 @@ async Task<Validation<CredentialResponse>> ICredentialRequestService.RequestCred
                     clientOptions);
 
                 var result = new MdocCredentialRequest(vciRequest, mdoc);
-                return result.AsJson();
+                return result.EncodeToJson();
             }
         );
 
@@ -125,8 +125,8 @@ async Task<Validation<CredentialResponse>> ICredentialRequestService.RequestCred
 
                 var dPopResponse = await _dPopHttpClient.Post(
                     issuerMetadata.CredentialEndpoint,
-                    content,
-                    config);
+                    config,
+                    () => content);
 
                 return dPopResponse.ResponseMessage;
             });

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

@@ -1,5 +1,4 @@
 using LanguageExt;
-using Newtonsoft.Json.Linq;
 using WalletFramework.MdocLib;
 using WalletFramework.Oid4Vc.Oid4Vci.CredConfiguration.Models.Mdoc;
 
@@ -25,7 +24,7 @@ public MdocCredentialRequest(CredentialRequest credentialRequest, MdocConfigurat
 
 public static class MdocCredentialRequestFun
 {
-    public static string AsJson(this MdocCredentialRequest request)
+    public static string EncodeToJson(this MdocCredentialRequest request)
     {
         var json = request.VciRequest.EncodeToJson();
 

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

@@ -1,4 +1,3 @@
-using Newtonsoft.Json.Linq;
 using WalletFramework.SdJwtVc.Models;
 
 namespace WalletFramework.Oid4Vc.Oid4Vci.CredRequest.Models.SdJwt;