Added method Decode(JwtParts) to Decoder (#234)

* Added method Decode(JwtParts) to Decoder
* Using key from README in tests
* Bumped version to 6.0.0-beta2

JWT.sln

@@ -8,7 +8,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		JWT.sln.DotSettings = JWT.sln.DotSettings
-		LICENSE.txt = LICENSE.txt
+		LICENSE.md = LICENSE.md
+		NuGet.config = NuGet.config
 		README.md = README.md
 	EndProjectSection
 EndProject

JWT.sln.DotSettings

@@ -1,5 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ThisQualifier/INSTANCE_MEMBERS_QUALIFY_MEMBERS/@EntryValue">Property</s:String>
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue"></s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HMACSHA/@EntryIndexedValue">HMACSHA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RS/@EntryIndexedValue">RS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RSA/@EntryIndexedValue">RSA</s:String>

src/JWT/Algorithms/RS256Algorithm.cs

@@ -52,8 +52,13 @@ public RS256Algorithm(X509Certificate2 cert)
         public bool IsAsymmetric => true;
 
         /// <inheritdoc />
-        public byte[] Sign(byte[] key, byte[] bytesToSign) =>
-            _privateKey is object ? Sign(bytesToSign) : throw new InvalidOperationException("Can't sign data without private key");
+        public byte[] Sign(byte[] key, byte[] bytesToSign)
+        {
+            if (_privateKey is null)
+                throw new InvalidOperationException("Can't sign data without private key");
+
+            return Sign(bytesToSign);
+        }
 
         /// <summary>
         /// Signs the provided bytes.

src/JWT/Builder/JwtBuilder.cs

@@ -289,7 +289,7 @@ private void TryCreateDecoder()
 
         private void TryCreateValidator()
         {
-            if (_validator != null)
+            if (_validator is object)
                 return;
 
             if (_serializer is null)
@@ -331,20 +331,20 @@ private void EnsureCanDecode()
         /// Checks whether enough dependencies were supplied to build a new token.
         /// </summary>
         private bool CanBuild() =>
-            _algorithm != null &&
-            _serializer != null &&
-            _urlEncoder != null &&
-            _jwt.Payload != null &&
+            _algorithm is object &&
+            _serializer is object &&
+            _urlEncoder is object &&
+            _jwt.Payload is object &&
             (_algorithm.IsAsymmetric || HasOnlyOneSecret());
 
         /// <summary>
         /// Checks whether enough dependencies were supplied to decode a token.
         /// </summary>
         private bool CanDecode()
         {
-            if (_serializer != null &&
-                _dateTimeProvider != null &&
-                _urlEncoder != null)
+            if (_serializer is object &&
+                _dateTimeProvider is object &&
+                _urlEncoder is object)
             {
                 return !_verify || (_algorithm?.IsAsymmetric ?? true) || HasSecrets();
             }
@@ -356,13 +356,13 @@ private bool CanDecode()
         /// Checks if any secret was supplied to use in token decoding
         /// </summary>
         private bool HasSecrets() =>
-            _secrets != null && _secrets.Length > 0;
+            _secrets is object && _secrets.Length > 0;
 
         /// <summary>
         /// Checks if there is only one secret was supplied for token encoding
         /// </summary>
         /// <returns></returns>
         private bool HasOnlyOneSecret() =>
-            _secrets != null && _secrets.Length == 1;
+            _secrets is object && _secrets.Length == 1;
     }
 }

src/JWT/IJwtDecoder.cs

@@ -9,6 +9,13 @@ public interface IJwtDecoder
     {
         #region Decode
 
+        /// <summary>
+        /// Given a JWT, decodes it and return the JSON payload.
+        /// </summary>
+        /// <param name="jwt">The JWT</param>
+        /// <returns>A string containing the JSON payload</returns>
+        string Decode(JwtParts jwt);
+
         /// <summary>
         /// Given a JWT, decodes it and return the JSON payload.
         /// </summary>

src/JWT/JWT.csproj

@@ -10,7 +10,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Company>Public Domain</Company>
     <Copyright>Public Domain</Copyright>
     <PackageDescription>Jwt.Net, a JWT (JSON Web Token) implementation for .NET</PackageDescription>
     <Authors>Alexander Batishchev, John Sheehan, Michael Lehenbauer</Authors>
@@ -29,9 +28,11 @@
     <!-- Include PDB in the built .nupkg -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
 
-    <Version>6.0.0-beta1</Version>
+    <Version>6.0.0-beta2</Version>
     <FileVersion>6.0.0.0</FileVersion>
     <AssemblyVersion>6.0.0.0</AssemblyVersion>
+    <RootNamespace>JWT</RootNamespace>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

src/JWT/JwtDecoder.cs

@@ -43,6 +43,17 @@ public JwtDecoder(IJsonSerializer jsonSerializer, IJwtValidator jwtValidator, IB
             _algFactory = algFactory;
         }
 
+        /// <inheritdoc />
+        /// <exception cref="ArgumentException" />
+        /// <exception cref="ArgumentNullException" />
+        /// <exception cref="ArgumentOutOfRangeException" />
+        /// <exception cref="FormatException" />
+        public string Decode(JwtParts jwt)
+        {
+            var decoded = _urlEncoder.Decode(jwt.Payload);
+            return GetString(decoded);
+        }
+
         /// <inheritdoc />
         /// <exception cref="ArgumentException" />
         /// <exception cref="ArgumentNullException" />
@@ -107,12 +118,14 @@ public string Decode(string token, byte[][] keys, bool verify)
             if (keys.Length == 0 || !AllKeysHaveValues(keys))
                 throw new ArgumentOutOfRangeException(nameof(keys));
 
+            var jwt = new JwtParts(token);
+
             if (verify)
             {
-                Validate(new JwtParts(token), keys);
+                Validate(jwt, keys);
             }
 
-            return Decode(token);
+            return Decode(jwt);
         }
 
         /// <inheritdoc />

src/JWT/JwtEncoder.cs

@@ -30,7 +30,7 @@ public JwtEncoder(IJwtAlgorithm algorithm, IJsonSerializer jsonSerializer, IBase
 
         /// <inheritdoc />
         public string Encode(object payload, string key) =>
-            Encode(null, payload, key != null ? GetBytes(key) : null);
+            Encode(null, payload, key is object ? GetBytes(key) : null);
 
         /// <inheritdoc />
         public string Encode(object payload, byte[] key) =>

src/JWT/JwtValidator.cs

@@ -31,7 +31,7 @@ public JwtValidator(IJsonSerializer jsonSerializer, IDateTimeProvider dateTimePr
         public void Validate(string payloadJson, string decodedCrypto, params string[] decodedSignatures)
         {
             var ex = GetValidationException(payloadJson, decodedCrypto, decodedSignatures);
-            if (ex != null)
+            if (ex is object)
                 throw ex;
         }
 

tests/JWT.Tests.Common/JwtDataTests.cs

@@ -21,11 +21,11 @@ public void JwtData_With_Ctor_Params()
 
             jwtData.Header
                    .Should()
-                   .Contain(headers, "because the DTO's header must match the one provided");
+                   .Contain(headers, "because header must match the one provided");
 
             jwtData.Payload
                    .Should()
-                   .Contain(payload, "because the DTO's payload must match the one provided");
+                   .Contain(payload, "because payload must match the one provided");
         }
     }
-}
+}