Added the rest of the needed cancellation token passing

twilio · Jan 13, 2025 · 281e6a8 · 281e6a8
1 parent 5313061
commit 281e6a8
Show file tree

Hide file tree

Showing 510 changed files with 2,950 additions and 2,915 deletions.
diff --git a/global.json b/global.json
diff --git a/src/Twilio/Clients/BearerToken/TwilioOrgsTokenRestClient.cs b/src/Twilio/Clients/BearerToken/TwilioOrgsTokenRestClient.cs
@@ -236,7 +236,7 @@ public bool isTokenExpired(string token){
         ///
         /// <param name="request">request to make</param>
         /// <returns>Task that resolves to the response of the request</returns>
-        public async Task<Response> RequestAsync(TokenRequest request, CancellationToken cancellationToken = default)
+        public async Task<Response> RequestAsync(TokenRequest request, System.Threading.CancellationToken cancellationToken = default)
         {
             request.SetAuth(_accessToken);
 

diff --git a/src/Twilio/Clients/ITwilioRestClient.cs b/src/Twilio/Clients/ITwilioRestClient.cs
@@ -37,7 +37,7 @@ public interface ITwilioRestClient
         ///
         /// <param name="request">Request to make</param>
         /// <returns>response of the request</returns>
-        System.Threading.Tasks.Task<Response> RequestAsync(Request request,  CancellationToken cancellationToken = default);
+        System.Threading.Tasks.Task<Response> RequestAsync(Request request, System.Threading.CancellationToken cancellationToken = default);
 #endif
     }
 }

diff --git a/src/Twilio/Clients/TwilioRestClient.cs b/src/Twilio/Clients/TwilioRestClient.cs
@@ -169,7 +169,7 @@ public Response Request(Request request)
         ///
         /// <param name="request">request to make</param>
         /// <returns>Task that resolves to the response of the request</returns>
-        public async Task<Response> RequestAsync(Request request,  CancellationToken cancellationToken = default)
+        public async Task<Response> RequestAsync(Request request,  System.Threading.CancellationToken cancellationToken = default)
         {
             if(_username != null && _password != null){
                 request.SetAuth(_username, _password);

diff --git a/src/Twilio/Http/BearerToken/SystemNetTokenHttpClient.cs b/src/Twilio/Http/BearerToken/SystemNetTokenHttpClient.cs
@@ -60,7 +60,7 @@ public override Response MakeRequest(TokenRequest request)
         /// </summary>
         /// <param name="request">Twilio response</param>
         /// <returns>Task that resolves to the response</returns>
-        public override async Task<Response> MakeRequestAsync(TokenRequest request, CancellationToken cancellationToken = default)
+        public override async Task<Response> MakeRequestAsync(TokenRequest request, System.Threading.CancellationToken cancellationToken = default)
         {
             var httpRequest = BuildHttpRequest(request);
             if (!Equals(request.Method, HttpMethod.Get))
@@ -87,7 +87,7 @@ public override async Task<Response> MakeRequestAsync(TokenRequest request, Canc
             // Create and return a new Response. Keep a reference to the last
             // response for debugging, but don't return it as it may be shared
             // among threads.
-            var response = new Response(httpResponse.StatusCode, await reader.ReadToEndAsync(cancellationToken).ConfigureAwait(false), httpResponse.Headers);
+            var response = new Response(httpResponse.StatusCode, await reader.ReadToEndAsync().ConfigureAwait(false), httpResponse.Headers);
             this.LastResponse = response;
             return response;
         }

diff --git a/src/Twilio/Http/BearerToken/TokenHttpClient.cs b/src/Twilio/Http/BearerToken/TokenHttpClient.cs
@@ -36,7 +36,7 @@ public abstract class TokenHttpClient
         /// <param name="request">request to make</param>
         /// <exception>throws exception on network or connection errors.</exception>
         /// <returns>response of the request</returns>
-        public abstract System.Threading.Tasks.Task<Response> MakeRequestAsync(TokenRequest request, CancellationToken cancellationToken = Default);
+        public abstract System.Threading.Tasks.Task<Response> MakeRequestAsync(TokenRequest request, System.Threading.CancellationToken cancellationToken = default);
 #endif
 
     }

diff --git a/src/Twilio/Http/HttpClient.cs b/src/Twilio/Http/HttpClient.cs
@@ -34,7 +34,7 @@ public abstract class HttpClient
         /// <param name="request">request to make</param>
         /// <exception>throws exception on network or connection errors.</exception>
         /// <returns>response of the request</returns>
-        public abstract System.Threading.Tasks.Task<Response> MakeRequestAsync(Request request,  CancellationToken cancellationToken = default);
+        public abstract System.Threading.Tasks.Task<Response> MakeRequestAsync(Request request,  System.Threading.CancellationToken cancellationToken = default);
 #endif
 
         /// <summary>

diff --git a/src/Twilio/Http/SystemNetHttpClient.cs b/src/Twilio/Http/SystemNetHttpClient.cs
@@ -58,7 +58,7 @@ public override Response MakeRequest(Request request)
         /// </summary>
         /// <param name="request">Twilio response</param>
         /// <returns>Task that resolves to the response</returns>
-        public override async Task<Response> MakeRequestAsync(Request request, CancellationToken cancellationToken = default)
+        public override async Task<Response> MakeRequestAsync(Request request, System.Threading.CancellationToken cancellationToken = default)
         {
             var httpRequest = BuildHttpRequest(request);
             if (!Equals(request.Method, HttpMethod.Get))
@@ -82,7 +82,7 @@ public override async Task<Response> MakeRequestAsync(Request request, Cancellat
             // Create and return a new Response. Keep a reference to the last
             // response for debugging, but don't return it as it may be shared
             // among threads.
-            var response = new Response(httpResponse.StatusCode, await reader.ReadToEndAsync(cancellationToken).ConfigureAwait(false), httpResponse.Headers);
+            var response = new Response(httpResponse.StatusCode, await reader.ReadToEndAsync().ConfigureAwait(false), httpResponse.Headers);
             this.LastResponse = response;
             return response;
         }

diff --git a/src/Twilio/Rest/Accounts/V1/AuthTokenPromotionResource.cs b/src/Twilio/Rest/Accounts/V1/AuthTokenPromotionResource.cs
@@ -68,7 +68,7 @@ public static AuthTokenPromotionResource Update(UpdateAuthTokenPromotionOptions
         #if !NET35
         public static async System.Threading.Tasks.Task<AuthTokenPromotionResource> UpdateAsync(UpdateAuthTokenPromotionOptions options, 
                                                                                                     ITwilioRestClient client = null,
-                                                                                                    CancellationToken cancellationToken = default)
+                                                                                                    System.Threading.CancellationToken cancellationToken = default)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = await client.RequestAsync(BuildUpdateRequest(options, client), cancellationToken);
@@ -92,7 +92,7 @@ public static AuthTokenPromotionResource Update(
         /// <returns> Task that resolves to A single instance of AuthTokenPromotion </returns>
         public static async System.Threading.Tasks.Task<AuthTokenPromotionResource> UpdateAsync(
                                                                                 ITwilioRestClient client = null,
-                                                                                CancellationToken cancellationToken = default)
+                                                                                System.Threading.CancellationToken cancellationToken = default)
         {
             var options = new UpdateAuthTokenPromotionOptions(){  };
             return await UpdateAsync(options, client, cancellationToken);

diff --git a/src/Twilio/Rest/Accounts/V1/BulkConsentsResource.cs b/src/Twilio/Rest/Accounts/V1/BulkConsentsResource.cs
@@ -66,7 +66,7 @@ public static BulkConsentsResource Create(CreateBulkConsentsOptions options, ITw
         /// <param name="options"> Create BulkConsents parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of BulkConsents </returns>
-        public static async System.Threading.Tasks.Task<BulkConsentsResource> CreateAsync(CreateBulkConsentsOptions options, ITwilioRestClient client = null,  CancellationToken cancellationToken = default)
+        public static async System.Threading.Tasks.Task<BulkConsentsResource> CreateAsync(CreateBulkConsentsOptions options, ITwilioRestClient client = null, System.Threading.CancellationToken cancellationToken = default)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = await client.RequestAsync(BuildCreateRequest(options, client), cancellationToken);
@@ -93,7 +93,8 @@ public static BulkConsentsResource Create(
         /// <returns> Task that resolves to A single instance of BulkConsents </returns>
         public static async System.Threading.Tasks.Task<BulkConsentsResource> CreateAsync(
                                                                                   List<object> items,
-                                                                                    ITwilioRestClient client = null)
+                                                                                    ITwilioRestClient client = null,
+                                                                                    System.Threading.CancellationToken cancellationToken = default)
         {
         var options = new CreateBulkConsentsOptions(items){  };
             return await CreateAsync(options, client, cancellationToken);

diff --git a/src/Twilio/Rest/Accounts/V1/BulkContactsResource.cs b/src/Twilio/Rest/Accounts/V1/BulkContactsResource.cs
@@ -66,7 +66,7 @@ public static BulkContactsResource Create(CreateBulkContactsOptions options, ITw
         /// <param name="options"> Create BulkContacts parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of BulkContacts </returns>
-        public static async System.Threading.Tasks.Task<BulkContactsResource> CreateAsync(CreateBulkContactsOptions options, ITwilioRestClient client = null,  CancellationToken cancellationToken = default)
+        public static async System.Threading.Tasks.Task<BulkContactsResource> CreateAsync(CreateBulkContactsOptions options, ITwilioRestClient client = null, System.Threading.CancellationToken cancellationToken = default)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = await client.RequestAsync(BuildCreateRequest(options, client), cancellationToken);
@@ -93,7 +93,8 @@ public static BulkContactsResource Create(
         /// <returns> Task that resolves to A single instance of BulkContacts </returns>
         public static async System.Threading.Tasks.Task<BulkContactsResource> CreateAsync(
                                                                                   List<object> items,
-                                                                                    ITwilioRestClient client = null)
+                                                                                  ITwilioRestClient client = null,
+                                                                                  System.Threading.CancellationToken cancellationToken = default)
         {
         var options = new CreateBulkContactsOptions(items){  };
             return await CreateAsync(options, client, cancellationToken);

diff --git a/src/Twilio/Rest/Accounts/V1/Credential/AwsResource.cs b/src/Twilio/Rest/Accounts/V1/Credential/AwsResource.cs
@@ -66,7 +66,7 @@ public static AwsResource Create(CreateAwsOptions options, ITwilioRestClient cli
         /// <param name="options"> Create Aws parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> CreateAsync(CreateAwsOptions options, ITwilioRestClient client = null,  CancellationToken cancellationToken = default)
+        public static async System.Threading.Tasks.Task<AwsResource> CreateAsync(CreateAwsOptions options, ITwilioRestClient client = null,  System.Threading.CancellationToken cancellationToken = default)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = await client.RequestAsync(BuildCreateRequest(options, client), cancellationToken);
@@ -101,7 +101,8 @@ public static async System.Threading.Tasks.Task<AwsResource> CreateAsync(
                                                                                   string credentials,
                                                                                   string friendlyName = null,
                                                                                   string accountSid = null,
-                                                                                    ITwilioRestClient client = null)
+                                                                                    ITwilioRestClient client = null,
+                                                                                    System.Threading.CancellationToken cancellationToken = default)
         {
         var options = new CreateAwsOptions(credentials){  FriendlyName = friendlyName, AccountSid = accountSid };
             return await CreateAsync(options, client, cancellationToken);
@@ -147,7 +148,7 @@ public static bool Delete(DeleteAwsOptions options, ITwilioRestClient client = n
         /// <returns> Task that resolves to A single instance of Aws </returns>
         public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAwsOptions options, 
                                                                         ITwilioRestClient client = null,
-                                                                        CancellationToken cancellationToken = default)
+                                                                        System.Threading.CancellationToken cancellationToken = default)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = await client.RequestAsync(BuildDeleteRequest(options, client), cancellationToken);
@@ -170,7 +171,7 @@ public static bool Delete(string pathSid, ITwilioRestClient client = null)
         /// <param name="pathSid"> The Twilio-provided string that uniquely identifies the AWS resource to delete. </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null,  CancellationToken cancellationToken = default)
+        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null,  System.Threading.CancellationToken cancellationToken = default)
         {
             var options = new DeleteAwsOptions(pathSid) ;
             return await DeleteAsync(options, client, cancellationToken);
@@ -210,7 +211,7 @@ public static AwsResource Fetch(FetchAwsOptions options, ITwilioRestClient clien
         /// <param name="options"> Fetch Aws parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> FetchAsync(FetchAwsOptions options, ITwilioRestClient client = null,  CancellationToken cancellationToken = default)
+        public static async System.Threading.Tasks.Task<AwsResource> FetchAsync(FetchAwsOptions options, ITwilioRestClient client = null,  System.Threading.CancellationToken cancellationToken = default)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = await client.RequestAsync(BuildFetchRequest(options, client), cancellationToken);
@@ -234,7 +235,7 @@ public static AwsResource Fetch(
         /// <param name="pathSid"> The Twilio-provided string that uniquely identifies the AWS resource to fetch. </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> FetchAsync(string pathSid, ITwilioRestClient client = null,  CancellationToken cancellationToken = default)
+        public static async System.Threading.Tasks.Task<AwsResource> FetchAsync(string pathSid, ITwilioRestClient client = null,  System.Threading.CancellationToken cancellationToken = default)
         {
             var options = new FetchAwsOptions(pathSid){  };
             return await FetchAsync(options, client, cancellationToken);
@@ -272,7 +273,7 @@ public static ResourceSet<AwsResource> Read(ReadAwsOptions options, ITwilioRestC
         /// <param name="options"> Read Aws parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AwsResource>> ReadAsync(ReadAwsOptions options, ITwilioRestClient client = null,  CancellationToken cancellationToken = default)
+        public static async System.Threading.Tasks.Task<ResourceSet<AwsResource>> ReadAsync(ReadAwsOptions options, ITwilioRestClient client = null,  System.Threading.CancellationToken cancellationToken = default)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = await client.RequestAsync(BuildReadRequest(options, client), cancellationToken);
@@ -304,7 +305,8 @@ public static ResourceSet<AwsResource> Read(
         public static async System.Threading.Tasks.Task<ResourceSet<AwsResource>> ReadAsync(
                                                                                              int? pageSize = null,
                                                                                              long? limit = null,
-                                                                                            ITwilioRestClient client = null)
+                                                                                            ITwilioRestClient client = null,
+                                                                                    System.Threading.CancellationToken cancellationToken = default)
         {
             var options = new ReadAwsOptions(){ PageSize = pageSize, Limit = limit};
             return await ReadAsync(options, client, cancellationToken);
@@ -396,7 +398,7 @@ public static AwsResource Update(UpdateAwsOptions options, ITwilioRestClient cli
         #if !NET35
         public static async System.Threading.Tasks.Task<AwsResource> UpdateAsync(UpdateAwsOptions options, 
                                                                                                     ITwilioRestClient client = null,
-                                                                                                    CancellationToken cancellationToken = default)
+                                                                                                    System.Threading.CancellationToken cancellationToken = default)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = await client.RequestAsync(BuildUpdateRequest(options, client), cancellationToken);
@@ -427,7 +429,8 @@ public static AwsResource Update(
         public static async System.Threading.Tasks.Task<AwsResource> UpdateAsync(
                                                                               string pathSid,
                                                                               string friendlyName = null,
-                                                                                ITwilioRestClient client = null)
+                                                                                ITwilioRestClient client = null,
+                                                                                    System.Threading.CancellationToken cancellationToken = default)
         {
             var options = new UpdateAwsOptions(pathSid){ FriendlyName = friendlyName };
             return await UpdateAsync(options, client, cancellationToken);