Small cleanup

jwt-dotnet · Jun 4, 2022 · 77b5186 · 77b5186
1 parent b96f144
commit 77b5186
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/src/JWT/Builder/JwtBuilder.cs b/src/JWT/Builder/JwtBuilder.cs
@@ -198,10 +198,8 @@ public JwtBuilder WithSecret(params byte[][] secrets)
         /// Instructs to verify the JWT signature.
         /// </summary>
         /// <returns>Current builder instance</returns>
-        public JwtBuilder MustVerifySignature()
-        {
-            return WithVerifySignature(true);
-        }
+        public JwtBuilder MustVerifySignature() =>
+            WithVerifySignature(true);
 
         /// <summary>
         /// Instructs to do not verify the JWT signature.

diff --git a/src/JWT/JwtDecoder.cs b/src/JWT/JwtDecoder.cs
@@ -126,12 +126,7 @@ public string Decode(JwtParts jwt, byte[] key, bool verify)
             }
             else
             {
-                var header = DecodeHeader<JwtHeader>(jwt);
-                if (String.Equals(header.Algorithm, nameof(JwtAlgorithmName.None), StringComparison.OrdinalIgnoreCase) &&
-                    !String.IsNullOrEmpty(jwt.Signature))
-                {
-                    throw new InvalidOperationException("Signature is not acceptable for algorithm None");
-                }
+                ValidateNoneAlgorithm(jwt);
             }
             return Decode(jwt);
         }
@@ -157,12 +152,7 @@ public string Decode(JwtParts jwt, byte[][] keys, bool verify)
             }
             else
             {
-                var header = DecodeHeader<JwtHeader>(jwt);
-                if (String.Equals(header.Algorithm, nameof(JwtAlgorithmName.None), StringComparison.OrdinalIgnoreCase) &&
-                    !String.IsNullOrEmpty(jwt.Signature))
-                {
-                    throw new InvalidOperationException("Signature is not acceptable for algorithm None");
-                }
+                ValidateNoneAlgorithm(jwt);
             }
             return Decode(jwt);
         }
@@ -289,5 +279,15 @@ private static bool AllKeysHaveValues(byte[][] keys)
 
             return Array.TrueForAll(keys, key => key.Length > 0);
         }
+
+        private void ValidateNoneAlgorithm(JwtParts jwt)
+        {
+            var header = DecodeHeader<JwtHeader>(jwt);
+            if (String.Equals(header.Algorithm, nameof(JwtAlgorithmName.None), StringComparison.OrdinalIgnoreCase) &&
+                !String.IsNullOrEmpty(jwt.Signature))
+            {
+                throw new InvalidOperationException("Signature is not acceptable for algorithm None");
+            }
+        }
     }
 }