Skip to content

Commit 43e1869

Browse files
kevinchaletkevinchalet
committed
Update the authentication handlers to avoid using HttpResponseMessage.EnsureSuccessStatusCode()
1 parent f801033 commit 43e1869

File tree

37 files changed

+114
-96
lines changed

37 files changed

+114
-96
lines changed

‎src/AspNet.Security.OAuth.ArcGIS/ArcGISAuthenticationHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
4444
var error = ArcGISAuthenticationHelper.GetError(payload);
4545
if (error != null) {
4646
// See https://developers.arcgis.com/authentication/server-based-user-logins/ for more information
47-
Logger.LogError("An error occurred when retrieving the user profile: the remote server " +
47+
Logger.LogError("An error occurred while retrieving the user profile: the remote server " +
4848
"returned a response with the following error code: {Code} {Message}.",
4949
/* Code: */ error.Value<string>("code"),
5050
/* Message: */ error.Value<string>("message"));
5151

52-
throw new InvalidOperationException("An error occurred when retrieving the user profile.");
52+
throw new InvalidOperationException("An error occurred while retrieving the user profile.");
5353
}
5454

5555
identity.AddOptionalClaim(ClaimTypes.NameIdentifier, ArcGISAuthenticationHelper.GetIdentifier(payload), Options.ClaimsIssuer)

‎src/AspNet.Security.OAuth.Asana/AsanaAuthenticationHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
3030

3131
var response = await Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
3232
if (!response.IsSuccessStatusCode) {
33-
Logger.LogError("An error occurred when retrieving the user profile: the remote server " +
33+
Logger.LogError("An error occurred while retrieving the user profile: the remote server " +
3434
"returned a {Status} response with the following payload: {Headers} {Body}.",
3535
/* Status: */ response.StatusCode,
3636
/* Headers: */ response.Headers.ToString(),
3737
/* Body: */ await response.Content.ReadAsStringAsync());
3838

39-
throw new HttpRequestException("An error occurred when retrieving the user profile.");
39+
throw new HttpRequestException("An error occurred while retrieving the user profile.");
4040
}
4141

4242
var payload = JObject.Parse(await response.Content.ReadAsStringAsync());

‎src/AspNet.Security.OAuth.Automatic/AutomaticAuthenticationHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
3232

3333
var response = await Backchannel.SendAsync(request, Context.RequestAborted);
3434
if (!response.IsSuccessStatusCode) {
35-
Logger.LogError("An error occurred when retrieving the user profile: the remote server " +
35+
Logger.LogError("An error occurred while retrieving the user profile: the remote server " +
3636
"returned a {Status} response with the following payload: {Headers} {Body}.",
3737
/* Status: */ response.StatusCode,
3838
/* Headers: */ response.Headers.ToString(),
3939
/* Body: */ await response.Content.ReadAsStringAsync());
4040

41-
throw new HttpRequestException("An error occurred when retrieving the user profile.");
41+
throw new HttpRequestException("An error occurred while retrieving the user profile.");
4242
}
4343

4444
var payload = JObject.Parse(await response.Content.ReadAsStringAsync());

‎src/AspNet.Security.OAuth.BattleNet/BattleNetAuthenticationHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
3232

3333
var response = await Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
3434
if (!response.IsSuccessStatusCode) {
35-
Logger.LogError("An error occurred when retrieving the user profile: the remote server " +
35+
Logger.LogError("An error occurred while retrieving the user profile: the remote server " +
3636
"returned a {Status} response with the following payload: {Headers} {Body}.",
3737
/* Status: */ response.StatusCode,
3838
/* Headers: */ response.Headers.ToString(),
3939
/* Body: */ await response.Content.ReadAsStringAsync());
4040

41-
throw new HttpRequestException("An error occurred when retrieving the user profile.");
41+
throw new HttpRequestException("An error occurred while retrieving the user profile.");
4242
}
4343

4444
var payload = JObject.Parse(await response.Content.ReadAsStringAsync());

‎src/AspNet.Security.OAuth.Beam/BeamAuthenticationHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
3030

3131
var response = await Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
3232
if (!response.IsSuccessStatusCode) {
33-
Logger.LogError("An error occurred when retrieving the user profile: the remote server " +
33+
Logger.LogError("An error occurred while retrieving the user profile: the remote server " +
3434
"returned a {Status} response with the following payload: {Headers} {Body}.",
3535
/* Status: */ response.StatusCode,
3636
/* Headers: */ response.Headers.ToString(),
3737
/* Body: */ await response.Content.ReadAsStringAsync());
3838

39-
throw new HttpRequestException("An error occurred when retrieving the user profile.");
39+
throw new HttpRequestException("An error occurred while retrieving the user profile.");
4040
}
4141

4242
var payload = JObject.Parse(await response.Content.ReadAsStringAsync());

‎src/AspNet.Security.OAuth.Buffer/BufferAuthenticationHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
3030

3131
var response = await Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
3232
if (!response.IsSuccessStatusCode) {
33-
Logger.LogError("An error occurred when retrieving the user profile: the remote server " +
33+
Logger.LogError("An error occurred while retrieving the user profile: the remote server " +
3434
"returned a {Status} response with the following payload: {Headers} {Body}.",
3535
/* Status: */ response.StatusCode,
3636
/* Headers: */ response.Headers.ToString(),
3737
/* Body: */ await response.Content.ReadAsStringAsync());
3838

39-
throw new HttpRequestException("An error occurred when retrieving the user profile.");
39+
throw new HttpRequestException("An error occurred while retrieving the user profile.");
4040
}
4141

4242
var payload = JObject.Parse(await response.Content.ReadAsStringAsync());

‎src/AspNet.Security.OAuth.CiscoSpark/CiscoSparkAuthenticationHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
3131

3232
var response = await Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
3333
if (!response.IsSuccessStatusCode) {
34-
Logger.LogError("An error occurred when retrieving the user profile: the remote server " +
34+
Logger.LogError("An error occurred while retrieving the user profile: the remote server " +
3535
"returned a {Status} response with the following payload: {Headers} {Body}.",
3636
/* Status: */ response.StatusCode,
3737
/* Headers: */ response.Headers.ToString(),
3838
/* Body: */ await response.Content.ReadAsStringAsync());
3939

40-
throw new HttpRequestException("An error occurred when retrieving the user profile.");
40+
throw new HttpRequestException("An error occurred while retrieving the user profile.");
4141
}
4242

4343
var payload = JObject.Parse(await response.Content.ReadAsStringAsync());

‎src/AspNet.Security.OAuth.DeviantArt/DeviantArtAuthenticationHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
3030

3131
var response = await Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
3232
if (!response.IsSuccessStatusCode) {
33-
Logger.LogError("An error occurred when retrieving the user profile: the remote server " +
33+
Logger.LogError("An error occurred while retrieving the user profile: the remote server " +
3434
"returned a {Status} response with the following payload: {Headers} {Body}.",
3535
/* Status: */ response.StatusCode,
3636
/* Headers: */ response.Headers.ToString(),
3737
/* Body: */ await response.Content.ReadAsStringAsync());
3838

39-
throw new HttpRequestException("An error occurred when retrieving the user profile.");
39+
throw new HttpRequestException("An error occurred while retrieving the user profile.");
4040
}
4141

4242
var payload = JObject.Parse(await response.Content.ReadAsStringAsync());

‎src/AspNet.Security.OAuth.Dropbox/DropboxAuthenticationHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
3030

3131
var response = await Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
3232
if (!response.IsSuccessStatusCode) {
33-
Logger.LogError("An error occurred when retrieving the user profile: the remote server " +
33+
Logger.LogError("An error occurred while retrieving the user profile: the remote server " +
3434
"returned a {Status} response with the following payload: {Headers} {Body}.",
3535
/* Status: */ response.StatusCode,
3636
/* Headers: */ response.Headers.ToString(),
3737
/* Body: */ await response.Content.ReadAsStringAsync());
3838

39-
throw new HttpRequestException("An error occurred when retrieving the user profile.");
39+
throw new HttpRequestException("An error occurred while retrieving the user profile.");
4040
}
4141

4242
var payload = JObject.Parse(await response.Content.ReadAsStringAsync());

‎src/AspNet.Security.OAuth.EVEOnline/EVEOnlineAuthenticationHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
3030

3131
var response = await Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
3232
if (!response.IsSuccessStatusCode) {
33-
Logger.LogError("An error occurred when retrieving the user profile: the remote server " +
33+
Logger.LogError("An error occurred while retrieving the user profile: the remote server " +
3434
"returned a {Status} response with the following payload: {Headers} {Body}.",
3535
/* Status: */ response.StatusCode,
3636
/* Headers: */ response.Headers.ToString(),
3737
/* Body: */ await response.Content.ReadAsStringAsync());
3838

39-
throw new HttpRequestException("An error occurred when retrieving the user profile.");
39+
throw new HttpRequestException("An error occurred while retrieving the user profile.");
4040
}
4141

4242
var payload = JObject.Parse(await response.Content.ReadAsStringAsync());

0 commit comments

Comments
 (0)