pass some missing cancellation tokens (#4503)

* pass some missing cancellation tokens * Update RegionManager.cs * Update JContainer.Async.cs
AzureAD · Jan 19, 2024 · 2a0aa37 · 2a0aa37
1 parent 7a051e9
commit 2a0aa37
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/client/Microsoft.Identity.Client/Http/HttpManagerWithRetry.cs b/src/client/Microsoft.Identity.Client/Http/HttpManagerWithRetry.cs
@@ -147,7 +147,7 @@ protected override async Task<HttpResponse> SendRequestAsync(
             if (isRetriable && retry)
             {
                 logger.Info("Retrying one more time..");
-                await Task.Delay(TimeSpan.FromSeconds(1)).ConfigureAwait(false);
+                await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken).ConfigureAwait(false);
                 return await SendRequestAsync(
                     endpoint,
                     headers,

diff --git a/src/client/Microsoft.Identity.Client/Instance/Region/RegionManager.cs b/src/client/Microsoft.Identity.Client/Instance/Region/RegionManager.cs
@@ -168,10 +168,10 @@ private async Task<RegionInfo> DiscoverAndCacheAsync(ILoggerAdapter logger, Canc
         private async Task<RegionInfo> DiscoverAsync(ILoggerAdapter logger, CancellationToken requestCancellationToken)
         {
             RegionInfo result = null;
+
+            await _lockDiscover.WaitAsync(requestCancellationToken).ConfigureAwait(false);
             try
             {
-                await _lockDiscover.WaitAsync().ConfigureAwait(false);
-
                 var regionInfo = GetCachedRegion(logger);
                 if (regionInfo != null)
                 {

diff --git a/...ient/Microsoft.Identity.Client/Internal/Requests/Interactive/AuthCodeExchangeComponent.cs b/...ient/Microsoft.Identity.Client/Internal/Requests/Interactive/AuthCodeExchangeComponent.cs
@@ -41,7 +41,7 @@ public AuthCodeExchangeComponent(
         public Task<MsalTokenResponse> FetchTokensAsync(CancellationToken cancellationToken)
         {
             AddCcsHeadersToTokenClient();
-            return _tokenClient.SendTokenRequestAsync(GetBodyParameters());
+            return _tokenClient.SendTokenRequestAsync(GetBodyParameters(), cancellationToken: cancellationToken);
         }
 
         private Dictionary<string, string> GetBodyParameters()

diff --git a/src/client/Microsoft.Identity.Client/Platforms/Features/WebView2WebUi/WebView2WebUi.cs b/src/client/Microsoft.Identity.Client/Platforms/Features/WebView2WebUi/WebView2WebUi.cs
@@ -75,7 +75,7 @@ public async Task<AuthorizationResult> AcquireAuthorizationAsync(
                                 sendAuthorizeRequest,
                                 cancellationToken,
                                 TaskCreationOptions.None,
-                                staTaskScheduler).Wait();
+                                staTaskScheduler).Wait(cancellationToken);
                         }
                         catch (AggregateException ae)
                         {

diff --git a/src/client/Microsoft.Identity.Client/Platforms/Features/WinFormsLegacyWebUi/WebUI.cs b/src/client/Microsoft.Identity.Client/Platforms/Features/WinFormsLegacyWebUi/WebUI.cs
@@ -74,7 +74,7 @@ public async Task<AuthorizationResult> AcquireAuthorizationAsync(
                                 sendAuthorizeRequest,
                                 cancellationToken,
                                 TaskCreationOptions.None,
-                                staTaskScheduler).Wait();
+                                staTaskScheduler).Wait(cancellationToken);
                         }
                         catch (AggregateException ae)
                         {
@@ -99,7 +99,7 @@ public async Task<AuthorizationResult> AcquireAuthorizationAsync(
                 sendAuthorizeRequest();
             }
 
-            return await Task.Factory.StartNew(() => authorizationResult).ConfigureAwait(false);
+            return await Task.Factory.StartNew(() => authorizationResult, cancellationToken).ConfigureAwait(false);
         }
 
         internal AuthorizationResult Authenticate(Uri requestUri, Uri callbackUri, CancellationToken cancellationToken)