Merge pull request #1634 from SimonCropp/remove-redundant-Any-checks-…

…before-enumeration remove redundant Any checks before enumeration
DuendeSoftware · Dec 5, 2024 · fa959c0 · fa959c0
2 parents fd42a2d + 349b884
commit fa959c0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 24 deletions.
diff --git a/src/IdentityServer/IdentityServerUser.cs b/src/IdentityServer/IdentityServerUser.cs
@@ -94,12 +94,9 @@ public ClaimsPrincipal CreatePrincipal()
             claims.Add(new Claim(JwtClaimTypes.AuthenticationTime, new DateTimeOffset(AuthenticationTime.Value).ToUnixTimeSeconds().ToString()));
         }
 
-        if (AuthenticationMethods.Any())
+        foreach (var amr in AuthenticationMethods)
         {
-            foreach (var amr in AuthenticationMethods)
-            {
-                claims.Add(new Claim(JwtClaimTypes.AuthenticationMethod, amr));
-            }
+            claims.Add(new Claim(JwtClaimTypes.AuthenticationMethod, amr));
         }
 
         claims.AddRange(AdditionalClaims);

diff --git a/src/IdentityServer/Services/Default/DefaultKeyMaterialService.cs b/src/IdentityServer/Services/Default/DefaultKeyMaterialService.cs
@@ -118,10 +118,7 @@ public async Task<IEnumerable<SecurityKeyInfo>> GetValidationKeysAsync()
         foreach (var store in _validationKeysStores)
         {
             var validationKeys = await store.GetValidationKeysAsync();
-            if (validationKeys.Any())
-            {
-                keys.AddRange(validationKeys);
-            }
+            keys.AddRange(validationKeys);
         }
 
         return keys;

diff --git a/src/IdentityServer/Validation/Default/TokenValidator.cs b/src/IdentityServer/Validation/Default/TokenValidator.cs
@@ -343,19 +343,15 @@ private async Task<TokenValidationResult> ValidateJwtAsync(string jwtString,
 
         // check the scope format (array vs space delimited string)
         var scopes = claims.Where(c => c.Type == JwtClaimTypes.Scope).ToArray();
-        if (scopes.Any())
+        foreach (var scope in scopes)
         {
-            foreach (var scope in scopes)
+            if (scope.Value.Contains(" "))
             {
-                if (scope.Value.Contains(' '))
+                claims.Remove(scope);
+                var values = scope.Value.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+                foreach (var value in values)
                 {
-                    claims.Remove(scope);
-
-                    var values = scope.Value.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-                    foreach (var value in values)
-                    {
-                        claims.Add(new Claim(JwtClaimTypes.Scope, value));
-                    }
+                    claims.Add(new Claim(JwtClaimTypes.Scope, value));
                 }
             }
         }

diff --git a/src/Storage/IdentityServerUser.cs b/src/Storage/IdentityServerUser.cs
@@ -84,12 +84,9 @@ public ClaimsPrincipal CreatePrincipal()
             claims.Add(new Claim(JwtClaimTypes.AuthenticationTime, new DateTimeOffset(AuthenticationTime.Value).ToUnixTimeSeconds().ToString()));
         }
 
-        if (AuthenticationMethods.Any())
+        foreach (var amr in AuthenticationMethods)
         {
-            foreach (var amr in AuthenticationMethods)
-            {
-                claims.Add(new Claim(JwtClaimTypes.AuthenticationMethod, amr));
-            }
+            claims.Add(new Claim(JwtClaimTypes.AuthenticationMethod, amr));
         }
 
         claims.AddRange(AdditionalClaims);