Merge branch 'release/moov-1.8.98'

Author: sipsorcery

src/NoFrixion.MoneyMoov/Enums/AuthorisationType.cs

@@ -23,5 +23,6 @@ public enum AuthorisationType
     Beneficiary = 3,
     Payrun = 4,
     MerchantToken = 5,
-    UserInvite = 6
+    UserInvite = 6,
+    RoleUser = 7
 }

src/NoFrixion.MoneyMoov/Enums/RoleUserEventTypeEnum.cs

@@ -0,0 +1,30 @@
+//-----------------------------------------------------------------------------
+// Filename: RoleUserEventTypeEnum.cs
+// 
+// Description: Enum for the different types of role user (assigning a user to a role)
+// events that can occur.
+// 
+// Author(s):
+// Aaron Clauson ([email protected])
+// 
+// History:
+// 22 Aug 2025  Aaron Clauson   Created, Stillorgan Wood, Dublin, Ireland.
+// 
+// License:
+// MIT.
+//-----------------------------------------------------------------------------
+
+namespace NoFrixion.MoneyMoov.Enums;
+
+public enum RoleUserEventTypeEnum
+{
+    /// <summary>
+    /// Something went wrong and the event type is unknown.
+    /// </summary>
+    Unknown = 0,
+    
+    /// <summary>
+    /// A user invite was authorised.
+    /// </summary>
+    Authorise = 1
+}

src/NoFrixion.MoneyMoov/Models/Roles/RoleUser.cs

@@ -8,6 +8,7 @@
 // 
 //  History:
 //  19 08 2024  Donal O'Connor   Created, Harcourt St, Dublin, Ireland.
+//  22 08 2025  Aaron Clauson    Added GetApprovalHash for role user authorisatoions.
 // 
 //  License:
 //  Proprietary NoFrixion.
@@ -36,9 +37,30 @@ public class RoleUser
 
     public List<RoleUserAccount>? Accounts { get; set; }
 
-    public List<RoleUserMerchant>? Merchants { get; set; }
-
     public User? User { get; set; }
 
-    public Role? Role { get; set; }
+    public Role? Role { get; set; }
+
+    /// <summary>
+    /// Gets a hash of the critical fields for the role user. This hash is
+    /// used to ensure a role user's details are not modified between the time the
+    /// authorisation is given and the time the role user assignment is enabled.
+    /// Note the authorisation logic is currently only for the initial role user assignment.
+    /// It is not intended to cover subsequent updates to the list of accounts the user gets access to 
+    /// for the role. In other words, once a user has been authorised for a role for a merchant they
+    /// do not need to be re-authorised if the list of accounts changes. Because of this there is no 
+    /// nonce required in the approval hash as it does not need to accommodate updates.
+    /// </summary>
+    /// <returns>A hash of the role user's critical fields.</returns>
+    public string GetApprovalHash()
+    {
+        var input =
+            RoleID.ToString("N") +
+            UserID.ToString("N") +
+            (Accounts != null
+                ? string.Join(",", Accounts.OrderBy(a => a.AccountID).Select(a => a.AccountID.ToString("N")))
+                : string.Empty);
+
+        return HashHelper.CreateHash(input);
+    }
 }

src/NoFrixion.MoneyMoov/Models/Roles/RoleUserMerchant.cs

@@ -88,4 +88,15 @@ public class StatementHeader
     public IEnumerable<Transaction> Transactions { get; set; }
 
     public bool IsTrustAccount { get; set; }
+    
+    /// <summary>
+    /// Date and time when the statement was generated.
+    /// This will take into account the merchant's timezone.
+    /// </summary>
+    public DateTime GeneratedOn { get; set; }
+    
+    /// <summary>
+    /// The timezone used to generate the statement.
+    /// </summary>
+    public TimeZoneInfo GeneratedOnTimeZone { get; set; }
 }

src/NoFrixion.MoneyMoov/Models/Statement/StatementHeader.cs

@@ -4,8 +4,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<AssemblyVersion>1.8.97.0</AssemblyVersion>
-	<FileVersion>1.8.97.0</FileVersion>
+	<AssemblyVersion>1.8.98.0</AssemblyVersion>
+	<FileVersion>1.8.98.0</FileVersion>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
 	<NoWarn>$(NoWarn);1591;NU1902;NU1903;</NoWarn>