Skip to content

Fix potential deadlock when creating a ServiceClient instance #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
0xced wants to merge 1 commit into from
Closed

Fix potential deadlock when creating a ServiceClient instance #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/GeneralTools/DataverseClient/Client/Auth/AuthProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ internal async static Task<ExecuteAuthenticationResults> ExecuteAuthenticateServ
if (tokenCacheStorePath != null)
{
var f = new FileBackedTokenCache(new FileBackedTokenCacheHints(tokenCacheStorePath));
await f.Initialize(pApp.UserTokenCache);
await f.Initialize(pApp.UserTokenCache).ConfigureAwait(false);
}
}

Expand Down Expand Up @@ -241,7 +241,7 @@ internal async static Task<ExecuteAuthenticationResults> ExecuteAuthenticateServ
}
catch (MsalException ex)
{
var errorHandledResult = await ProcessMsalExecptionAsync(serviceUrl, clientCredentials, userCert, clientId, redirectUri, promptBehavior, isOnPrem, authority, msalAuthClient, logSink, useDefaultCreds, msalEx: ex, memoryBackedTokenCache: memoryBackedTokenCache, tokenCacheStorePath: tokenCacheStorePath);
var errorHandledResult = await ProcessMsalExecptionAsync(serviceUrl, clientCredentials, userCert, clientId, redirectUri, promptBehavior, isOnPrem, authority, msalAuthClient, logSink, useDefaultCreds, msalEx: ex, memoryBackedTokenCache: memoryBackedTokenCache, tokenCacheStorePath: tokenCacheStorePath).ConfigureAwait(false);
if (errorHandledResult != null)
processResult = errorHandledResult;
}
Expand Down Expand Up @@ -458,7 +458,7 @@ private static async Task<AuthenticationDetails> GetAuthorityFromTargetServiceAs
{
var client = clientFactory.CreateClient("DataverseHttpClientFactory");
var resolver = new AuthorityResolver(client, (t, msg) => logger.Log(msg, t));
return await resolver.ProbeForExpectedAuthentication(targetServiceUrl, isOnPrem);
return await resolver.ProbeForExpectedAuthentication(targetServiceUrl, isOnPrem).ConfigureAwait(false);
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/GeneralTools/DataverseClient/Client/Auth/MSALHttpHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
HttpResponseMessage response = null;
for (int i = 0; i < MaxRetryCount; i++)
{
response = await base.SendAsync(request, cancellationToken);
response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
if (response.IsSuccessStatusCode)
{
return response;
Expand Down
2 changes: 1 addition & 1 deletion src/GeneralTools/DataverseClient/Client/ConnectionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1963,7 +1963,7 @@ internal async Task<OrganizationResponse> Command_WebAPIProcess_ExecuteAsync(Org
}
else
{
var json = await sResp.Content.ReadAsStringAsync();
var json = await sResp.Content.ReadAsStringAsync().ConfigureAwait(false);

if (_knownTypesFactory.TryCreate($"{req.RequestName}Response", out var response, json))
{
Expand Down