Push message Topic and Urgency

tpeczek · tpeczek · commit 8f01a2eefe9d · 2018-01-18T21:04:35.000+01:00
diff --git a/Demo.AspNetCore.PushNotifications.Services.Abstractions/Demo.AspNetCore.PushNotifications.Services.Abstractions.csproj b/Demo.AspNetCore.PushNotifications.Services.Abstractions/Demo.AspNetCore.PushNotifications.Services.Abstractions.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.1.0" />
+    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Demo.AspNetCore.PushNotifications.Services.Abstractions/IPushNotificationService.cs b/Demo.AspNetCore.PushNotifications.Services.Abstractions/IPushNotificationService.cs
@@ -6,6 +6,6 @@ public interface IPushNotificationService
     {
         string PublicKey { get; }
 
-        void SendNotification(PushSubscription subscription, string payload);
+        void SendNotification(PushSubscription subscription, PushMessage message);
     }
 }
diff --git a/Demo.AspNetCore.PushNotifications.Services.PushService/Demo.AspNetCore.PushNotifications.Services.PushService.csproj b/Demo.AspNetCore.PushNotifications.Services.PushService/Demo.AspNetCore.PushNotifications.Services.PushService.csproj
@@ -4,7 +4,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.1.0" />
+    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.2.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
diff --git a/Demo.AspNetCore.PushNotifications.Services.PushService/PushServicePushNotificationService.cs b/Demo.AspNetCore.PushNotifications.Services.PushService/PushServicePushNotificationService.cs
@@ -32,11 +32,11 @@ public PushServicePushNotificationService(IOptions<PushNotificationServiceOption
             _logger = logger;
         }
 
-        public void SendNotification(PushSubscription subscription, string payload)
+        public void SendNotification(PushSubscription subscription, PushMessage message)
         {
             try
             {
-                _pushClient.RequestPushMessageDeliveryAsync(subscription, new PushMessage(payload)).Wait();
+                _pushClient.RequestPushMessageDeliveryAsync(subscription, message).Wait();
             }
             catch (Exception ex)
             {
diff --git a/Demo.AspNetCore.PushNotifications.Services.Sqlite/Demo.AspNetCore.PushNotifications.Services.Sqlite.csproj b/Demo.AspNetCore.PushNotifications.Services.Sqlite/Demo.AspNetCore.PushNotifications.Services.Sqlite.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.1.0" />
+    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />
   </ItemGroup>
diff --git a/Demo.AspNetCore.PushNotifications/Controllers/PushNotificationsApiController.cs b/Demo.AspNetCore.PushNotifications/Controllers/PushNotificationsApiController.cs
@@ -1,6 +1,7 @@
 ﻿using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Lib.Net.Http.WebPush;
+using Demo.AspNetCore.PushNotifications.Model;
 using Demo.AspNetCore.PushNotifications.Services.Abstractions;
 
 namespace Demo.AspNetCore.PushNotifications.Controllers
@@ -44,10 +45,16 @@ public async Task<IActionResult> DiscardSubscription(string endpoint)
 
         // POST push-notifications-api/notifications
         [HttpPost("notifications")]
-        public async Task<IActionResult> SendNotification([FromBody]string payload)
+        public async Task<IActionResult> SendNotification([FromBody]PushMessageViewModel message)
         {
+            PushMessage pushMessage = new PushMessage(message.Notification)
+            {
+                Topic = message.Topic,
+                Urgency = message.Urgency
+            };
+
             // TODO: This should be scheduled in background
-            await _subscriptionStore.ForEachSubscriptionAsync((PushSubscription subscription) => _notificationService.SendNotification(subscription, payload));
+            await _subscriptionStore.ForEachSubscriptionAsync((PushSubscription subscription) => _notificationService.SendNotification(subscription, pushMessage));
 
             return NoContent();
         }
diff --git a/Demo.AspNetCore.PushNotifications/Demo.AspNetCore.PushNotifications.csproj b/Demo.AspNetCore.PushNotifications/Demo.AspNetCore.PushNotifications.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.1.0" />
+    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Demo.AspNetCore.PushNotifications/Model/PushMessageViewModel.cs b/Demo.AspNetCore.PushNotifications/Model/PushMessageViewModel.cs
@@ -0,0 +1,13 @@
+﻿using Lib.Net.Http.WebPush;
+
+namespace Demo.AspNetCore.PushNotifications.Model
+{
+    public class PushMessageViewModel
+    {
+        public string Topic { get; set; }
+
+        public string Notification { get; set; }
+
+        public PushMessageUrgency Urgency { get; set; } = PushMessageUrgency.Normal;
+    }
+}
diff --git a/Demo.AspNetCore.PushNotifications/Startup.cs b/Demo.AspNetCore.PushNotifications/Startup.cs
@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json.Converters;
 using Demo.AspNetCore.PushNotifications.Services;
 using Demo.AspNetCore.PushNotifications.Formatters;
 
@@ -24,6 +25,10 @@ public void ConfigureServices(IServiceCollection services)
                 .AddMvc(options =>
                 {
                     options.InputFormatters.Add(new TextPlainInputFormatter());
+                })
+                .AddJsonOptions(options =>
+                {
+                    options.SerializerSettings.Converters.Add(new StringEnumConverter());
                 });
         }
 
diff --git a/Demo.AspNetCore.PushNotifications/appsettings.json b/Demo.AspNetCore.PushNotifications/appsettings.json
@@ -5,9 +5,7 @@
   "PushNotificationServiceType": "PushService",
   "PushNotificationService": {
     "Subject": "https://localhost:65506/",
-    "PublicKey": "BK5sn4jfa0Jqo9MhV01oyzK2FaEHm0KqkSCuUkKr53-9cr-vBE1a9TiiBaWy7hy0eOUF1jhZnwcd3vof4wnwSw0",
-    //"PublicKey": "<Application Server Public Key>",
-    "PrivateKey": "AJ2ho7or-6D4StPktpTO3l1ErjHGyxb0jzt9Y8lj67g"
-    //"PrivateKey": "<Application Server Private Key>"
+    "PublicKey": "<Application Server Public Key>",
+    "PrivateKey": "<Application Server Private Key>"
   }
 }
diff --git a/Demo.AspNetCore.PushNotifications/wwwroot/push-notifications.html b/Demo.AspNetCore.PushNotifications/wwwroot/push-notifications.html
@@ -10,8 +10,16 @@
         <div id="dashboard-controls">
             <button disabled="disabled" id="subscribe">Subscribe for Push Notifications</button>
             <button disabled="disabled" id="unsubscribe">Unsubscribe from Push Notifications</button>
-            <br />
-            <input id="notification" size="65">
+            <br /><hr />
+            <label for="topic">Topic:</label><input type="text" id="topic" size="32" maxlength="32" />
+            <label for="urgency">Urgency:</label>
+            <select id="urgency">
+                <option value="VeryLow">Very Low</option>
+                <option value="Low">Low</option>
+                <option value="Normal" selected="selected">Normal</option>
+                <option value="High">High</option>
+            </select><br />
+            <input id="notification" size="65" />
             <button id="send">Send Push Notification</button>
         </div>
         <hr />
diff --git a/Demo.AspNetCore.PushNotifications/wwwroot/scripts/push-notifications.js b/Demo.AspNetCore.PushNotifications/wwwroot/scripts/push-notifications.js
@@ -4,7 +4,7 @@
     let consoleOutput;
     let pushServiceWorkerRegistration;
     let subscribeButton, unsubscribeButton;
-    let notificationInput;
+    let topicInput, urgencySelect, notificationInput;
 
     function urlB64ToUint8Array(base64String) {
         const padding = '='.repeat((4 - base64String.length % 4) % 4);
@@ -59,7 +59,9 @@
         unsubscribeButton = document.getElementById('unsubscribe');
         unsubscribeButton.addEventListener('click', unsubscribeFromPushNotifications);
 
+        topicInput = document.getElementById('topic');
         notificationInput = document.getElementById('notification');
+        urgencySelect = document.getElementById('urgency');
         document.getElementById('send').addEventListener('click', sendPushNotification);
 
         pushServiceWorkerRegistration.pushManager.getSubscription()
@@ -158,12 +160,12 @@
     };
 
     function sendPushNotification() {
-        let payload = notificationInput.value;
+        let payload = { topic: topicInput.value, notification: notificationInput.value, urgency: urgencySelect.value };
 
         fetch('push-notifications-api/notifications', {
             method: 'POST',
-            headers: { 'Content-Type': 'text/plain' },
-            body: payload
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(payload)
         })
             .then(function (response) {
                 if (response.ok) {

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ public interface IPushNotificationService`
`6`	`6`	`{`
`7`	`7`	`string PublicKey { get; }`
`8`	`8`
`9`		`- void SendNotification(PushSubscription subscription, string payload);`
	`9`	`+ void SendNotification(PushSubscription subscription, PushMessage message);`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@ public PushServicePushNotificationService(IOptions<PushNotificationServiceOption`
`32`	`32`	`_logger = logger;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public void SendNotification(PushSubscription subscription, string payload)`
	`35`	`+ public void SendNotification(PushSubscription subscription, PushMessage message)`
`36`	`36`	`{`
`37`	`37`	`try`
`38`	`38`	`{`
`39`		`- _pushClient.RequestPushMessageDeliveryAsync(subscription, new PushMessage(payload)).Wait();`
	`39`	`+ _pushClient.RequestPushMessageDeliveryAsync(subscription, message).Wait();`
`40`	`40`	`}`
`41`	`41`	`catch (Exception ex)`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,7 @@`
`5`	`5`	`"PushNotificationServiceType": "PushService",`
`6`	`6`	`"PushNotificationService": {`
`7`	`7`	`"Subject": "https://localhost:65506/",`
`8`		`- "PublicKey": "BK5sn4jfa0Jqo9MhV01oyzK2FaEHm0KqkSCuUkKr53-9cr-vBE1a9TiiBaWy7hy0eOUF1jhZnwcd3vof4wnwSw0",`
`9`		`- //"PublicKey": "<Application Server Public Key>",`
`10`		`- "PrivateKey": "AJ2ho7or-6D4StPktpTO3l1ErjHGyxb0jzt9Y8lj67g"`
`11`		`- //"PrivateKey": "<Application Server Private Key>"`
	`8`	`+ "PublicKey": "<Application Server Public Key>",`
	`9`	`+ "PrivateKey": "<Application Server Private Key>"`
`12`	`10`	`}`
`13`	`11`	`}`