Support for StripeAccount in StripeClient and StripeContext in StripeClientOptions (#3058)

Author: jar-stripe

src/Stripe.net/Infrastructure/Public/StripeClientOptions.cs

@@ -36,6 +36,12 @@ public class StripeClientOptions
         /// <value>The base URL for Stripe's Meter Events API.</value>
         public string MeterEventsBase { get; set; }
 
+        /// <summary>Gets and sets the Stripe-Account header value for requests made from this client.</summary>
+        public string StripeAccount { get; set; }
+
+        /// <summary>Gets and sets the Stripe-Context header value for requests made from this client.</summary>
+        public string StripeContext { get; set; }
+
         internal StripeClientOptions Clone()
         {
             return (StripeClientOptions)this.MemberwiseClone();

src/Stripe.net/Services/_common/RequestOptions.cs

@@ -71,6 +71,16 @@ internal static T WithClientOptions<T>(this T requestOptions, StripeClientOption
                 clone.ApiKey = clientOptions.ApiKey;
             }
 
+            if (string.IsNullOrEmpty(clone.StripeContext))
+            {
+                clone.StripeContext = clientOptions.StripeContext;
+            }
+
+            if (string.IsNullOrEmpty(clone.StripeAccount))
+            {
+                clone.StripeAccount = clientOptions.StripeAccount;
+            }
+
             return clone;
         }
 

src/StripeTests/Infrastructure/Public/LiveApiRequestorTest.cs

@@ -641,6 +641,55 @@ public void Deserialize()
             Assert.Equal(typeof(Foo), deserialized.GetType());
         }
 
+        [Fact]
+        public async Task StripeContextHeaderSet()
+        {
+            var apiRequestorWithContext = new LiveApiRequestor(new StripeClientOptions
+            {
+                ApiKey = "sk_test_123",
+                HttpClient = this.httpClient,
+                StripeContext = "ctx_1234",
+            });
+            var response = new StripeResponse(HttpStatusCode.OK, null, "{}");
+            this.httpClient.Response = response;
+
+            var service = new CustomerService(apiRequestorWithContext);
+
+            await service.CreateAsync(new CustomerCreateOptions() { });
+            var lastRequest = this.httpClient.LastRequest;
+            Assert.Equal("ctx_1234", lastRequest.StripeHeaders["Stripe-Context"]);
+
+            // If its set in the request options, that takes precendence
+            await service.CreateAsync(new CustomerCreateOptions() { }, new RequestOptions { StripeContext = "ctx_2345" });
+            lastRequest = this.httpClient.LastRequest;
+            Assert.Equal("ctx_2345", lastRequest.StripeHeaders["Stripe-Context"]);
+        }
+
+        [Fact]
+        public async Task StripeAccountHeaderSet()
+        {
+            var apiRequestorWithContext = new LiveApiRequestor(new StripeClientOptions
+            {
+                ApiKey = "sk_test_123",
+                HttpClient = this.httpClient,
+                StripeAccount = "acct_1234",
+            });
+
+            var response = new StripeResponse(HttpStatusCode.OK, null, "{}");
+            this.httpClient.Response = response;
+
+            var service = new CustomerService(apiRequestorWithContext);
+
+            await service.CreateAsync(new CustomerCreateOptions() { });
+            var lastRequest = this.httpClient.LastRequest;
+            Assert.Equal("acct_1234", lastRequest.StripeHeaders["Stripe-Account"]);
+
+            // If its set in the request options, that takes precendence
+            await service.CreateAsync(new CustomerCreateOptions() { }, new RequestOptions { StripeAccount = "acct_2345" });
+            lastRequest = this.httpClient.LastRequest;
+            Assert.Equal("acct_2345", lastRequest.StripeHeaders["Stripe-Account"]);
+        }
+
         private class Foo : StripeEntity<Foo>
         {
             [JsonProperty("bar")]

src/StripeTests/Infrastructure/Public/StripeClientTest.cs

@@ -33,6 +33,8 @@ public void Ctr_StripeClientOptions()
                 MeterEventsBase = "localhost:6502",
                 FilesBase = "localhost:555",
                 HttpClient = new TestHttpClient(),
+                StripeAccount = "acct",
+                StripeContext = "ctx",
             };
 
             // This test is designed to ensure StripeClient properly consumes all options.  If any are

src/StripeTests/Services/_common/RequestOptionsTest.cs

@@ -0,0 +1,68 @@
+namespace StripeTests
+{
+    using System;
+    using Stripe;
+    using Stripe.Infrastructure.FormEncoding;
+    using Xunit;
+
+    public class RequestOptionsTest : BaseStripeTest
+    {
+        [Fact]
+        public void WithClientOptionsSetsApiKey()
+        {
+            var clientOptions = new StripeClientOptions
+            {
+                ApiKey = "12345",
+            };
+
+            // Should copy when request option is empty
+            var options = new RequestOptions();
+            var newOptions = options.WithClientOptions(clientOptions);
+            Assert.Equal(clientOptions.ApiKey, newOptions.ApiKey);
+
+            // Should NOT copy when request option is set
+            options = new RequestOptions() { ApiKey = "23456" };
+            newOptions = options.WithClientOptions(clientOptions);
+            Assert.Equal(options.ApiKey, newOptions.ApiKey);
+        }
+
+        [Fact]
+
+        public void WithClientOptionsSetsStripeContext()
+        {
+            var clientOptions = new StripeClientOptions
+            {
+                StripeContext = "ctx_12345",
+            };
+
+            // Should copy when request option is empty
+            var options = new RequestOptions();
+            var newOptions = options.WithClientOptions(clientOptions);
+            Assert.Equal(clientOptions.StripeContext, newOptions.StripeContext);
+
+            // Should NOT copy when request option is set
+            options = new RequestOptions() { StripeContext = "ctx_23456" };
+            newOptions = options.WithClientOptions(clientOptions);
+            Assert.Equal(options.StripeContext, newOptions.StripeContext);
+        }
+
+        [Fact]
+        public void WithClientOptionsSetsStripeAccount()
+        {
+            var clientOptions = new StripeClientOptions
+            {
+                StripeAccount = "acct_12345",
+            };
+
+            // Should copy when request option is empty
+            var options = new RequestOptions();
+            var newOptions = options.WithClientOptions(clientOptions);
+            Assert.Equal(clientOptions.StripeAccount, newOptions.StripeAccount);
+
+            // Should NOT copy when request option is set
+            options = new RequestOptions() { StripeAccount = "acct_23456" };
+            newOptions = options.WithClientOptions(clientOptions);
+            Assert.Equal(options.StripeAccount, newOptions.StripeAccount);
+        }
+    }
+}