Merge branch 'main' of github.com:openwallet-foundation-labs/wallet-framework-dotnet into refactor-auth-flow-session-handling

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/AuthFlow/Errors/VciSessionIdError.cs

@@ -0,0 +1,5 @@
+using WalletFramework.Core.Functional;
+
+namespace WalletFramework.Oid4Vc.Oid4Vci.AuthFlow.Errors;
+
+public record VciSessionIdError(string Value) : Error($"Invalid VciSessionId: {Value}");

src/WalletFramework.Oid4Vc/Oid4Vci/AuthFlow/Models/VciSessionId.cs

@@ -0,0 +1,49 @@
+using System.Globalization;
+using Newtonsoft.Json.Linq;
+using WalletFramework.Core.Functional;
+using WalletFramework.Oid4Vc.Oid4Vci.AuthFlow.Errors;
+
+namespace WalletFramework.Oid4Vc.Oid4Vci.AuthFlow.Models;
+
+/// <summary>
+///     Identifier of the authorization session during the VCI Authorization Code Flow.
+/// </summary>
+public struct VciSessionId
+{
+    /// <summary>
+    ///    Gets the value of the session identifier.
+    /// </summary>
+    private string Value { get; }
+        
+    private VciSessionId(string value) => Value = value;
+        
+    /// <summary>
+    ///     Returns the value of the session identifier.
+    /// </summary>
+    /// <param name="sessionId"></param>
+    /// <returns></returns>
+    public static implicit operator string(VciSessionId sessionId) => sessionId.Value;
+        
+    public static Validation<VciSessionId> ValidSessionId(string sessionId)
+    {
+        if (!Guid.TryParse(sessionId, out _))
+        {
+            return new VciSessionIdError(sessionId);
+        }
+            
+        return new VciSessionId(sessionId);
+    }
+    
+    public static VciSessionId CreateSessionId()
+    {
+        var guid = Guid.NewGuid().ToString();
+        return new VciSessionId(guid);
+    }
+}
+
+public static class VciSessionIdFun
+{
+    public static VciSessionId DecodeFromJson(JValue json) => VciSessionId
+        .ValidSessionId(json.ToString(CultureInfo.InvariantCulture))
+        .UnwrapOrThrow(new InvalidOperationException("SessionId is corrupt"));
+}

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/Models/Mdoc/MdocCredentialRequest.cs

@@ -1,5 +1,4 @@
 using LanguageExt;
-using Newtonsoft.Json.Linq;
 using WalletFramework.MdocLib;
 using WalletFramework.Oid4Vc.Oid4Vci.CredConfiguration.Models.Mdoc;
 

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;

src/WalletFramework.Oid4Vc/Oid4Vci/Exceptions/Oid4VciInvalidGrantException.cs

@@ -1,19 +1,18 @@
 using System.Net;
 
-namespace WalletFramework.Oid4Vc.Oid4Vci.Exceptions
+namespace WalletFramework.Oid4Vc.Oid4Vci.Exceptions;
+
+/// <summary>
+///     Represents an exception thrown when the grant within the Oid4Vci flow is invalid (e.g. wrong tx_code).
+/// </summary>
+public class Oid4VciInvalidGrantException : Exception
 {
     /// <summary>
-    ///     Represents an exception thrown when the grant within the Oid4Vci flow is invalid (e.g. wrong tx_code).
+    ///     Initializes a new instance of the <see cref="Oid4VciInvalidGrantException"/> class.
     /// </summary>
-    public class Oid4VciInvalidGrantException : Exception
+    /// <param name="statusCode">The StatusCode associated with the thrown Exception</param>
+    public Oid4VciInvalidGrantException(HttpStatusCode statusCode)
+        : base($"Invalid grant error. Status Code is {statusCode}")
     {
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="Oid4VciInvalidGrantException"/> class.
-        /// </summary>
-        /// <param name="statusCode">The StatusCode associated with the thrown Exception</param>
-        public Oid4VciInvalidGrantException(HttpStatusCode statusCode)
-            : base($"Invalid grant error. Status Code is {statusCode}")
-        {
-        }
     }
-}
+}

src/WalletFramework.Oid4Vc/Oid4Vci/Issuer/Abstractions/IIssuerMetadataService.cs

@@ -1,7 +1,6 @@
 using WalletFramework.Core.Functional;
 using WalletFramework.Core.Localization;
 using WalletFramework.Oid4Vc.Oid4Vci.Issuer.Models;
-using WalletFramework.Oid4Vc.Oid4Vci.Models;
 
 namespace WalletFramework.Oid4Vc.Oid4Vci.Issuer.Abstractions;