Merge branch 'feature/on_behalf_of' into develop

Jericho · Nov 16, 2017 · 1ed7dc0 · 1ed7dc0
2 parents 46aeaf8 + 4a5d8bc
commit 1ed7dc0
Show file tree

Hide file tree

Showing 72 changed files with 1,392 additions and 787 deletions.
diff --git a/Source/StrongGrid.IntegrationTests/Program.cs b/Source/StrongGrid.IntegrationTests/Program.cs
diff --git a/Source/StrongGrid.UnitTests/Resources/AccessManagementTests.cs b/Source/StrongGrid.UnitTests/Resources/AccessManagementTests.cs
@@ -123,7 +123,7 @@ public async Task GetAccessHistory()
 			var accessManagement = new AccessManagement(client);
 
 			// Act
-			var result = await accessManagement.GetAccessHistoryAsync(20, CancellationToken.None).ConfigureAwait(false);
+			var result = await accessManagement.GetAccessHistoryAsync(20, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -143,7 +143,7 @@ public async Task GetWhitelistedIpAddresses()
 			var accessManagement = new AccessManagement(client);
 
 			// Act
-			var result = await accessManagement.GetWhitelistedIpAddressesAsync(CancellationToken.None).ConfigureAwait(false);
+			var result = await accessManagement.GetWhitelistedIpAddressesAsync(null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -165,7 +165,7 @@ public async Task AddIpAddressToWhitelist()
 			var accessManagement = new AccessManagement(client);
 
 			// Act
-			var result = await accessManagement.AddIpAddressToWhitelistAsync(ip, CancellationToken.None).ConfigureAwait(false);
+			var result = await accessManagement.AddIpAddressToWhitelistAsync(ip, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -186,7 +186,7 @@ public async Task AddIpAddressesToWhitelist()
 			var accessManagement = new AccessManagement(client);
 
 			// Act
-			var result = await accessManagement.AddIpAddressesToWhitelistAsync(ips, CancellationToken.None).ConfigureAwait(false);
+			var result = await accessManagement.AddIpAddressesToWhitelistAsync(ips, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -208,7 +208,7 @@ public async Task RemoveIpAddressFromWhitelistAsync()
 			var accessManagement = new AccessManagement(client);
 
 			// Act
-			await accessManagement.RemoveIpAddressFromWhitelistAsync(id, CancellationToken.None).ConfigureAwait(false);
+			await accessManagement.RemoveIpAddressFromWhitelistAsync(id, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -228,7 +228,7 @@ public async Task RemoveIpAddressesFromWhitelistAsync()
 			var accessManagement = new AccessManagement(client);
 
 			// Act
-			await accessManagement.RemoveIpAddressesFromWhitelistAsync(ids, CancellationToken.None).ConfigureAwait(false);
+			await accessManagement.RemoveIpAddressesFromWhitelistAsync(ids, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -251,7 +251,7 @@ public async Task GetWhitelistedIpAddressAsync()
 			var accessManagement = new AccessManagement(client);
 
 			// Act
-			var result = await accessManagement.GetWhitelistedIpAddressAsync(id, CancellationToken.None).ConfigureAwait(false);
+			var result = await accessManagement.GetWhitelistedIpAddressAsync(id, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();

diff --git a/Source/StrongGrid.UnitTests/Resources/AlertsTests.cs b/Source/StrongGrid.UnitTests/Resources/AlertsTests.cs
@@ -89,7 +89,7 @@ public async Task Create()
 			var alerts = new Alerts(client);
 
 			// Act
-			var result = await alerts.CreateAsync(type, emailTo, frequency, percentage, CancellationToken.None).ConfigureAwait(false);
+			var result = await alerts.CreateAsync(type, emailTo, frequency, percentage, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -110,7 +110,7 @@ public async Task Get()
 			var alerts = new Alerts(client);
 
 			// Act
-			var result = await alerts.GetAsync(alertId, CancellationToken.None).ConfigureAwait(false);
+			var result = await alerts.GetAsync(alertId, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -129,7 +129,7 @@ public async Task GetAll()
 			var alerts = new Alerts(client);
 
 			// Act
-			var result = await alerts.GetAllAsync(CancellationToken.None).ConfigureAwait(false);
+			var result = await alerts.GetAllAsync(null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -151,7 +151,7 @@ public async Task Delete()
 			var alerts = new Alerts(client);
 
 			// Act
-			await alerts.DeleteAsync(alertId, CancellationToken.None).ConfigureAwait(false);
+			await alerts.DeleteAsync(alertId, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -172,7 +172,7 @@ public async Task Update()
 			var alerts = new Alerts(client);
 
 			// Act
-			var result = await alerts.UpdateAsync(alertId, null, emailTo, null, null, CancellationToken.None).ConfigureAwait(false);
+			var result = await alerts.UpdateAsync(alertId, null, emailTo, null, null, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();

diff --git a/Source/StrongGrid.UnitTests/Resources/ApiKeysTests.cs b/Source/StrongGrid.UnitTests/Resources/ApiKeysTests.cs
@@ -73,7 +73,7 @@ public async Task CreateAsync()
 			var apiKeys = new ApiKeys(client);
 
 			// Act
-			var result = await apiKeys.CreateAsync(name, scopes, CancellationToken.None).ConfigureAwait(false);
+			var result = await apiKeys.CreateAsync(name, scopes, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -94,7 +94,7 @@ public async Task GetAsync()
 			var apiKeys = new ApiKeys(client);
 
 			// Act
-			var result = await apiKeys.GetAsync(keyId, CancellationToken.None).ConfigureAwait(false);
+			var result = await apiKeys.GetAsync(keyId, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -113,7 +113,7 @@ public async Task GetAllAsync()
 			var apiKeys = new ApiKeys(client);
 
 			// Act
-			var result = await apiKeys.GetAllAsync(CancellationToken.None).ConfigureAwait(false);
+			var result = await apiKeys.GetAllAsync(null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -135,7 +135,7 @@ public async Task DeleteAsync()
 			var apiKeys = new ApiKeys(client);
 
 			// Act
-			await apiKeys.DeleteAsync(keyId, CancellationToken.None).ConfigureAwait(false);
+			await apiKeys.DeleteAsync(keyId, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -157,7 +157,7 @@ public async Task UpdateAsync_with_scopes()
 			var apiKeys = new ApiKeys(client);
 
 			// Act
-			var result = await apiKeys.UpdateAsync(keyId, name, scopes, CancellationToken.None).ConfigureAwait(false);
+			var result = await apiKeys.UpdateAsync(keyId, name, scopes, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -180,7 +180,7 @@ public async Task UpdateAsync_without_scopes()
 			var apiKeys = new ApiKeys(client);
 
 			// Act
-			var result = await apiKeys.UpdateAsync(keyId, name, scopes, CancellationToken.None).ConfigureAwait(false);
+			var result = await apiKeys.UpdateAsync(keyId, name, scopes, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -201,7 +201,7 @@ public async Task CreateWithBillingPermissionsAsync()
 			var apiKeys = new ApiKeys(client);
 
 			// Act
-			var result = await apiKeys.CreateWithBillingPermissionsAsync(name, CancellationToken.None).ConfigureAwait(false);
+			var result = await apiKeys.CreateWithBillingPermissionsAsync(name, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -230,7 +230,7 @@ public async Task CreateWithAllPermissionsAsync()
 			var apiKeys = new ApiKeys(client);
 
 			// Act
-			var result = await apiKeys.CreateWithAllPermissionsAsync(name, CancellationToken.None).ConfigureAwait(false);
+			var result = await apiKeys.CreateWithAllPermissionsAsync(name, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();

diff --git a/Source/StrongGrid.UnitTests/Resources/BlocksTests.cs b/Source/StrongGrid.UnitTests/Resources/BlocksTests.cs
@@ -142,7 +142,7 @@ public async Task GetAsync()
 			var blocks = new Blocks(client);
 
 			// Act
-			var result = await blocks.GetAsync(emailAddress, CancellationToken.None).ConfigureAwait(false);
+			var result = await blocks.GetAsync(emailAddress, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();

diff --git a/Source/StrongGrid.UnitTests/Resources/BouncesTests.cs b/Source/StrongGrid.UnitTests/Resources/BouncesTests.cs
@@ -72,7 +72,7 @@ public async Task GetAllAsync_between_startdate_and_enddate()
 			var bounces = new Bounces(client);
 
 			// Act
-			var result = await bounces.GetAllAsync(start, end, CancellationToken.None).ConfigureAwait(false);
+			var result = await bounces.GetAllAsync(start, end, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -94,7 +94,7 @@ public async Task GetAsync_by_email()
 			var bounces = new Bounces(client);
 
 			// Act
-			var result = await bounces.GetAsync(email, CancellationToken.None).ConfigureAwait(false);
+			var result = await bounces.GetAsync(email, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -114,7 +114,7 @@ public async Task DeleteAllAsync()
 			var bounces = new Bounces(client);
 
 			// Act
-			await bounces.DeleteAllAsync(CancellationToken.None).ConfigureAwait(false);
+			await bounces.DeleteAllAsync(null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -134,7 +134,7 @@ public async Task DeleteAsync_by_single_email()
 			var bounces = new Bounces(client);
 
 			// Act
-			await bounces.DeleteAsync(email, CancellationToken.None).ConfigureAwait(false);
+			await bounces.DeleteAsync(email, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -154,7 +154,7 @@ public async Task DeleteAsync_by_multiple_emails()
 			var bounces = new Bounces(client);
 
 			// Act
-			await bounces.DeleteAsync(emails, CancellationToken.None).ConfigureAwait(false);
+			await bounces.DeleteAsync(emails, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();

diff --git a/Source/StrongGrid.UnitTests/Resources/CategoriesTests.cs b/Source/StrongGrid.UnitTests/Resources/CategoriesTests.cs
@@ -38,7 +38,7 @@ public async Task GetAsync_multiple()
 			var categories = new Categories(client);
 
 			// Act
-			var result = await categories.GetAsync(null, limit, offset, CancellationToken.None).ConfigureAwait(false);
+			var result = await categories.GetAsync(null, limit, offset, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();

diff --git a/Source/StrongGrid.UnitTests/Resources/ContactsTests.cs b/Source/StrongGrid.UnitTests/Resources/ContactsTests.cs
@@ -125,7 +125,7 @@ public async Task CreateAsync_success()
 			var contacts = new Contacts(client);
 
 			// Act
-			var result = await contacts.CreateAsync(email, firstName, lastName, null, CancellationToken.None).ConfigureAwait(false);
+			var result = await contacts.CreateAsync(email, firstName, lastName, null, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -169,7 +169,7 @@ public async Task CreateAsync_failure()
 			var contacts = new Contacts(client);
 
 			// Act
-			var result = await Should.ThrowAsync<Exception>(async () => await contacts.CreateAsync(email, firstName, lastName, null, CancellationToken.None).ConfigureAwait(false));
+			var result = await Should.ThrowAsync<Exception>(async () => await contacts.CreateAsync(email, firstName, lastName, null, null, CancellationToken.None).ConfigureAwait(false));
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -220,7 +220,7 @@ public async Task ImportAsync()
 			var contacts = new Contacts(client);
 
 			// Act
-			var result = await contacts.ImportAsync(records, CancellationToken.None).ConfigureAwait(false);
+			var result = await contacts.ImportAsync(records, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -264,7 +264,7 @@ public async Task UpdateAsync_success()
 			var contacts = new Contacts(client);
 
 			// Act
-			await contacts.UpdateAsync(email, null, lastName, null, CancellationToken.None).ConfigureAwait(false);
+			await contacts.UpdateAsync(email, null, lastName, null, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -306,7 +306,7 @@ public async Task UpdateAsync_failure()
 			var contacts = new Contacts(client);
 
 			// Act
-			var result = await Should.ThrowAsync<Exception>(async () => await contacts.UpdateAsync(email, null, lastName, null, CancellationToken.None).ConfigureAwait(false)).ConfigureAwait(false);
+			var result = await Should.ThrowAsync<Exception>(async () => await contacts.UpdateAsync(email, null, lastName, null, null, CancellationToken.None).ConfigureAwait(false)).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -328,7 +328,7 @@ public async Task GetAsync_single()
 			var contacts = new Contacts(client);
 
 			// Act
-			var result = await contacts.GetAsync(contactId, CancellationToken.None).ConfigureAwait(false);
+			var result = await contacts.GetAsync(contactId, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -355,7 +355,7 @@ public async Task GetAsync_multiple()
 			var contacts = new Contacts(client);
 
 			// Act
-			var result = await contacts.GetAsync(recordsPerPage, page, CancellationToken.None).ConfigureAwait(false);
+			var result = await contacts.GetAsync(recordsPerPage, page, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -383,7 +383,7 @@ public async Task DeleteAsync_single()
 			var contacts = new Contacts(client);
 
 			// Act
-			await contacts.DeleteAsync(contactId, CancellationToken.None).ConfigureAwait(false);
+			await contacts.DeleteAsync(contactId, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -403,7 +403,7 @@ public async Task DeleteAsync_multiple()
 			var contacts = new Contacts(client);
 
 			// Act
-			await contacts.DeleteAsync(contactIds, CancellationToken.None).ConfigureAwait(false);
+			await contacts.DeleteAsync(contactIds, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -425,7 +425,7 @@ public async Task GetBillableCountAsync()
 			var contacts = new Contacts(client);
 
 			// Act
-			var result = await contacts.GetBillableCountAsync(CancellationToken.None).ConfigureAwait(false);
+			var result = await contacts.GetBillableCountAsync(null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -448,7 +448,7 @@ public async Task GetTotalCountAsync()
 			var contacts = new Contacts(client);
 
 			// Act
-			var result = await contacts.GetTotalCountAsync(CancellationToken.None).ConfigureAwait(false);
+			var result = await contacts.GetTotalCountAsync(null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -522,7 +522,7 @@ public async Task SearchAsync()
 			var contacts = new Contacts(client);
 
 			// Act
-			var result = await contacts.SearchAsync(conditions, listId, CancellationToken.None).ConfigureAwait(false);
+			var result = await contacts.SearchAsync(conditions, listId, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -580,7 +580,7 @@ public async Task SearchAsync_without_conditions()
 			var contacts = new Contacts(client);
 
 			// Act
-			var result = await contacts.SearchAsync(conditions, listId, CancellationToken.None).ConfigureAwait(false);
+			var result = await contacts.SearchAsync(conditions, listId, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();
@@ -622,7 +622,7 @@ public async Task GetListsAsync()
 			var contacts = new Contacts(client);
 
 			// Act
-			var result = await contacts.GetListsAsync(contactId, CancellationToken.None).ConfigureAwait(false);
+			var result = await contacts.GetListsAsync(contactId, null, CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();