Improve payment request success URL parsing. (#453)

nofrixion · Nov 13, 2024 · e966d6c · e966d6c
1 parent 71da120
commit e966d6c
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequest.cs b/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequest.cs
@@ -23,6 +23,7 @@
 
 using System.ComponentModel.DataAnnotations;
 using NoFrixion.MoneyMoov.Extensions;
+using LanguageExt;
 
 namespace NoFrixion.MoneyMoov.Models;
 
@@ -375,23 +376,30 @@ public bool HasWebHook()
         return !string.IsNullOrEmpty(SuccessWebHookUrl);
     }
 
-    public Uri GetSuccessWebhookUri()
+    public Either<NoFrixionProblem, Uri> GetSuccessWebhookUri()
     {
-        if (string.IsNullOrEmpty(SuccessWebHookUrl))
+        if (string.IsNullOrWhiteSpace(SuccessWebHookUrl))
         {
             return new Uri(MoneyMoovConstants.WEBHOOK_BLACKHOLE_URI);
         }
         else
         {
-            var successWebHookUri = new UriBuilder(SuccessWebHookUrl);
-
-            string successParams = $"id={ID}&orderid={OrderID ?? string.Empty}";
-
-            successWebHookUri.Query = string.IsNullOrEmpty(successWebHookUri.Query)
-                                          ? successParams
-                                          : successWebHookUri.Query + "&" + successParams;
-
-            return successWebHookUri.Uri;
+            if (Uri.TryCreate(SuccessWebHookUrl, UriKind.Absolute, out Uri? uri))
+            {
+                var successWebHookUri = new UriBuilder(uri);
+
+                string successParams = $"id={ID}&orderid={OrderID ?? string.Empty}";
+
+                successWebHookUri.Query = string.IsNullOrEmpty(successWebHookUri.Query)
+                                              ? successParams
+                                              : successWebHookUri.Query + "&" + successParams;
+
+                return successWebHookUri.Uri;
+            }
+            else
+            {
+                return new NoFrixionProblem($"The success web hook URL {SuccessWebHookUrl} for payment request ID {ID} is not a valid URL.");
+            }
         }
     }