Revert "WIP JwtEncoder.Encode() now accepts a list of payloads so we …

…can use both claims and payload"

This reverts commit 341da1c.

src/JWT/Builder/JwtBuilder.cs

@@ -278,16 +278,18 @@ public string Encode(Type payloadType, object payload)
                 throw new ArgumentNullException(nameof(payloadType));
             if (payload is null)
                 throw new ArgumentNullException(nameof(payload));
+
+            EnsureCanEncode();
 
-            // Preserve old behaviour checking the type, is it needed?
-            if (payloadType != payload.GetType())
+            var dic = payloadType.GetProperties(BindingFlags.Instance | BindingFlags.Public)
+                                 .ToDictionary(prop => GetPropName(prop), prop => prop.GetValue(payload, null));
+
+            foreach (var pair in dic)
             {
-                throw new NotSupportedException("Object does not match target type.");
+                _jwt.Payload.Add(pair.Key, pair.Value);
             }
-
-            EnsureCanEncode();
 
-            return _encoder.Encode(_jwt.Header, new[] {_jwt.Payload, payload}, _secrets?[0]);
+            return Encode();
         }
 
         /// <summary>
@@ -480,5 +482,42 @@ private bool CanDecodeHeader()
 
             return true;
         }
+
+        private string GetPropName(MemberInfo prop)
+        {
+            var jsonSerializer = _jsonSerializerFactory.Create();
+
+            var customAttributes = prop.GetCustomAttributes(inherit: true);
+            foreach (var attribute in customAttributes)
+            {
+                switch (jsonSerializer)
+                {
+                    case JsonNetSerializer:
+                    {
+                        if (attribute is JsonPropertyAttribute jsonNetProperty)
+                        {
+                            return jsonNetProperty.PropertyName;
+                        }
+                        break;
+                    }
+#if MODERN_DOTNET
+                    case SystemTextSerializer:
+                    {
+                        if (attribute is JsonPropertyNameAttribute stjProperty)
+                        {
+                            return stjProperty.Name;
+                        }
+                        break;
+                    }
+#endif
+                    default:
+                    {
+                        return prop.Name;
+                    }
+                }
+            }
+
+            return prop.Name;
+        }
     }
 }

src/JWT/IJsonSerializer.cs

@@ -21,14 +21,6 @@ public interface IJsonSerializer
         /// <param name="json">The JSON string deserialize.</param>
         /// <returns>Strongly-typed object.</returns>
         object Deserialize(Type type, string json);
-
-        /// <summary>
-        /// Merges two objects into a single JSON string.
-        /// </summary>
-        /// <param name="obj1">The first object to serialize</param>
-        /// <param name="obj2">The second object to serialize, note that any existing property in obj1 will be
-        /// <returns>JSON string</returns>
-        string MergeObjects(object obj1, object obj2);
     }
 
     /// <summary>

src/JWT/IJwtEncoder.cs

@@ -18,8 +18,6 @@ public interface IJwtEncoder
         /// <param name="key">The key bytes used to sign the token</param>
         /// <returns>The generated JWT</returns>
         string Encode(IDictionary<string, object> extraHeaders, object payload, byte[] key);
-
-        string Encode(IDictionary<string, object> extraHeaders, object[] payloads, byte[] key);
     }
 
     /// <summary>

src/JWT/JwtEncoder.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using JWT.Algorithms;
 
 using static JWT.Internal.EncodingHelper;
@@ -40,46 +39,6 @@ public JwtEncoder(IJwtAlgorithm algorithm, IJsonSerializer jsonSerializer, IBase
         {
         }
 
-        public string Encode(IDictionary<string, object> extraHeaders, object[] payloads, byte[] key)
-        {
-            if (payloads is null)
-                throw new ArgumentNullException(nameof(payloads));
-
-            if (!payloads.Any() || payloads.Length != 2)
-            {
-                throw new NotSupportedException("Only two payloads are supported");
-            }
-
-            var algorithm = _algFactory.Create(null);
-            if (algorithm is null)
-                throw new ArgumentNullException(nameof(algorithm));
-            if (!algorithm.IsAsymmetric() && key is null && algorithm is not NoneAlgorithm)
-                throw new ArgumentNullException(nameof(key));
-
-            var header = extraHeaders is null ?
-                new Dictionary<string, object>(2, StringComparer.OrdinalIgnoreCase) :
-                new Dictionary<string, object>(extraHeaders, StringComparer.OrdinalIgnoreCase);
-
-            if (!header.ContainsKey("typ"))
-            {
-                header.Add("typ", "JWT");
-            }
-            header.Add("alg", algorithm.Name);
-
-            var headerBytes = GetBytes(_jsonSerializer.Serialize(header));
-
-            var payloadBytes = GetBytes(_jsonSerializer.MergeObjects(payloads[0], payloads[1]));
-
-            var headerSegment = _urlEncoder.Encode(headerBytes);
-            var payloadSegment = _urlEncoder.Encode(payloadBytes);
-
-            var stringToSign = headerSegment + "." + payloadSegment;
-            var bytesToSign = GetBytes(stringToSign);
-
-            var signatureSegment = GetSignatureSegment(algorithm, key, bytesToSign);
-            return stringToSign + "." + signatureSegment;
-        }
-
         /// <inheritdoc />
         /// <exception cref="ArgumentNullException" />
         public string Encode(IDictionary<string, object> extraHeaders, object payload, byte[] key)

src/JWT/Serializers/JsonNetSerializer.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using System.Text;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace JWT.Serializers
 {
@@ -59,14 +58,5 @@ public object Deserialize(Type type, string json)
             using var jsonReader = new JsonTextReader(stringReader);
             return _serializer.Deserialize(jsonReader, type);
         }
-
-        public string MergeObjects(object obj1, object obj2)
-        {
-            var jObject1 = JObject.Parse(Serialize(obj1));
-            var jObject2 = JObject.Parse(Serialize(obj2));
-
-            jObject1.Merge(jObject2);
-            return jObject1.ToString(Formatting.None);
-        }
     }
 }

src/JWT/Serializers/SystemTextSerializer.cs

@@ -1,8 +1,6 @@
 #if MODERN_DOTNET
 using System;
-using System.Linq;
 using System.Text.Json;
-using System.Text.Json.Nodes;
 using JWT.Serializers.Converters;
 
 namespace JWT.Serializers
@@ -21,7 +19,7 @@ public class SystemTextSerializer : IJsonSerializer
                 new DictionaryStringObjectJsonConverterCustomWrite()
             }
         };
-
+        
         /// <inheritdoc />
         /// <exception cref="ArgumentNullException" />
         public string Serialize(object obj)
@@ -45,30 +43,6 @@ public object Deserialize(Type type, string json)
 
             return JsonSerializer.Deserialize(json, type, _optionsForDeserialize);
         }
-
-        public string MergeObjects(object obj1, object obj2)
-        {
-            if (obj1 == null)
-            {
-                throw new ArgumentNullException(nameof(obj1));
-            }
-
-            if (obj2 == null)
-            {
-                throw new ArgumentNullException(nameof(obj2));
-            }
-
-            var jsonNode1 = JsonNode.Parse(Serialize(obj1));
-            var jsonNode2 = JsonNode.Parse(Serialize(obj2));
-
-            foreach (var property in jsonNode2.AsObject().ToArray())
-            {
-                jsonNode2.AsObject().Remove(property.Key);
-                jsonNode1[property.Key] = property.Value;
-            }
-
-            return jsonNode1.ToJsonString(_optionsForSerialize);
-        }
     }
 }
 #endif

tests/JWT.Tests.Common/Builder/JwtBuilderEncodeTests.cs

@@ -290,10 +290,25 @@ public void Encode_Should_Return_ThrowTargetException_Encode_TypesMatch()
                           .AddClaim("ExtraClaim", new { NestedProperty1 = "Foo", NestedProperty2 = 3 })
                           .Encode(typeof(string), TestData.Customer);
 
-            action.Should()
-                  .Throw<NotSupportedException>("Object does not match target type.");
+            if (IsRunningOnMono())
+            {
+                action.Should()
+                      .Throw<TargetInvocationException>("Exception has been thrown by the target of an invocation.");
+            }
+            else
+            {
+                action.Should()
+                      .Throw<TargetException>("Object does not match target type.");
+            }
         }
 
+        /// <summary>
+        /// Copied from: https://stackoverflow.com/a/7077620/2890855
+        /// </summary>
+        /// <returns></returns>
+        private static bool IsRunningOnMono() => 
+            Type.GetType("Mono.Runtime") is not null;
+
         [TestMethod]
         public void Encode_Should_Return_Token_With_Custom_Extra_Headers_Full_Payload2()
         {