Raise ArgumentException on null or empty IDs (#1616)

stripe · May 13, 2019 · fdd767c · fdd767c
1 parent 2759786
commit fdd767c
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 0 deletions.
diff --git a/src/Stripe.net/Services/_base/Service.cs b/src/Stripe.net/Services/_base/Service.cs
@@ -1,5 +1,6 @@
 namespace Stripe
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Net;
@@ -301,6 +302,13 @@ protected virtual string ClassUrl()
 
         protected virtual string InstanceUrl(string id)
         {
+            if (string.IsNullOrWhiteSpace(id))
+            {
+                throw new ArgumentException(
+                    "The resource ID cannot be null or whitespace.",
+                    nameof(id));
+            }
+
             return $"{this.ClassUrl()}/{WebUtility.UrlEncode(id)}";
         }
 

diff --git a/src/Stripe.net/Services/_base/ServiceNested.cs b/src/Stripe.net/Services/_base/ServiceNested.cs
@@ -1,5 +1,6 @@
 namespace Stripe
 {
+    using System;
     using System.Collections.Generic;
     using System.Net;
     using System.Net.Http;
@@ -168,11 +169,32 @@ protected Task<EntityReturned> UpdateNestedEntityAsync(
 
         protected virtual string ClassUrl(string parentId)
         {
+            if (string.IsNullOrWhiteSpace(parentId))
+            {
+                throw new ArgumentException(
+                    "The parent resource ID cannot be null or whitespace.",
+                    nameof(parentId));
+            }
+
             return this.BasePath.Replace("{PARENT_ID}", parentId);
         }
 
         protected virtual string InstanceUrl(string parentId, string id)
         {
+            if (string.IsNullOrWhiteSpace(parentId))
+            {
+                throw new ArgumentException(
+                    "The parent resource ID cannot be null or whitespace.",
+                    nameof(parentId));
+            }
+
+            if (string.IsNullOrWhiteSpace(id))
+            {
+                throw new ArgumentException(
+                    "The resource ID cannot be null or whitespace.",
+                    nameof(id));
+            }
+
             return $"{this.ClassUrl(parentId)}/{WebUtility.UrlEncode(id)}";
         }
     }

diff --git a/src/StripeTests/Services/_base/ServiceTest.cs b/src/StripeTests/Services/_base/ServiceTest.cs
@@ -1,5 +1,6 @@
 namespace StripeTests
 {
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
     using System.Threading;
@@ -24,6 +25,33 @@ public void Get_ExpandProperties()
             Assert.Contains("multi_word_property", client.LastOptions.Expand);
         }
 
+        [Fact]
+        public void Get_ThrowsIfIdIsNull()
+        {
+            var client = new TestClient();
+            var service = new TestService { Client = client };
+
+            Assert.Throws<ArgumentException>(() => service.Get(null));
+        }
+
+        [Fact]
+        public void Get_ThrowsIfIdIsEmpty()
+        {
+            var client = new TestClient();
+            var service = new TestService { Client = client };
+
+            Assert.Throws<ArgumentException>(() => service.Get(string.Empty));
+        }
+
+        [Fact]
+        public void Get_ThrowsIfIdIsWhitespace()
+        {
+            var client = new TestClient();
+            var service = new TestService { Client = client };
+
+            Assert.Throws<ArgumentException>(() => service.Get(" "));
+        }
+
         [Fact]
         public void List_ExpandProperties()
         {