PR comments

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

Author: JoTiTu

src/WalletFramework.Core/Functional/OptionFun.cs

@@ -96,7 +96,7 @@ public static Option<IEnumerable<T>> AsOption<T>(this IEnumerable<T> enumerable)
             // ReSharper disable once PossibleMultipleEnumeration
             : Some(enumerable);
 
-    public static Option<T> AsOption<T>(this T? value) where T : class =>
+    public static Option<T> AsOption<T>(this T? value) =>
         value != null ? Option<T>.Some(value) : Option<T>.None;
 
     public static T UnwrapOrThrow<T>(this Option<T> option, Exception e) =>

src/WalletFramework.Oid4Vc/Constants.cs

@@ -9,4 +9,6 @@ public static class Constants
     public const string MdocFormat = "mso_mdoc";
 
     public const string RegistrationCertificateFormat = "jwt";
+    
+    public const string DefaultResponseEncryptionEncAlgorithm = "A256GCM";
 }

src/WalletFramework.Oid4Vc/Oid4Vp/AuthResponse/Encryption/EncryptedAuthorizationResponse.cs

@@ -9,6 +9,7 @@
 using WalletFramework.Core.Base64Url;
 using WalletFramework.Oid4Vc.Oid4Vp.Jwk;
 using WalletFramework.Oid4Vc.Oid4Vp.Models;
+using static WalletFramework.Oid4Vc.Constants;
 
 namespace WalletFramework.Oid4Vc.Oid4Vp.AuthResponse.Encryption;
 
@@ -25,8 +26,6 @@ public static class EncryptedAuthorizationResponseFun
         ["A128CBC-HS256"] = JweEncryption.A128CBC_HS256
     };
 
-    const string DefaultEncAlgorithm = "A256GCM";
-    
     public static EncryptedAuthorizationResponse Encrypt(
         this AuthorizationResponse response,
         JsonWebKey verifierPubKey,
@@ -54,7 +53,7 @@ public static EncryptedAuthorizationResponse Encrypt(
         var selectedEncAlgorithm = encryptedResponseEncAlgorithms.Match(
             encAlgs => encAlgs.FirstOrDefault(encAlg => SupportedEncAlgorithmsMap.ContainsKey(encAlg)) 
                     ?? throw new NotSupportedException("Unsupported response encryption algorithms requested by verifier."),
-            () => DefaultEncAlgorithm);
+            () => DefaultResponseEncryptionEncAlgorithm);
 
         var jwe = JWE.EncryptBytes(
             response.ToJson().GetUTF8Bytes(),

src/WalletFramework.Oid4Vc/Oid4Vp/Models/ClientMetadata.cs

@@ -44,6 +44,7 @@ public ClientMetadata(
     ///     Defined the encoding that should be used when an encrypted Auth Response is requested by the verifier.
     ///     Replaced by encrypted_response_enc_values_supported but kept for now for backwards compatibility.
     /// </summary>
+    [Obsolete("This property is obsolete.")]
     [JsonProperty("authorization_encrypted_response_enc")]
     public string? AuthorizationEncryptedResponseEnc { get; init; }
 
@@ -107,6 +108,7 @@ public ClientMetadata(
     ///     The URI to a human-readable terms of service document for the client (verifier).
     ///     This is deprecated and replaced by vp_formats_supported but kept for now for backwards compatibility.
     /// </summary>
+    [Obsolete("This property is obsolete.")]
     [JsonProperty("vp_formats")]
     public Formats VpFormats { get; init; }
 

src/WalletFramework.Oid4Vc/Oid4Vp/Services/AuthorizationRequestService.cs

@@ -185,7 +185,7 @@ private async Task<Validation<AuthorizationRequestCancellation, RequestObject>>
         return FromStr(await httpClient.GetStringAsync(authRequestByReference.RequestUri), Option<string>.None);
     }
 
-    private async Task<OneOf<Option<ClientMetadata>, AuthorizationRequestCancellation>> FetchClientMetadata(AuthorizationRequest authorizationRequest)
+    private async Task<Validation<AuthorizationRequestCancellation, Option<ClientMetadata>>> FetchClientMetadata(AuthorizationRequest authorizationRequest)
     {
         return await authorizationRequest.ClientMetadata.AsOption().Match(
             clientMetadata =>
@@ -194,10 +194,10 @@ private async Task<OneOf<Option<ClientMetadata>, AuthorizationRequestCancellatio
                 {
                     var error = new VpFormatsNotSupportedError("The provided vp_formats_supported values are not supported");
                     var authorizationCancellation = new AuthorizationRequestCancellation(authorizationRequest.GetResponseUriMaybe(), [error]);
-                    return Task.FromResult((OneOf<Option<ClientMetadata>, AuthorizationRequestCancellation>) authorizationCancellation);
+                    return Task.FromResult((Validation<AuthorizationRequestCancellation, Option<ClientMetadata>>) authorizationCancellation);
                 }
 
-                return Task.FromResult<OneOf<Option<ClientMetadata>, AuthorizationRequestCancellation>>(clientMetadata.AsOption());
+                return Task.FromResult<Validation<AuthorizationRequestCancellation, Option<ClientMetadata>>>(clientMetadata.AsOption());
             },
             async () =>
             {
@@ -216,7 +216,7 @@ private async Task<OneOf<Option<ClientMetadata>, AuthorizationRequestCancellatio
                 {
                     var error = new VpFormatsNotSupportedError("The provided vp_formats_supported values are not supported");
                     var authorizationCancellation = new AuthorizationRequestCancellation(authorizationRequest.GetResponseUriMaybe(), [error]);
-                    return (OneOf<Option<ClientMetadata>, AuthorizationRequestCancellation>) authorizationCancellation;
+                    return (Validation<AuthorizationRequestCancellation, Option<ClientMetadata>>) authorizationCancellation;
                 }
 
                 return clientMetadata.AsOption();