Skip to content

Commit 80e41e2

Browse files
committed
Fixed compiler warnings
1 parent 1c84b53 commit 80e41e2

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

src/GSS.Authorization.OAuth.HttpClient/OAuthHttpHandler.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
2929
if (request == null)
3030
throw new ArgumentNullException(nameof(request));
3131
var tokenCredentials = await _options.TokenCredentialProvider(request).ConfigureAwait(false);
32-
var queryString = QueryHelpers.ParseQuery(request.RequestUri.Query);
32+
var queryString = QueryHelpers.ParseQuery(request.RequestUri?.Query);
3333
if (_options.SignedAsBody && request.Content != null && string.Equals(request.Content.Headers?.ContentType?.MediaType,
3434
ApplicationFormUrlEncoded, StringComparison.OrdinalIgnoreCase))
3535
{
@@ -43,15 +43,15 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
4343
}
4444
}
4545

46-
var parameters = _signer.AppendAuthorizationParameters(request.Method, request.RequestUri, _options,
46+
var parameters = _signer.AppendAuthorizationParameters(request.Method, request.RequestUri!, _options,
4747
formData, tokenCredentials);
48-
var values = new List<KeyValuePair<string, string>>();
48+
var values = new List<KeyValuePair<string?, string?>>();
4949
foreach (var parameter in parameters)
5050
{
5151
if (!queryString.ContainsKey(parameter.Key))
5252
{
5353
values.AddRange(parameter.Value.Select(value =>
54-
new KeyValuePair<string, string>(parameter.Key, value)));
54+
new KeyValuePair<string?, string?>(parameter.Key, value)));
5555
}
5656
}
5757

@@ -60,7 +60,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
6060
}
6161
else if (_options.SignedAsQuery)
6262
{
63-
var parameters = _signer.AppendAuthorizationParameters(request.Method, request.RequestUri, _options,
63+
var parameters = _signer.AppendAuthorizationParameters(request.Method, request.RequestUri!, _options,
6464
queryString, tokenCredentials);
6565
var values = new List<string>();
6666
foreach (var parameter in parameters)
@@ -71,13 +71,13 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
7171
}
7272
}
7373

74-
request.RequestUri = new UriBuilder(request.RequestUri) { Query = "?" + string.Join("&", values) }.Uri;
74+
request.RequestUri = new UriBuilder(request.RequestUri!) { Query = "?" + string.Join("&", values) }.Uri;
7575
}
7676
else
7777
{
7878
request.Headers.Authorization = _signer.GetAuthorizationHeader(
7979
request.Method,
80-
request.RequestUri,
80+
request.RequestUri!,
8181
_options,
8282
queryString,
8383
tokenCredentials);

src/GSS.Authorization.OAuth2.HttpClient/OAuth2HttpHandler.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ private async ValueTask<AccessToken> GetAccessTokenAsync(CancellationToken cance
5353
try
5454
{
5555
var accessToken = await _authorizer.GetAccessTokenAsync(cancellationToken).ConfigureAwait(false);
56-
if (accessToken == null)
57-
return AccessToken.Empty;
5856
if (accessToken.ExpiresInSeconds > 0)
5957
{
6058
_memoryCache.Set(_cacheKey, accessToken, accessToken.ExpiresIn);
@@ -73,10 +71,10 @@ private async ValueTask<AccessToken> GetAccessTokenAsync(CancellationToken cance
7371

7472
private static void TrySetAuthorizationHeaderToRequest(AccessToken accessToken, HttpRequestMessage request)
7573
{
76-
if (!string.IsNullOrWhiteSpace(accessToken?.Token))
74+
if (!string.IsNullOrWhiteSpace(accessToken.Token))
7775
{
7876
request.Headers.Authorization =
79-
new AuthenticationHeaderValue(AuthorizerDefaults.Bearer, accessToken?.Token);
77+
new AuthenticationHeaderValue(AuthorizerDefaults.Bearer, accessToken.Token);
8078
}
8179
}
8280
}

0 commit comments

Comments
 (0)