Merge branch 'release/moov-1.8.101'

Author: sipsorcery

src/NoFrixion.MoneyMoov/ApiClients/MerchantClient.cs

@@ -62,6 +62,10 @@ Task<RestApiResponse<MerchantPageResponse>> GetChildMerchantsAsync(string userAc
         int pageSize = 20,
         string? search = null,
         string? sort = null);
+
+    Task<RestApiResponse<RoleUser>> GetRoleUserAssignmentAsync(string userAccessToken, Guid roleUserID);
+
+    Task<RestApiResponse> AuthoriseRoleUserAssignmentAsync(string strongUserAccessToken, Guid roleUserID);
 }
 
 public class MerchantClient : IMerchantClient
@@ -403,4 +407,44 @@ public Task<RestApiResponse<MerchantPageResponse>> GetChildMerchantsAsync(string
             _ => Task.FromResult(new RestApiResponse<MerchantPageResponse>(HttpStatusCode.PreconditionFailed, new Uri(url), prob))
         };
     }
+
+    /// <summary>
+    /// Gets a specific role user assignment by its ID.
+    /// </summary>
+    /// <param name="userAccessToken">A user scoped JWT access token.</param>
+    /// <param name="roleUserID">The ID of the role user assignment to get.</param>
+    /// <returns>If successful, the role user assignment.</returns>
+    public Task<RestApiResponse<RoleUser>> GetRoleUserAssignmentAsync(string userAccessToken, Guid roleUserID)
+    {
+        var url = MoneyMoovUrlBuilder.MerchantsApi.MerchantRoleUserAssignmentsUrl(_apiClient.GetBaseUri().ToString(), roleUserID);
+
+        var prob = _apiClient.CheckAccessToken(userAccessToken, nameof(GetRolesAsync));
+
+        return prob switch
+        {
+            var p when p.IsEmpty => _apiClient.GetAsync<RoleUser>(url, userAccessToken),
+            _ => Task.FromResult(new RestApiResponse<RoleUser>(HttpStatusCode.PreconditionFailed, new Uri(url), prob))
+        };
+    }
+
+    /// <summary>
+    /// Calls the MoneyMoov merchant endpoint to authorise a role user assignment.
+    /// </summary>
+    /// <param name="strongUserAccessToken">The strong user access token acquired to authorise the role suer assignment. Strong
+    /// tokens can only be acquired from a strong customer authentication flow, are short lived (typically 5 minute expiry)
+    /// and are specific to the role user assignment.</param>
+    /// <param name="roleUserID">The ID of the role user assignment to authorise.</param>
+    /// <returns>An API response indicating the result of the authorise attempt.</returns>
+    public Task<RestApiResponse> AuthoriseRoleUserAssignmentAsync(string strongUserAccessToken, Guid roleUserID)
+    {
+        var url = MoneyMoovUrlBuilder.MerchantsApi.MerchantRoleUserAssignmentsUrl(_apiClient.GetBaseUri().ToString(), roleUserID);
+
+        var prob = _apiClient.CheckAccessToken(strongUserAccessToken, nameof(AuthoriseRoleUserAssignmentAsync));
+
+        return prob switch
+        {
+            var p when p.IsEmpty => _apiClient.PostAsync(url, strongUserAccessToken),
+            _ => Task.FromResult(new RestApiResponse(HttpStatusCode.PreconditionFailed, new Uri(url), prob))
+        };
+    }
 }

src/NoFrixion.MoneyMoov/Constants/PaymentsConstants.cs

@@ -19,9 +19,14 @@ namespace NoFrixion.MoneyMoov;
 public static class PaymentsConstants
 {
     /// <summary>
-    /// Round fiat (EUR, GBP etc) amounts to this many decimal places.
+    /// Round fiat (EUR, GBP etc) amounts to this many decimal places for external payouts.
     /// </summary>
-    public const int FIAT_ROUNDING_DECIMAL_PLACES = 2;
+    public const int FIAT_ROUNDING_DECIMAL_PLACES_EXTERNAL = 2;
+
+    /// <summary>
+    /// Internal payouts and transactions can optionally be specified down to 4 decimal places.
+    /// </summary>
+    public const int FIAT_ROUNDING_DECIMAL_PLACES_INTERNAL = 4;
 
     /// <summary>
     /// Bitcoin Satoshis use 8 decimal places.

src/NoFrixion.MoneyMoov/Enums/MerchantTokenEventTypeEnum.cs

@@ -40,5 +40,10 @@ public enum MerchantTokenEventTypeEnum
     /// <summary>
     /// A merchant token was archived.
     /// </summary>
-    Archive = 4
+    Archive = 4,
+    
+    /// <summary>
+    /// A merchant token was edited.
+    /// </summary>
+    Edited = 5
 }

src/NoFrixion.MoneyMoov/Enums/PayoutEventTypesEnum.cs

@@ -97,4 +97,10 @@ public enum PayoutEventTypesEnum
     /// A payout's associated beneficiary was enabled.
     /// </summary>
     BeneficiaryEnabled = 15,
+
+    /// <summary>
+    /// An error that occurred during an attempt to submit a payout for processing. This is not a terminal error
+    /// and the attempt can be tried again. Errors after the payout's IsSubmitted flag is set are terminal.
+    /// </summary>
+    SubmitAttemptError = 16
 }

src/NoFrixion.MoneyMoov/Extensions/AmountMinorUnitExtensions.cs

@@ -22,7 +22,7 @@ public static long ToAmountMinorUnits(this decimal amount, CurrencyTypeEnum curr
     {
         decimal units = currency switch
         {
-            var c when c.IsFiat() => amount * (int)Math.Pow(10, PaymentsConstants.FIAT_ROUNDING_DECIMAL_PLACES),
+            var c when c.IsFiat() => amount * (int)Math.Pow(10, PaymentsConstants.FIAT_ROUNDING_DECIMAL_PLACES_EXTERNAL),
             CurrencyTypeEnum.BTC => amount * (int)Math.Pow(10, PaymentsConstants.BITCOIN_ROUNDING_DECIMAL_PLACES),
             _ => throw new ApplicationException($"Currency {currency} was not recognised in {nameof(ToAmountMinorUnits)}.")
         };

src/NoFrixion.MoneyMoov/Extensions/CurrencyExtensions.cs

@@ -34,11 +34,4 @@ public static bool IsFiat(this CurrencyTypeEnum currency) =>
             CurrencyTypeEnum.BTC => false,
             _ => true
         };
-
-    public static int GetDecimalPlaces(this CurrencyTypeEnum currency) =>
-        currency switch
-        {
-            CurrencyTypeEnum.BTC => PaymentsConstants.BITCOIN_ROUNDING_DECIMAL_PLACES,
-            _ => PaymentsConstants.FIAT_ROUNDING_DECIMAL_PLACES
-        };
 }

src/NoFrixion.MoneyMoov/Extensions/PaymentAmount.cs

@@ -13,6 +13,8 @@
 // Proprietary NoFrixion.
 //-----------------------------------------------------------------------------
 
+using System.Globalization;
+
 namespace NoFrixion.MoneyMoov;
 
 public static class PaymentAmount
@@ -23,10 +25,29 @@ public static class PaymentAmount
     public static string DisplayCurrencyAndAmount(CurrencyTypeEnum currency, decimal amount) =>
         currency.GetCurrencySymbol() + " " + GetDisplayAmount(currency, amount);
 
-    public static string GetDisplayAmount(CurrencyTypeEnum currency, decimal amount) =>
-        currency.IsFiat() ? amount.ToString("N2") : amount.ToString("N8");
+    // Decide decimals once, reuse everywhere.
+    private static int GetDecimalPlaces(CurrencyTypeEnum currency, decimal amount)
+    {
+        if (!currency.IsFiat())
+        {
+            return PaymentsConstants.BITCOIN_ROUNDING_DECIMAL_PLACES;
+        }
+
+        return decimal.Remainder(decimal.Abs(amount), 0.01m) != 0m
+            ? PaymentsConstants.FIAT_ROUNDING_DECIMAL_PLACES_INTERNAL   // 4 decimal places option for internal payouts.
+            : PaymentsConstants.FIAT_ROUNDING_DECIMAL_PLACES_EXTERNAL;  // 2 decimal places for external payouts.
+    }
+
+    public static string GetDisplayAmount(CurrencyTypeEnum currency, decimal amount, IFormatProvider? culture = null)
+    {
+        var dps = GetDecimalPlaces(currency, amount);
+        return amount.ToString($"N{dps}", culture ?? CultureInfo.CurrentCulture);
+    }
 
-    public static decimal GetRoundedAmount(CurrencyTypeEnum currency, decimal amount) =>
-         Math.Round(amount, currency.IsFiat() ? PaymentsConstants.FIAT_ROUNDING_DECIMAL_PLACES : PaymentsConstants.BITCOIN_ROUNDING_DECIMAL_PLACES);
+    public static decimal GetRoundedAmount(CurrencyTypeEnum currency, decimal amount, MidpointRounding mode = MidpointRounding.ToEven)
+    {
+        var dps = GetDecimalPlaces(currency, amount);
+        return Math.Round(amount, dps, mode);
+    }
 }
 

src/NoFrixion.MoneyMoov/Extensions/PaymentRequestExtensions.cs

@@ -243,6 +243,10 @@ PaymentRequestEventTypesEnum.pisp_callback or
                     var settleFailedEvent = attempt.First(x => x.EventType is PaymentRequestEventTypesEnum.pisp_settle_failure);
 
                     paymentAttempt.SettleFailedAt = settleFailedEvent.Inserted;
+
+                    //Set authorised amount to zero when there is settlement failure for this attempt.
+                    paymentAttempt.AuthorisedAmount = 0;
+
                 }
 
                 pispPaymentAttempts.Add(paymentAttempt);

src/NoFrixion.MoneyMoov/Models/ApiPageResponseBase.cs

@@ -91,6 +91,28 @@ public MerchantPageResponse(List<Merchant> content,
     { }
 }
 
+public class UserPageResponse : ApiPageResponseBase<User>
+{
+    public UserPageResponse(List<User> content,
+        int pageNumber = 1,
+        int pageSize = 10,
+        long totalPages = default,
+        long totalSize = default)
+        : base(content, pageNumber, pageSize, totalPages, totalSize)
+    { }
+}
+
+public class UserInvitePageResponse : ApiPageResponseBase<UserInvite>
+{
+    public UserInvitePageResponse(List<UserInvite> content,
+        int pageNumber = 1,
+        int pageSize = 10,
+        long totalPages = default,
+        long totalSize = default)
+        : base(content, pageNumber, pageSize, totalPages, totalSize)
+    { }
+}
+
 public abstract class ApiPageResponseBase<T> : PageResponse<T>
 {
     /// <summary>

src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestEvent.cs

@@ -209,7 +209,7 @@ public decimal DisplayAmount()
         return EventType switch
         {
             PaymentRequestEventTypesEnum.lightning_invoice_created => Math.Round(Amount, PaymentsConstants.BITCOIN_LIGHTNING_ROUNDING_DECIMAL_PLACES),
-            _ => Math.Round(Amount, PaymentsConstants.FIAT_ROUNDING_DECIMAL_PLACES)
+            _ => Math.Round(Amount, PaymentsConstants.FIAT_ROUNDING_DECIMAL_PLACES_EXTERNAL)
         };
     }