Cancellation tokens added

Author: andrei-m-code

CorePush/Apple/ApnSender.cs

@@ -7,6 +7,7 @@
 using System.Net.Http;
 using System.Security.Cryptography;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace CorePush.Apple
@@ -53,7 +54,8 @@ public async Task<ApnsResponse> SendAsync(
             string apnsId = null,
             int apnsExpiration = 0,
             int apnsPriority = 10,
-            bool isBackground = false)
+            bool isBackground = false,
+            CancellationToken cancellationToken = default)
         {
             var path = $"/3/device/{deviceToken}";
             var json = JsonHelper.Serialize(notification);
@@ -77,7 +79,7 @@ public async Task<ApnsResponse> SendAsync(
                 request.Headers.Add(apnidHeader, apnsId);
             }
 
-            using (var response = await http.SendAsync(request))
+            using (var response = await http.SendAsync(request, cancellationToken))
             {
                 var succeed = response.IsSuccessStatusCode;
                 var content = await response.Content.ReadAsStringAsync();

CorePush/CorePush.csproj

@@ -6,13 +6,16 @@
     <Authors>andrei-m-code</Authors>
     <Company />
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <AssemblyVersion>3.0.2.0</AssemblyVersion>
-    <FileVersion>3.0.2.0</FileVersion>
-    <Version>3.0.2</Version>
+    <AssemblyVersion>3.0.3.0</AssemblyVersion>
+    <FileVersion>3.0.3.0</FileVersion>
+    <Version>3.0.3</Version>
     <PackageProjectUrl>https://github.com/andrei-m-code/CorePush</PackageProjectUrl>
     <!-- <PackageLicenseFile>LICENSE.md</PackageLicenseFile> -->
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReleaseNotes>
+v3.0.3
+- Cancellation tokens added to the interface with CancellationToken.None by default
+
 v3.0.2
 - Reverted Portable.BouncyCastle so that the lib can work in shared envs (like Azure App Service)
 - Apple certificate cleanup added

CorePush/Google/FcmSender.cs

@@ -1,9 +1,10 @@
 using CorePush.Interfaces;
 using CorePush.Utils;
+using Newtonsoft.Json.Linq;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace CorePush.Google
 {
@@ -31,13 +32,13 @@ public FcmSender(FcmSettings settings, HttpClient http)
         /// <param name="deviceId">Device token (will add `to` to the payload)</param>
         /// <param name="payload">Notification payload that will be serialized using Newtonsoft.Json package</param>
         /// <cref="HttpRequestException">Throws exception when not successful</exception>
-        public Task<FcmResponse> SendAsync(string deviceId, object payload)
+        public Task<FcmResponse> SendAsync(string deviceId, object payload, CancellationToken cancellationToken = default)
         {
             var jsonObject = JObject.FromObject(payload);
             jsonObject.Remove("to");
             jsonObject.Add("to", JToken.FromObject(deviceId));
 
-            return SendRawAsync(jsonObject.ToString());
+            return SendAsync(jsonObject.ToString(), cancellationToken);
         }
 
         /// <summary>
@@ -48,21 +49,10 @@ public Task<FcmResponse> SendAsync(string deviceId, object payload)
         /// </summary>
         /// <param name="payload">Notification payload that will be serialized using Newtonsoft.Json package</param>
         /// <exception cref="HttpRequestException">Throws exception when not successful</exception>
-        public Task<FcmResponse> SendAsync(object payload)
+        public async Task<FcmResponse> SendAsync(object payload, CancellationToken cancellationToken = default)
         {
-            return SendRawAsync(JsonHelper.Serialize(payload));
-        }
+            var serialized = JsonHelper.Serialize(payload);
 
-        /// <summary>
-        /// Send firebase notification.
-        /// Please check out payload formats:
-        /// https://firebase.google.com/docs/cloud-messaging/concept-options#notifications
-        /// The SendAsync method will add/replace "to" value with deviceId
-        /// </summary>
-        /// <param name="payload">Notification payload json</param>
-        /// <exception cref="HttpRequestException">Throws exception when not successful</exception>
-        private async Task<FcmResponse> SendRawAsync(string payload)
-        {
             using (var httpRequest = new HttpRequestMessage(HttpMethod.Post, fcmUrl))
             {
                 httpRequest.Headers.Add("Authorization", $"key={settings.ServerKey}");
@@ -72,9 +62,9 @@ private async Task<FcmResponse> SendRawAsync(string payload)
                     httpRequest.Headers.Add("Sender", $"id={settings.SenderId}");
                 }
 
-                httpRequest.Content = new StringContent(payload, Encoding.UTF8, "application/json");
+                httpRequest.Content = new StringContent(serialized, Encoding.UTF8, "application/json");
 
-                using (var response = await http.SendAsync(httpRequest))
+                using (var response = await http.SendAsync(httpRequest, cancellationToken))
                 {
                     response.EnsureSuccessStatusCode();
                     var responseString = await response.Content.ReadAsStringAsync();

CorePush/Interfaces/IApnSender.cs

@@ -1,4 +1,4 @@
-using System;
+using System.Threading;
 using System.Threading.Tasks;
 using CorePush.Apple;
 
@@ -12,6 +12,7 @@ Task<ApnsResponse> SendAsync(
             string apnsId = null,
             int apnsExpiration = 0,
             int apnsPriority = 10,
-            bool isBackground = false);
+            bool isBackground = false,
+            CancellationToken cancellationToken = default);
     }
 }

CorePush/Interfaces/IFcmSender.cs

@@ -1,11 +1,12 @@
-using System.Threading.Tasks;
 using CorePush.Google;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace CorePush.Interfaces
 {
     public interface IFcmSender
     {
-        Task<FcmResponse> SendAsync(string deviceId, object payload);
-        Task<FcmResponse> SendAsync(object payload);
+        Task<FcmResponse> SendAsync(string deviceId, object payload, CancellationToken cancellationToken = default);
+        Task<FcmResponse> SendAsync(object payload, CancellationToken cancellationToken = default);
     }
 }