cleanup

IdentityModel · Jan 5, 2018 · 6d61254 · 6d61254
1 parent 28ff73d
commit 6d61254
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 18 deletions.
diff --git a/src/IdentityModel/Client/AuthorizeResponse.cs b/src/IdentityModel/Client/AuthorizeResponse.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using IdentityModel.Internal;
 using System;
 using System.Collections.Generic;
 using System.Net;
@@ -108,7 +109,7 @@ public AuthorizeResponse(string raw)
         /// <value>
         ///   <c>true</c> if the response is an error; otherwise, <c>false</c>.
         /// </value>
-        public bool IsError => !string.IsNullOrEmpty(Error);
+        public bool IsError => Error.IsPresent();
 
         /// <summary>
         /// Gets the expires in.

diff --git a/src/IdentityModel/Client/DiscoveryClient.cs b/src/IdentityModel/Client/DiscoveryClient.cs
@@ -129,7 +129,7 @@ public DiscoveryClient(string authority, HttpMessageHandler innerHandler = null)
         /// <returns></returns>
         public virtual async Task<DiscoveryResponse> GetAsync(CancellationToken cancellationToken = default)
         {
-            if (string.IsNullOrEmpty(Policy.Authority))
+            if (Policy.Authority.IsMissing())
             {
                 Policy.Authority = Authority;
             }

diff --git a/src/IdentityModel/Client/DiscoveryResponse.cs b/src/IdentityModel/Client/DiscoveryResponse.cs
@@ -100,7 +100,7 @@ public DiscoveryResponse(string raw, DiscoveryPolicy policy = null)
                 Json = JObject.Parse(raw);
                 var validationError = Validate(policy);
 
-                if (!string.IsNullOrEmpty(validationError))
+                if (validationError.IsPresent())
                 {
                     IsError = true;
                     Json = null;
@@ -186,7 +186,7 @@ private string Validate(DiscoveryPolicy policy)
             }
 
             var error = ValidateEndpoints(Json, policy);
-            if (!string.IsNullOrEmpty(error)) return error;
+            if (error.IsPresent()) return error;
 
             return string.Empty;
         }
@@ -223,12 +223,16 @@ public bool ValidateIssuerName(string issuer, string authority, StringComparison
         public string ValidateEndpoints(JObject json, DiscoveryPolicy policy)
         {
             // allowed hosts
-            var allowedHosts = new HashSet<string>(policy.AdditionalEndpointBaseAddresses.Select(e => new Uri(e).Authority));
-            allowedHosts.Add(new Uri(policy.Authority).Authority);
+            var allowedHosts = new HashSet<string>(policy.AdditionalEndpointBaseAddresses.Select(e => new Uri(e).Authority))
+            {
+                new Uri(policy.Authority).Authority
+            };
 
             // allowed authorities (hosts + base address)
-            var allowedAuthorities = new HashSet<string>(policy.AdditionalEndpointBaseAddresses);
-            allowedAuthorities.Add(policy.Authority);
+            var allowedAuthorities = new HashSet<string>(policy.AdditionalEndpointBaseAddresses)
+            {
+                policy.Authority
+            };
 
             foreach (var element in json)
             {

diff --git a/src/IdentityModel/Client/DynamicRegistrationClient.cs b/src/IdentityModel/Client/DynamicRegistrationClient.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using IdentityModel.Internal;
 using Newtonsoft.Json;
 using System;
 using System.Net;
@@ -94,7 +95,7 @@ public virtual async Task<RegistrationResponse> RegisterAsync(RegistrationReques
                 Content = new StringContent(JsonConvert.SerializeObject(request), Encoding.UTF8, "application/json")
             };
 
-            if (!string.IsNullOrEmpty(token))
+            if (token.IsPresent())
             {
                 requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
             }

diff --git a/src/IdentityModel/Client/RefreshTokenHandler.cs b/src/IdentityModel/Client/RefreshTokenHandler.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using IdentityModel.Internal;
 using System;
 using System.Net;
 using System.Net.Http;
@@ -115,7 +116,7 @@ public RefreshTokenHandler(TokenClient client, string refreshToken, string acces
         protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
             var accessToken = await GetAccessTokenAsync(cancellationToken);
-            if (string.IsNullOrEmpty(accessToken))
+            if (accessToken.IsMissing())
             {
                 if (await RefreshTokensAsync(cancellationToken) == false)
                 {
@@ -159,7 +160,7 @@ protected override void Dispose(bool disposing)
         private async Task<bool> RefreshTokensAsync(CancellationToken cancellationToken)
         {
             var refreshToken = RefreshToken;
-            if (string.IsNullOrEmpty(refreshToken))
+            if (refreshToken.IsMissing())
             {
                 return false;
             }

diff --git a/src/IdentityModel/Client/Response.cs b/src/IdentityModel/Client/Response.cs
@@ -109,7 +109,7 @@ protected Response(HttpStatusCode statusCode, string reason, string content = nu
         /// <value>
         ///   <c>true</c> if an error occurred; otherwise, <c>false</c>.
         /// </value>
-        public bool IsError => !string.IsNullOrEmpty(Error);
+        public bool IsError => Error.IsPresent();
 
         /// <summary>
         /// Gets the type of the error.

diff --git a/src/IdentityModel/Client/TokenClient.cs b/src/IdentityModel/Client/TokenClient.cs
@@ -101,7 +101,7 @@ public TokenClient(string address, string clientId, HttpMessageHandler innerHttp
         public TokenClient(string address, string clientId, string clientSecret, HttpMessageHandler innerHttpMessageHandler, AuthenticationStyle style = AuthenticationStyle.BasicAuthentication)
             : this(address, innerHttpMessageHandler)
         {
-            if (string.IsNullOrEmpty(clientId)) throw new ArgumentNullException(nameof(clientId));
+            if (clientId.IsMissing()) throw new ArgumentNullException(nameof(clientId));
 
             AuthenticationStyle = style;
             ClientId = clientId;
@@ -213,7 +213,7 @@ public virtual async Task<TokenResponse> RequestAsync(IDictionary<string, string
             {
                 merged.Add(OidcConstants.TokenRequest.ClientId, ClientId);
 
-                if (!string.IsNullOrEmpty(ClientSecret))
+                if (ClientSecret.IsPresent())
                 {
                     merged.Add(OidcConstants.TokenRequest.ClientSecret, ClientSecret);
                 }

diff --git a/src/IdentityModel/Client/UserInfoClient.cs b/src/IdentityModel/Client/UserInfoClient.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using IdentityModel.Internal;
 using System;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -77,7 +78,7 @@ public TimeSpan Timeout
         /// <exception cref="System.ArgumentNullException">token</exception>
         public virtual async Task<UserInfoResponse> GetAsync(string token, CancellationToken cancellationToken = default)
         {
-            if (string.IsNullOrEmpty(token)) throw new ArgumentNullException(nameof(token));
+            if (token.IsMissing()) throw new ArgumentNullException(nameof(token));
 
             var request = new HttpRequestMessage(HttpMethod.Get, "");
             request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);

diff --git a/src/IdentityModel/Identity.cs b/src/IdentityModel/Identity.cs
@@ -61,15 +61,15 @@ public static ClaimsIdentity CreateFromCertificate(X509Certificate2 certificate,
             claims.Add(new Claim(ClaimTypes.Thumbprint, thumbprint, ClaimValueTypes.Base64Binary, issuer));
 
             var name = certificate.SubjectName.Name;
-            if (!string.IsNullOrEmpty(name))
+            if (name.IsPresent())
             {
                 claims.Add(new Claim(ClaimTypes.X500DistinguishedName, name, ClaimValueTypes.String, issuer));
             }
 
             if (includeAllClaims)
             {
                 name = certificate.SerialNumber;
-                if (!string.IsNullOrEmpty(name))
+                if (name.IsPresent())
                 {
                     claims.Add(new Claim(ClaimTypes.SerialNumber, name, ClaimValueTypes.String, issuer));
                 }

diff --git a/src/IdentityModel/Internal/ValuesHelper.cs b/src/IdentityModel/Internal/ValuesHelper.cs
@@ -31,7 +31,7 @@ public static class ValuesHelper
             foreach (var prop in values.GetType().GetRuntimeProperties())
             {
                 var value = prop.GetValue(values) as string;
-                if (!string.IsNullOrEmpty(value))
+                if (value.IsPresent())
                 {
                     dictionary.Add(prop.Name, value);
                 }