Merge pull request #77 from andrei-m-code/feature/system-text-json

Migrated to System.Text.Json with ability to customize serialization

Author: andrei-m-code

CorePush.Tester/AppleNotification.cs

@@ -1,5 +1,5 @@
 using System;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace CorePush.Tester
 {
@@ -9,17 +9,17 @@ public class ApsPayload
         {
             public class Alert
             {
-                [JsonProperty("title")]
+                [JsonPropertyName("title")]
                 public string Title { get; set; }
 
-                [JsonProperty("body")]
+                [JsonPropertyName("body")]
                 public string Body { get; set; }
             }
 
-            [JsonProperty("alert")]
+            [JsonPropertyName("alert")]
             public Alert AlertBody { get; set; }
 
-            [JsonProperty("apns-push-type")]
+            [JsonPropertyName("apns-push-type")]
             public string PushType { get; set; } = "alert";
         }
 
@@ -37,10 +37,10 @@ public AppleNotification(Guid id, string message, string title = "")
             };
         }
 
-        [JsonProperty("aps")]
+        [JsonPropertyName("aps")]
         public ApsPayload Aps { get; set; }
 
-        [JsonProperty("id")]
+        [JsonPropertyName("id")]
         public Guid Id { get; set; }
     }
 }

CorePush.Tester/CorePush.Tester.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

CorePush.Tester/Program.cs

@@ -72,7 +72,7 @@ private static async Task SendFcmNotificationAsync()
                 notification = new { body = "Hello World!" }
             };
 
-            var response = await fcm.SendAsync(fcmReceiverToken, payload);
+            var response = await fcm.SendAsync(payload);
         }
     }
 }

CorePush/Apple/ApnSender.cs

@@ -1,6 +1,4 @@
-using CorePush.Interfaces;
-using CorePush.Utils;
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,15 +9,19 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+using CorePush.Interfaces;
+using CorePush.Utils;
+using CorePush.Serialization;
+
 namespace CorePush.Apple
 {
     /// <summary>
     /// HTTP2 Apple Push Notification sender
     /// </summary>
     public class ApnSender : IApnSender
     {
-        private static readonly ConcurrentDictionary<string, Tuple<string, DateTime>> tokens = new ConcurrentDictionary<string, Tuple<string, DateTime>>();
-        private static readonly Dictionary<ApnServerType, string> servers = new Dictionary<ApnServerType, string>
+        private static readonly ConcurrentDictionary<string, Tuple<string, DateTime>> tokens = new();
+        private static readonly Dictionary<ApnServerType, string> servers = new()
         {
             {ApnServerType.Development, "https://api.development.push.apple.com:443" },
             {ApnServerType.Production, "https://api.push.apple.com:443" }
@@ -30,17 +32,24 @@ public class ApnSender : IApnSender
 
         private readonly ApnSettings settings;
         private readonly HttpClient http;
+        private readonly IJsonSerializer serializer;
 
+        public ApnSender(ApnSettings settings, HttpClient http) : this(settings, http, new DefaultJsonSerializer())
+        {
+        }
+        
         /// <summary>
         /// Apple push notification sender constructor
         /// </summary>
         /// <param name="settings">Apple Push Notification settings</param>
         /// <param name="http">HTTP client instance</param>
-        public ApnSender(ApnSettings settings, HttpClient http)
+        /// <param name="serializer">JSON serializer</param>
+        public ApnSender(ApnSettings settings, HttpClient http, IJsonSerializer serializer)
         {
             this.settings = settings ?? throw new ArgumentNullException(nameof(settings));
             this.http = http ?? throw new ArgumentNullException(nameof(http));
-
+            this.serializer = serializer ?? throw new ArgumentNullException(nameof(serializer));
+            
             if (http.BaseAddress == null)
             {
                 http.BaseAddress = new Uri(servers[settings.ServerType]);
@@ -65,39 +74,37 @@ public async Task<ApnsResponse> SendAsync(
             CancellationToken cancellationToken = default)
         {
             var path = $"/3/device/{deviceToken}";
-            var json = JsonHelper.Serialize(notification);
+            var json = serializer.Serialize(notification);
 
-            using (var message = new HttpRequestMessage(HttpMethod.Post, path))
-            {
-                message.Version = new Version(2, 0);
-                message.Content = new StringContent(json);
+            using var message = new HttpRequestMessage(HttpMethod.Post, path);
+            
+            message.Version = new Version(2, 0);
+            message.Content = new StringContent(json);
 
-                message.Headers.Authorization = new AuthenticationHeaderValue("bearer", GetJwtToken());
-                message.Headers.TryAddWithoutValidation(":method", "POST");
-                message.Headers.TryAddWithoutValidation(":path", path);
-                message.Headers.Add("apns-topic", settings.AppBundleIdentifier);
-                message.Headers.Add("apns-expiration", apnsExpiration.ToString());
-                message.Headers.Add("apns-priority", apnsPriority.ToString());
-                message.Headers.Add("apns-push-type", apnPushType.ToString().ToLowerInvariant()); // required for iOS 13+
-
-                if (!string.IsNullOrWhiteSpace(apnsId))
-                {
-                    message.Headers.Add(apnIdHeader, apnsId);
-                }
-
-                using (var response = await http.SendAsync(message, cancellationToken))
-                {
-                    var succeed = response.IsSuccessStatusCode;
-                    var content = await response.Content.ReadAsStringAsync();
-                    var error = JsonHelper.Deserialize<ApnsError>(content);
-
-                    return new ApnsResponse
-                    {
-                        IsSuccess = succeed,
-                        Error = error
-                    };
-                }
+            message.Headers.Authorization = new AuthenticationHeaderValue("bearer", GetJwtToken());
+            message.Headers.TryAddWithoutValidation(":method", "POST");
+            message.Headers.TryAddWithoutValidation(":path", path);
+            message.Headers.Add("apns-topic", settings.AppBundleIdentifier);
+            message.Headers.Add("apns-expiration", apnsExpiration.ToString());
+            message.Headers.Add("apns-priority", apnsPriority.ToString());
+            message.Headers.Add("apns-push-type", apnPushType.ToString().ToLowerInvariant()); // required for iOS 13+
+
+            if (!string.IsNullOrWhiteSpace(apnsId))
+            {
+                message.Headers.Add(apnIdHeader, apnsId);
             }
+
+            using var response = await http.SendAsync(message, cancellationToken);
+            
+            var succeed = response.IsSuccessStatusCode;
+            var content = await response.Content.ReadAsStringAsync(cancellationToken);
+            var error = serializer.Deserialize<ApnsError>(content);
+
+            return new ApnsResponse
+            {
+                IsSuccess = succeed,
+                Error = error
+            };
         }
 
         private string GetJwtToken()
@@ -114,18 +121,17 @@ private string GetJwtToken()
 
         private string CreateJwtToken()
         {
-            var header = JsonHelper.Serialize(new { alg = "ES256", kid = CleanP8Key(settings.P8PrivateKeyId) });
-            var payload = JsonHelper.Serialize(new { iss = settings.TeamId, iat = EpochTime() });
+            var header = serializer.Serialize(new { alg = "ES256", kid = CleanP8Key(settings.P8PrivateKeyId) });
+            var payload = serializer.Serialize(new { iss = settings.TeamId, iat = EpochTime() });
             var headerBase64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(header));
             var payloadBase64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(payload));
             var unsignedJwtData = $"{headerBase64}.{payloadBase64}";
             var unsignedJwtBytes = Encoding.UTF8.GetBytes(unsignedJwtData);
 
-            using (var dsa = AppleCryptoHelper.GetEllipticCurveAlgorithm(CleanP8Key(settings.P8PrivateKey)))
-            {
-                var signature = dsa.SignData(unsignedJwtBytes, 0, unsignedJwtBytes.Length, HashAlgorithmName.SHA256);
-                return $"{unsignedJwtData}.{Convert.ToBase64String(signature)}";
-            }
+            using var dsa = AppleCryptoHelper.GetEllipticCurveAlgorithm(CleanP8Key(settings.P8PrivateKey));
+            
+            var signature = dsa.SignData(unsignedJwtBytes, 0, unsignedJwtBytes.Length, HashAlgorithmName.SHA256);
+            return $"{unsignedJwtData}.{Convert.ToBase64String(signature)}";
         }
 
         private static int EpochTime()
@@ -149,7 +155,7 @@ private static string CleanP8Key(string p8Key)
                 lines.RemoveAt(0);
             }
 
-            if (0 != lines.Count && lines[lines.Count - 1].StartsWith("-----END PRIVATE KEY-----"))
+            if (0 != lines.Count && lines[^1].StartsWith("-----END PRIVATE KEY-----"))
             {
                 lines.RemoveAt(lines.Count - 1);
             }

CorePush/CorePush.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 
     <Title>Server Side library for sending ✅Web, ✅Android and ✅iOS Push Notifications</Title>
@@ -10,9 +10,9 @@
     <Summary>Server Side library for sending ✅Web, ✅Android and ✅iOS Push Notifications</Summary>
     <Authors>andrei-m-code</Authors>
 
-    <AssemblyVersion>3.1.1</AssemblyVersion>
-    <FileVersion>3.1.1</FileVersion>
-    <Version>3.1.1</Version>
+    <AssemblyVersion>4.0.0-beta01</AssemblyVersion>
+    <FileVersion>4.0.0-beta01</FileVersion>
+    <Version>4.0.0-beta01</Version>
 
     <PackageProjectUrl>https://github.com/andrei-m-code/CorePush</PackageProjectUrl>
     <RepositoryUrl>https://github.com/andrei-m-code/CorePush</RepositoryUrl>
@@ -25,6 +25,10 @@
     <PackageTags>push-notifications android-push-notifications ios-push-notifications web-push web-push-notifications apn fcm firebase</PackageTags>
 
     <PackageReleaseNotes>
+v4.0.0
+- Use .NET 6.0 as a target framework
+- Use System.Text.Json as a default serializer
+      
 v3.1.x 
 - Memory optimizations
 - Ability to change FCM and APN base URL for testing purposes
@@ -62,7 +66,6 @@ v3.0.0
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
   </ItemGroup>
 

CorePush/Google/FcmResponse.cs

@@ -1,14 +1,14 @@
-using Newtonsoft.Json;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace CorePush.Google
 {
     public class FcmResponse
     {
-        [JsonProperty("multicast_id")]
+        [JsonPropertyName("multicast_id")]
         public string MulticastId { get; set; }
 
-        [JsonProperty("canonical_ids")]
+        [JsonPropertyName("canonical_ids")]
         public int CanonicalIds { get; set; }
 
         /// <summary>

CorePush/Google/FcmResult.cs

@@ -1,13 +1,13 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace CorePush.Google
 {
     public class FcmResult
     {
-        [JsonProperty("message_id")]
+        [JsonPropertyName("message_id")]
         public string MessageId { get; set; }
 
-        [JsonProperty("registration_id")]
+        [JsonPropertyName("registration_id")]
         public string RegistrationId { get; set; }
 
         public string Error { get; set; }