Merge pull request 'Using IFormCollection for VerifyIncomingSignatureFromForm' (#112) from payments into master

Reviewed-on: #112

LiteCharms.Features.MidrandBooks/Payments/PayfastService.cs

@@ -48,26 +48,24 @@ public sealed partial class PayfastService(IDbContextFactory<MidrandBooksDbConte
         }
     }
 
-    public static bool VerifyIncomingSignature(HttpRequest request, string passphrase)
+    public static bool VerifyIncomingSignatureFromForm(IFormCollection formCollection, string passphrase)
     {
-        var formFields = new Dictionary<string, string>(StringComparer.Ordinal);
+        var sortedFields = new Dictionary<string, string>(StringComparer.Ordinal);
 
-        foreach (var file in request.Form)
+        foreach (var field in formCollection)
-            formFields.Add(file.Key, file.Value.ToString());
+        {
+            sortedFields.Add(field.Key, field.Value.ToString());
+        }
 
-        if (!formFields.TryGetValue("signature", out string? incomingSignature))
+        if (!sortedFields.TryGetValue("signature", out var incomingSignature)) return false;
-            return false;
 
         var stringBuilder = new StringBuilder();
 
-        foreach (var key in formFields.Keys)
+        foreach (var key in sortedFields.Keys)
         {
-            if (key.Equals("signature", StringComparison.OrdinalIgnoreCase))
+            if (key.Equals("signature", StringComparison.OrdinalIgnoreCase)) continue;
-                continue;
 
-            string rawValue = formFields[key] ?? string.Empty;
+            string encodedVal = HttpUtility.UrlEncode(sortedFields[key].Trim());
-
-            string encodedVal = HttpUtility.UrlEncode(rawValue.Trim());
             string cleanVal = PercentEncodingRegex.Replace(encodedVal, m => m.Value.ToUpperInvariant());
 
             stringBuilder.Append($"{key}={cleanVal}&");