Revert "Add ConfigureAwait(false) to all awaited tasks (#363)" (#365)

This reverts commit 6f361fb.

Author: leastprivilege

src/OidcClient/AuthorizeClient.cs

@@ -53,7 +53,7 @@ public async Task<AuthorizeResult> AuthorizeAsync(AuthorizeRequest request,
                 DisplayMode = request.DisplayMode
             };
 
-            var browserResult = await _options.Browser.InvokeAsync(browserOptions, cancellationToken).ConfigureAwait(false);
+            var browserResult = await _options.Browser.InvokeAsync(browserOptions, cancellationToken);
 
             if (browserResult.ResultType == BrowserResultType.Success)
             {
@@ -82,7 +82,7 @@ public async Task<BrowserResult> EndSessionAsync(LogoutRequest request,
                 DisplayMode = request.BrowserDisplayMode
             };
 
-            return await _options.Browser.InvokeAsync(browserOptions, cancellationToken).ConfigureAwait(false);
+            return await _options.Browser.InvokeAsync(browserOptions, cancellationToken);
         }
 
         public AuthorizeState CreateAuthorizeState(Parameters frontChannelParameters)
@@ -175,4 +175,4 @@ internal Parameters CreateAuthorizeParameters(
             return parameters;
         }
     }
-}
+}

src/OidcClient/OidcClient.cs

@@ -70,14 +70,14 @@ public virtual async Task<LoginResult> LoginAsync(LoginRequest request = null, C
 
             if (request == null) request = new LoginRequest();
 
-            await EnsureConfigurationAsync(cancellationToken).ConfigureAwait(false);
+            await EnsureConfigurationAsync(cancellationToken);
 
             var authorizeResult = await _authorizeClient.AuthorizeAsync(new AuthorizeRequest
             {
                 DisplayMode = request.BrowserDisplayMode,
                 Timeout = request.BrowserTimeout,
                 ExtraParameters = request.FrontChannelExtraParameters
-            }, cancellationToken).ConfigureAwait(false);
+            }, cancellationToken);
 
             if (authorizeResult.IsError)
             {
@@ -88,7 +88,7 @@ public virtual async Task<LoginResult> LoginAsync(LoginRequest request = null, C
                 authorizeResult.Data,
                 authorizeResult.State,
                 request.BackChannelExtraParameters,
-                cancellationToken).ConfigureAwait(false);
+                cancellationToken);
 
             if (!result.IsError)
             {
@@ -108,7 +108,7 @@ public virtual async Task<AuthorizeState> PrepareLoginAsync(Parameters frontChan
         {
             _logger.LogTrace("PrepareLoginAsync");
 
-            await EnsureConfigurationAsync(cancellationToken).ConfigureAwait(false);
+            await EnsureConfigurationAsync(cancellationToken);
             return _authorizeClient.CreateAuthorizeState(frontChannelParameters);
         }
 
@@ -120,7 +120,7 @@ public virtual async Task<AuthorizeState> PrepareLoginAsync(Parameters frontChan
         /// <returns></returns>
         public virtual async Task<string> PrepareLogoutAsync(LogoutRequest request = default, CancellationToken cancellationToken = default)
         {
-            await EnsureConfigurationAsync(cancellationToken).ConfigureAwait(false);
+            await EnsureConfigurationAsync(cancellationToken);
 
             var endpoint = Options.ProviderInformation.EndSessionEndpoint;
             if (endpoint.IsMissing())
@@ -141,9 +141,9 @@ public virtual async Task<LogoutResult> LogoutAsync(LogoutRequest request = null
         {
             if (request == null) request = new LogoutRequest();
 
-            await EnsureConfigurationAsync(cancellationToken).ConfigureAwait(false);
+            await EnsureConfigurationAsync(cancellationToken);
 
-            var result = await _authorizeClient.EndSessionAsync(request, cancellationToken).ConfigureAwait(false);
+            var result = await _authorizeClient.EndSessionAsync(request, cancellationToken);
 
             if (result.ResultType != Browser.BrowserResultType.Success)
             {
@@ -181,7 +181,7 @@ public virtual async Task<LoginResult> ProcessResponseAsync(
             _logger.LogInformation("Processing response.");
 
             backChannelParameters = backChannelParameters ?? new Parameters();
-            await EnsureConfigurationAsync(cancellationToken).ConfigureAwait(false);
+            await EnsureConfigurationAsync(cancellationToken);
 
             _logger.LogDebug("Authorize response: {response}", data);
             var authorizeResponse = new AuthorizeResponse(data);
@@ -192,7 +192,7 @@ public virtual async Task<LoginResult> ProcessResponseAsync(
                 return new LoginResult(authorizeResponse.Error, authorizeResponse.ErrorDescription);
             }
 
-            var result = await _processor.ProcessResponseAsync(authorizeResponse, state, backChannelParameters, cancellationToken).ConfigureAwait(false);
+            var result = await _processor.ProcessResponseAsync(authorizeResponse, state, backChannelParameters, cancellationToken);
             if (result.IsError)
             {
                 _logger.LogError(result.Error);
@@ -202,7 +202,7 @@ public virtual async Task<LoginResult> ProcessResponseAsync(
             var userInfoClaims = Enumerable.Empty<Claim>();
             if (Options.LoadProfile)
             {
-                var userInfoResult = await GetUserInfoAsync(result.TokenResponse.AccessToken, cancellationToken).ConfigureAwait(false);
+                var userInfoResult = await GetUserInfoAsync(result.TokenResponse.AccessToken, cancellationToken);
                 if (userInfoResult.IsError)
                 {
                     var error = $"Error contacting userinfo endpoint: {userInfoResult.Error}";
@@ -281,7 +281,7 @@ public virtual async Task<UserInfoResult> GetUserInfoAsync(string accessToken, C
         {
             _logger.LogTrace("GetUserInfoAsync");
 
-            await EnsureConfigurationAsync(cancellationToken).ConfigureAwait(false);
+            await EnsureConfigurationAsync(cancellationToken);
             if (accessToken.IsMissing()) throw new ArgumentNullException(nameof(accessToken));
             if (!Options.ProviderInformation.SupportsUserInfo) throw new InvalidOperationException("No userinfo endpoint specified");
 
@@ -323,7 +323,7 @@ public virtual async Task<RefreshTokenResult> RefreshTokenAsync(
         {
             _logger.LogTrace("RefreshTokenAsync");
 
-            await EnsureConfigurationAsync(cancellationToken).ConfigureAwait(false);
+            await EnsureConfigurationAsync(cancellationToken);
             backChannelParameters = backChannelParameters ?? new Parameters();
 
             var client = Options.CreateClient();
@@ -350,7 +350,7 @@ public virtual async Task<RefreshTokenResult> RefreshTokenAsync(
 
             // validate token response
             var validationResult = await _processor.ValidateTokenResponseAsync(response, null, requireIdentityToken: Options.Policy.RequireIdentityTokenOnRefreshTokenResponse,
-                cancellationToken: cancellationToken).ConfigureAwait(false);
+                cancellationToken: cancellationToken);
             if (validationResult.IsError)
             {
                 return new RefreshTokenResult { Error = validationResult.Error };
@@ -368,7 +368,7 @@ public virtual async Task<RefreshTokenResult> RefreshTokenAsync(
 
         internal async Task EnsureConfigurationAsync(CancellationToken cancellationToken)
         {
-            await EnsureProviderInformationAsync(cancellationToken).ConfigureAwait(false);
+            await EnsureProviderInformationAsync(cancellationToken);
 
             _logger.LogTrace("Effective options:");
             _logger.LogTrace(LogSerializer.Serialize(Options));

src/OidcClient/ResponseProcessor.cs

@@ -58,7 +58,7 @@ public async Task<ResponseValidationResult> ProcessResponseAsync(
                 return new ResponseValidationResult("Invalid state.");
             }
 
-            return await ProcessCodeFlowResponseAsync(authorizeResponse, state, backChannelParameters, cancellationToken).ConfigureAwait(false);
+            return await ProcessCodeFlowResponseAsync(authorizeResponse, state, backChannelParameters, cancellationToken);
         }
 
         private async Task<ResponseValidationResult> ProcessCodeFlowResponseAsync(
@@ -74,7 +74,7 @@ private async Task<ResponseValidationResult> ProcessCodeFlowResponseAsync(
             //////////////////////////////////////////////////////
 
             // redeem code for tokens
-            var tokenResponse = await RedeemCodeAsync(authorizeResponse.Code, state, backChannelParameters, cancellationToken).ConfigureAwait(false);
+            var tokenResponse = await RedeemCodeAsync(authorizeResponse.Code, state, backChannelParameters, cancellationToken);
             if (tokenResponse.IsError)
             {
                 return new ResponseValidationResult($"Error redeeming code: {tokenResponse.Error ?? "no error code"} / {tokenResponse.ErrorDescription ?? "no description"}");
@@ -85,7 +85,7 @@ private async Task<ResponseValidationResult> ProcessCodeFlowResponseAsync(
             }
 
             // validate token response
-            var tokenResponseValidationResult = await ValidateTokenResponseAsync(tokenResponse, state, requireIdentityToken:false, cancellationToken: cancellationToken).ConfigureAwait(false);
+            var tokenResponseValidationResult = await ValidateTokenResponseAsync(tokenResponse, state, requireIdentityToken:false, cancellationToken: cancellationToken);
             if (tokenResponseValidationResult.IsError)
             {
                 return new ResponseValidationResult($"Error validating token response: {tokenResponseValidationResult.Error}");
@@ -137,12 +137,12 @@ internal async Task<TokenResponseValidationResult> ValidateTokenResponseAsync(To
                     validator = _options.IdentityTokenValidator;
                 }
 
-                var validationResult = await validator.ValidateAsync(response.IdentityToken, _options, cancellationToken).ConfigureAwait(false);
+                var validationResult = await validator.ValidateAsync(response.IdentityToken, _options, cancellationToken);
 
                 if (validationResult.Error == "invalid_signature")
                 {
-                    await _refreshKeysAsync(cancellationToken).ConfigureAwait(false);
-                    validationResult = await _options.IdentityTokenValidator.ValidateAsync(response.IdentityToken, _options, cancellationToken).ConfigureAwait(false);
+                    await _refreshKeysAsync(cancellationToken);
+                    validationResult = await _options.IdentityTokenValidator.ValidateAsync(response.IdentityToken, _options, cancellationToken);
                 }
 
                 if (validationResult.IsError)
@@ -199,4 +199,4 @@ private async Task<TokenResponse> RedeemCodeAsync(string code, AuthorizeState st
             return tokenResult;
         }
     }
-}
+}