Merge branch 'release/comp-1.8.38'

Author: sipsorcery

src/NoFrixion.MoneyMoov/Claims/IdentityExtensions.cs

@@ -19,6 +19,7 @@
 using System.Security.Claims;
 using System.Security.Principal;
 using NoFrixion.Common.Permissions;
+using NoFrixion.MoneyMoov.Enums;
 using NoFrixion.MoneyMoov.Extensions;
 using NoFrixion.MoneyMoov.Models;
 
@@ -339,6 +340,36 @@ public static bool HasMerchantPermission(this IIdentity identity, MerchantPermis
 
         return Enum.TryParse(claim.Value, out MerchantPermissions claimPermissions) && claimPermissions.HasFlag(permission);
     }
+
+    /// <summary>
+    /// Gets the authentication type from the identity token.
+    /// </summary>
+    /// <param name="identity">The token identity</param>
+    /// <returns>The authentication type.</returns>
+    public static AuthenticationTypesEnum GetAuthenticationType(this IIdentity identity)
+    {
+        var claimsIdentity = identity as ClaimsIdentity;
+
+        if (claimsIdentity == null) 
+        {
+            return AuthenticationTypesEnum.None;
+        }
+        else
+        {
+            var authenticationClaimType = ClaimsConstants.NOFRIXION_CLAIMS_NAMESPACE + NoFrixionClaimsEnum.approveamr;
+
+            var authenticationTypeClaimValue = claimsIdentity.Claims.FirstOrDefault(x => x.Type == authenticationClaimType)?.Value;
+
+            if (Enum.TryParse(authenticationTypeClaimValue, out AuthenticationTypesEnum authenticationType))
+            {
+                return authenticationType;
+            }
+            else
+            {
+                return AuthenticationTypesEnum.None;
+            }
+        }
+    }
 }
 
 #nullable enable

src/NoFrixion.MoneyMoov/Enums/AuthenticationTypesEnum.cs

@@ -16,6 +16,7 @@
 
 namespace NoFrixion.MoneyMoov.Enums;
 
+[Flags]
 public enum AuthenticationTypesEnum
 {
     None = 0,

src/NoFrixion.MoneyMoov/Enums/SharedSecretAlgorithmsEnum.cs

@@ -0,0 +1,35 @@
+//-----------------------------------------------------------------------------
+// Filename: SharedSecretAlgorithmsEnum.cs
+// 
+// Description: A list of the shared secret algorithms supported. Original use
+// case was for adding an HMAC option to the merchant tokens.
+// 
+// Author(s):
+// Aaron Clauson ([email protected])
+// 
+// History:
+// Halloween 2024   Aaron Clauson   Created, Carne, Wexford, Ireland.
+// 
+// License:
+// Proprietary NoFrixion.
+//-----------------------------------------------------------------------------
+
+namespace NoFrixion.MoneyMoov;
+
+public enum SharedSecretAlgorithmsEnum
+{
+    None,
+    
+    /// <summary>
+    /// Only supported for legacy reasons. NOT supported for merchant or api token HMACs
+    /// </summary>
+    HMAC_SHA1,
+
+    HMAC_SHA256,
+    HMAC_SHA384,
+
+    /// <summary>
+    /// Recommended.
+    /// </summary>
+    HMAC_SHA512
+}

src/NoFrixion.MoneyMoov/Extensions/EnumExtensions.cs

@@ -46,6 +46,40 @@ public static List<T> ToList<T>(this T flags) where T : Enum
         }
     }
 
+    /// <summary>
+    /// This method converts an Enum with the Flags attribute to a list of Enums.
+    /// </summary>
+    public static List<T> ToList<T>(this T? flags) where T : struct, Enum
+    {
+        if (!typeof(T).IsDefined(typeof(FlagsAttribute), false))
+        {
+            throw new ArgumentException("The type parameter T must have the Flags attribute.", nameof(flags));
+        }
+
+        if (flags == null)
+        {
+            return [];
+        }
+
+        // Check if the enum underlying type is ulong
+        var underlyingType = Enum.GetUnderlyingType(typeof(T));
+
+        if (underlyingType == typeof(ulong))
+        {
+            return Enum.GetValues(typeof(T))
+                       .Cast<T>()
+                       .Where(value => flags.Value.HasFlag(value) && Convert.ToUInt64(value) != 0) // Exclude None or 0
+                       .ToList();
+        }
+        else
+        {
+            return Enum.GetValues(typeof(T))
+                       .Cast<T>()
+                       .Where(value => flags.Value.HasFlag(value) && Convert.ToInt32(value) != 0) // Exclude None or 0
+                       .ToList();
+        }
+    }
+
     /// <summary>
     /// This method converts  list of flag enum values to a single flag enum.
     /// </summary>

src/NoFrixion.MoneyMoov/HmacSignature/HmacAuthenticationConstants.cs

@@ -25,5 +25,6 @@ public static class HmacAuthenticationConstants
     public const string MERCHANT_ID_HEADER_NAME = "x-nfx-merchantid";
     public const string NOFRIXION_SIGNATURE_HEADER_NAME = "x-nfx-signature";
     public const string HTTP_RETRY_HEADER_NAME = "x-mod-retry";
-    public const string IDEMPOTENT_HEADER_NAME = "idempotency-key";
+    public const string IDEMPOTENT_HEADER_NAME = "idempotency-key";
+    public const string TOKEN_ID_PARAMETER_NAME = "tokenId";
 }