use some pattern matching

DuendeSoftware · Nov 27, 2024 · c55be01 · c55be01
1 parent d1e1717
commit c55be01
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 29 deletions.
diff --git a/src/IdentityServer/Configuration/CryptoHelper.cs b/src/IdentityServer/Configuration/CryptoHelper.cs
@@ -179,9 +179,10 @@ internal static bool IsValidCurveForAlgorithm(ECDsaSecurityKey key, string algor
     }
     internal static bool IsValidCrvValueForAlgorithm(string crv)
     {
-        return crv == JsonWebKeyECTypes.P256 ||
-               crv == JsonWebKeyECTypes.P384 ||
-               crv == JsonWebKeyECTypes.P521;
+        return crv is
+            JsonWebKeyECTypes.P256 or
+            JsonWebKeyECTypes.P384 or
+            JsonWebKeyECTypes.P521;
     }
 
     internal static string GetRsaSigningAlgorithmValue(IdentityServerConstants.RsaSigningAlgorithm value)

diff --git a/src/IdentityServer/Endpoints/Results/AuthorizeResult.cs b/src/IdentityServer/Endpoints/Results/AuthorizeResult.cs
@@ -98,13 +98,14 @@ private async Task ProcessErrorAsync(AuthorizeResponse response, HttpContext con
         // these are the conditions where we can send a response 
         // back directly to the client, otherwise we're only showing the error UI
         var isSafeError =
-            response.Error == OidcConstants.AuthorizeErrors.AccessDenied ||
-            response.Error == OidcConstants.AuthorizeErrors.AccountSelectionRequired ||
-            response.Error == OidcConstants.AuthorizeErrors.LoginRequired ||
-            response.Error == OidcConstants.AuthorizeErrors.ConsentRequired ||
-            response.Error == OidcConstants.AuthorizeErrors.InteractionRequired ||
-            response.Error == OidcConstants.AuthorizeErrors.TemporarilyUnavailable ||
-            response.Error == OidcConstants.AuthorizeErrors.UnmetAuthenticationRequirements;
+            response.Error is
+                OidcConstants.AuthorizeErrors.AccessDenied or
+                OidcConstants.AuthorizeErrors.AccountSelectionRequired or
+                OidcConstants.AuthorizeErrors.LoginRequired or
+                OidcConstants.AuthorizeErrors.ConsentRequired or
+                OidcConstants.AuthorizeErrors.InteractionRequired or
+                OidcConstants.AuthorizeErrors.TemporarilyUnavailable or
+                OidcConstants.AuthorizeErrors.UnmetAuthenticationRequirements;
         if (isSafeError)
         {
             // this scenario we can return back to the client
@@ -131,8 +132,9 @@ private async Task ProcessResponseAsync(AuthorizeResponse response, HttpContext
 
     private async Task RenderAuthorizeResponseAsync(AuthorizeResponse response, HttpContext context)
     {
-        if (response.Request.ResponseMode == OidcConstants.ResponseModes.Query ||
-            response.Request.ResponseMode == OidcConstants.ResponseModes.Fragment)
+        if (response.Request.ResponseMode is
+            OidcConstants.ResponseModes.Query or
+            OidcConstants.ResponseModes.Fragment)
         {
             context.Response.SetNoCache();
             context.Response.Redirect(BuildRedirectUri(response));

diff --git a/src/IdentityServer/Extensions/ClaimsExtensions.cs b/src/IdentityServer/Extensions/ClaimsExtensions.cs
@@ -51,8 +51,7 @@ public static Dictionary<string, object> ToClaimsDictionary(this IEnumerable<Cla
 
     private static object GetValue(Claim claim)
     {
-        if (claim.ValueType == ClaimValueTypes.Integer ||
-            claim.ValueType == ClaimValueTypes.Integer32)
+        if (claim.ValueType is ClaimValueTypes.Integer or ClaimValueTypes.Integer32)
         {
             if (Int32.TryParse(claim.Value, out var value))
             {

diff --git a/src/IdentityServer/Extensions/TokenExtensions.cs b/src/IdentityServer/Extensions/TokenExtensions.cs
@@ -138,7 +138,7 @@ private static object AddObject(Claim claim)
             return bool.Parse(claim.Value);
         }
 
-        if (claim.ValueType == ClaimValueTypes.Integer || claim.ValueType == ClaimValueTypes.Integer32)
+        if (claim.ValueType is ClaimValueTypes.Integer or ClaimValueTypes.Integer32)
         {
             return int.Parse(claim.Value);
         }

diff --git a/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationHandler.cs b/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationHandler.cs
@@ -201,7 +201,7 @@ protected override Task HandleChallengeAsync(AuthenticationProperties properties
 
         var sb = new StringBuilder();
 
-        if (Options.TokenMode == LocalApiTokenMode.BearerOnly || Options.TokenMode == LocalApiTokenMode.DPoPAndBearer)
+        if (Options.TokenMode is LocalApiTokenMode.BearerOnly or LocalApiTokenMode.DPoPAndBearer)
         {
             sb.Append("Bearer");
 
@@ -220,7 +220,7 @@ protected override Task HandleChallengeAsync(AuthenticationProperties properties
             }
         }
 
-        if (Options.TokenMode == LocalApiTokenMode.DPoPOnly || Options.TokenMode == LocalApiTokenMode.DPoPAndBearer)
+        if (Options.TokenMode is LocalApiTokenMode.DPoPOnly or LocalApiTokenMode.DPoPAndBearer)
         {
             if (sb.Length > 0) sb.Append(", ");
             sb.Append("DPoP");

diff --git a/src/IdentityServer/Validation/Default/AuthorizeRequestValidator.cs b/src/IdentityServer/Validation/Default/AuthorizeRequestValidator.cs
@@ -294,7 +294,7 @@ private AuthorizeRequestValidationResult ValidateCoreParameters(ValidatedAuthori
         //////////////////////////////////////////////////////////
         // check if PKCE is required and validate parameters
         //////////////////////////////////////////////////////////
-        if (request.GrantType == GrantType.AuthorizationCode || request.GrantType == GrantType.Hybrid)
+        if (request.GrantType is GrantType.AuthorizationCode or GrantType.Hybrid)
         {
             _logger.LogDebug("Checking for PKCE parameters");
 
@@ -449,8 +449,7 @@ private async Task<AuthorizeRequestValidationResult> ValidateScopeAndResourceAsy
         // check scope vs response_type plausability
         //////////////////////////////////////////////////////////
         var requirement = Constants.ResponseTypeToScopeRequirement[request.ResponseType];
-        if (requirement == Constants.ScopeRequirement.Identity ||
-            requirement == Constants.ScopeRequirement.IdentityOnly)
+        if (requirement is Constants.ScopeRequirement.Identity or Constants.ScopeRequirement.IdentityOnly)
         {
             if (request.IsOpenIdRequest == false)
             {

diff --git a/src/IdentityServer/Validation/Default/StrictRedirectUriValidator.cs b/src/IdentityServer/Validation/Default/StrictRedirectUriValidator.cs
@@ -83,8 +83,9 @@ public virtual Task<bool> IsRedirectUriValidAsync(RedirectUriValidationContext c
         // was pushed)
         if (_options?.PushedAuthorization?.AllowUnregisteredPushedRedirectUris == true &&
             context.Client.RequireClientSecret && 
-            (context.AuthorizeRequestType == AuthorizeRequestType.PushedAuthorization ||
-             context.AuthorizeRequestType == AuthorizeRequestType.AuthorizeWithPushedParameters))
+            context.AuthorizeRequestType is
+                AuthorizeRequestType.PushedAuthorization or
+                AuthorizeRequestType.AuthorizeWithPushedParameters)
         {
             return Task.FromResult(true);
         }

diff --git a/src/IdentityServer/Validation/Models/ValidatedAuthorizeRequest.cs b/src/IdentityServer/Validation/Models/ValidatedAuthorizeRequest.cs
@@ -273,13 +273,12 @@ public class ValidatedAuthorizeRequest : ValidatedRequest
     /// <value>
     /// <c>true</c> if an access token was requested; otherwise, <c>false</c>.
     /// </value>
-    public bool AccessTokenRequested => ResponseType == OidcConstants.ResponseTypes.IdTokenToken ||
-                                        ResponseType == OidcConstants.ResponseTypes.Code ||
-                                        ResponseType == OidcConstants.ResponseTypes.CodeIdToken ||
-                                        ResponseType == OidcConstants.ResponseTypes.CodeToken ||
-                                        ResponseType == OidcConstants.ResponseTypes.CodeIdTokenToken;
-
-
+    public bool AccessTokenRequested => ResponseType is
+        OidcConstants.ResponseTypes.IdTokenToken or
+        OidcConstants.ResponseTypes.Code or
+        OidcConstants.ResponseTypes.CodeIdToken or
+        OidcConstants.ResponseTypes.CodeToken or
+        OidcConstants.ResponseTypes.CodeIdTokenToken;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ValidatedAuthorizeRequest"/> class.