#64 Add cancellation taken to Async methods and remove duplicate methods.

Author: coryjthompson

WebPush/WebPushClient.cs

@@ -265,32 +265,9 @@ public HttpRequestMessage GenerateRequestDetails(PushSubscription subscription,
         public void SendNotification(PushSubscription subscription, string payload = null,
             Dictionary<string, object> options = null)
         {
-            SendNotification(subscription, payload, options, CancellationToken.None);
-        }
-
-
-        /// <summary>
-        ///     To send a push notification call this method with a subscription, optional payload and any options
-        ///     Will exception if unsuccessful
-        /// </summary>
-        /// <param name="subscription">The PushSubscription you wish to send the notification to.</param>
-        /// <param name="payload">The payload you wish to send to the user</param>
-        /// <param name="options">
-        ///     Options for the GCM API key and vapid keys can be passed in if they are unique for each
-        ///     notification.
-        /// </param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public void SendNotification(PushSubscription subscription, string payload,
-            Dictionary<string, object> options, CancellationToken cancellationToken)
-        {
-            var request = GenerateRequestDetails(subscription, payload, options);
-            var sendAsyncTask = HttpClient.SendAsync(request, cancellationToken);
-            sendAsyncTask.Wait();
-
-            var response = sendAsyncTask.Result;
-
-            HandleResponse(response, subscription);
+            SendNotification(subscription, payload, options);
         }
+        
 
         /// <summary>
         ///     To send a push notification call this method with a subscription, optional payload and any options
@@ -317,23 +294,9 @@ public void SendNotification(PushSubscription subscription, string payload, stri
             var options = new Dictionary<string, object> { ["gcmAPIKey"] = gcmApiKey };
             SendNotification(subscription, payload, options);
         }
+        
 
         /// <summary>
-        ///     To send a push notification asynchronous call this method with a subscription, optional payload and any options
-        ///     Will exception if unsuccessful
-        /// </summary>
-        /// <param name="subscription">The PushSubscription you wish to send the notification to.</param>
-        /// <param name="payload">The payload you wish to send to the user</param>
-        /// <param name="options">
-        ///     Options for the GCM API key and vapid keys can be passed in if they are unique for each
-        ///     notification.
-        /// </param>
-        public Task SendNotificationAsync(PushSubscription subscription, string payload = null,
-            Dictionary<string, object> options = null)
-        {
-            return SendNotificationAsync(subscription, payload, options, CancellationToken.None);
-        }
-
         ///     To send a push notification asynchronous call this method with a subscription, optional payload and any options
         ///     Will exception if unsuccessful
         /// </summary>
@@ -344,8 +307,8 @@ public Task SendNotificationAsync(PushSubscription subscription, string payload
         ///     notification.
         /// </param>
         /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public async Task SendNotificationAsync(PushSubscription subscription, string payload,
-            Dictionary<string, object> options, CancellationToken cancellationToken)
+        public async Task SendNotificationAsync(PushSubscription subscription, string payload = null,
+            Dictionary<string, object> options = null, CancellationToken cancellationToken=default)
         {
             var request = GenerateRequestDetails(subscription, payload, options);
             var response = await HttpClient.SendAsync(request, cancellationToken);
@@ -360,11 +323,12 @@ public async Task SendNotificationAsync(PushSubscription subscription, string pa
         /// <param name="subscription">The PushSubscription you wish to send the notification to.</param>
         /// <param name="payload">The payload you wish to send to the user</param>
         /// <param name="vapidDetails">The vapid details for the notification.</param>
+        /// <param name="cancellationToken"></param>
         public async Task SendNotificationAsync(PushSubscription subscription, string payload,
-            VapidDetails vapidDetails)
+            VapidDetails vapidDetails, CancellationToken cancellationToken=default)
         {
             var options = new Dictionary<string, object> { ["vapidDetails"] = vapidDetails };
-            await SendNotificationAsync(subscription, payload, options);
+            await SendNotificationAsync(subscription, payload, options, cancellationToken);
         }
 
         /// <summary>
@@ -374,10 +338,11 @@ public async Task SendNotificationAsync(PushSubscription subscription, string pa
         /// <param name="subscription">The PushSubscription you wish to send the notification to.</param>
         /// <param name="payload">The payload you wish to send to the user</param>
         /// <param name="gcmApiKey">The GCM API key</param>
-        public async Task SendNotificationAsync(PushSubscription subscription, string payload, string gcmApiKey)
+        /// <param name="cancellationToken"></param>
+        public async Task SendNotificationAsync(PushSubscription subscription, string payload, string gcmApiKey, CancellationToken cancellationToken=default)
         {
             var options = new Dictionary<string, object> { ["gcmAPIKey"] = gcmApiKey };
-            await SendNotificationAsync(subscription, payload, options);
+            await SendNotificationAsync(subscription, payload, options, cancellationToken);
         }
 
         /// <summary>