VAPID tokens caching

tpeczek · tpeczek · commit 67ce06f3e2ca · 2018-01-10T23:05:49.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.0.0" />
+    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.1.0" />
   </ItemGroup>
 
 </Project>
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,9 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.0.0" />
+    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.1.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" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Demo.AspNetCore.PushNotifications.Services.PushService/MemoryVapidTokenCache.cs b/Demo.AspNetCore.PushNotifications.Services.PushService/MemoryVapidTokenCache.cs
@@ -0,0 +1,31 @@
+﻿using System;
+using Microsoft.Extensions.Caching.Memory;
+using Lib.Net.Http.WebPush.Authentication;
+
+namespace Demo.AspNetCore.PushNotifications.Services.PushService
+{
+    internal class MemoryVapidTokenCache : IVapidTokenCache
+    {
+        private readonly IMemoryCache _memoryCache;
+
+        public MemoryVapidTokenCache(IMemoryCache memoryCache)
+        {
+            _memoryCache = memoryCache;
+        }
+
+        public string Get(string audience)
+        {
+            if (!_memoryCache.TryGetValue(audience, out string token))
+            {
+                token = null;
+            }
+
+            return token;
+        }
+
+        public void Put(string audience, DateTimeOffset expiration, string token)
+        {
+            _memoryCache.Set(audience, token, expiration);
+        }
+    }
+}
diff --git a/Demo.AspNetCore.PushNotifications.Services.PushService/PushServicePushNotificationService.cs b/Demo.AspNetCore.PushNotifications.Services.PushService/PushServicePushNotificationService.cs
@@ -1,4 +1,6 @@
-﻿using Microsoft.Extensions.Options;
+﻿using System;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Logging;
 using Lib.Net.Http.WebPush;
 using Lib.Net.Http.WebPush.Authentication;
 using Demo.AspNetCore.PushNotifications.Services.Abstractions;
@@ -10,24 +12,36 @@ internal class PushServicePushNotificationService : IPushNotificationService
         private readonly PushNotificationServiceOptions _options;
         private readonly PushServiceClient _pushClient;
 
+        private readonly ILogger _logger;
+
         public string PublicKey { get { return _options.PublicKey; } }
 
-        public PushServicePushNotificationService(IOptions<PushNotificationServiceOptions> optionsAccessor)
+        public PushServicePushNotificationService(IOptions<PushNotificationServiceOptions> optionsAccessor, IVapidTokenCache vapidTokenCache, ILogger<PushServicePushNotificationService> logger)
         {
             _options = optionsAccessor.Value;
 
             _pushClient = new PushServiceClient
             {
                 DefaultAuthentication = new VapidAuthentication(_options.PublicKey, _options.PrivateKey)
                 {
-                    Subject = _options.Subject
+                    Subject = _options.Subject,
+                    TokenCache = vapidTokenCache
                 }
             };
+
+            _logger = logger;
         }
 
         public void SendNotification(PushSubscription subscription, string payload)
         {
-            _pushClient.RequestPushMessageDeliveryAsync(subscription, new PushMessage(payload)).Wait();
+            try
+            {
+                _pushClient.RequestPushMessageDeliveryAsync(subscription, new PushMessage(payload)).Wait();
+            }
+            catch (Exception ex)
+            {
+                _logger?.LogError(ex, "Failed requesting push message delivery to {0}.", subscription.Endpoint);
+            }
         }
     }
 }
diff --git a/Demo.AspNetCore.PushNotifications.Services.PushService/PushServiceServiceCollectionExtensions.cs b/Demo.AspNetCore.PushNotifications.Services.PushService/PushServiceServiceCollectionExtensions.cs
@@ -1,4 +1,5 @@
 ﻿using Microsoft.Extensions.DependencyInjection;
+using Lib.Net.Http.WebPush.Authentication;
 using Demo.AspNetCore.PushNotifications.Services.Abstractions;
 
 namespace Demo.AspNetCore.PushNotifications.Services.PushService
@@ -7,6 +8,8 @@ public static class PushServiceServiceCollectionExtensions
     {
         public static IServiceCollection AddPushServicePushNotificationService(this IServiceCollection services)
         {
+            services.AddMemoryCache();
+            services.AddSingleton<IVapidTokenCache, MemoryVapidTokenCache>();
             services.AddSingleton<IPushNotificationService, PushServicePushNotificationService>();
 
             return services;
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.0.0" />
+    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.1.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/Demo.AspNetCore.PushNotifications.csproj b/Demo.AspNetCore.PushNotifications/Demo.AspNetCore.PushNotifications.csproj
@@ -3,8 +3,8 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
+    <PackageReference Include="Lib.Net.Http.WebPush" Version="1.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Demo.AspNetCore.PushNotifications.Services.Abstractions\Demo.AspNetCore.PushNotifications.Services.Abstractions.csproj" />
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@ Sample project for demonstrating Push Notifications based on Push API and Web Pu
 
 - [Push API](https://www.tpeczek.com/2017/12/push-notifications-and-aspnet-core-part.html)
 - [Requesting Delivery](https://www.tpeczek.com/2018/01/push-notifications-and-aspnet-core-part.html) ([Lib.Net.Http.WebPush](https://github.com/tpeczek/Lib.Net.Http.WebPush))
+- VAPID tokens caching
 
 ## Donating
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-using Microsoft.Extensions.Options;`
	`1`	`+using System;`
	`2`	`+using Microsoft.Extensions.Options;`
	`3`	`+using Microsoft.Extensions.Logging;`
`2`	`4`	`using Lib.Net.Http.WebPush;`
`3`	`5`	`using Lib.Net.Http.WebPush.Authentication;`
`4`	`6`	`using Demo.AspNetCore.PushNotifications.Services.Abstractions;`
`@@ -10,24 +12,36 @@ internal class PushServicePushNotificationService : IPushNotificationService`
`10`	`12`	`private readonly PushNotificationServiceOptions _options;`
`11`	`13`	`private readonly PushServiceClient _pushClient;`
`12`	`14`
	`15`	`+ private readonly ILogger _logger;`
	`16`	`+`
`13`	`17`	`public string PublicKey { get { return _options.PublicKey; } }`
`14`	`18`
`15`		`- public PushServicePushNotificationService(IOptions<PushNotificationServiceOptions> optionsAccessor)`
	`19`	`+ public PushServicePushNotificationService(IOptions<PushNotificationServiceOptions> optionsAccessor, IVapidTokenCache vapidTokenCache, ILogger<PushServicePushNotificationService> logger)`
`16`	`20`	`{`
`17`	`21`	`_options = optionsAccessor.Value;`
`18`	`22`
`19`	`23`	`_pushClient = new PushServiceClient`
`20`	`24`	`{`
`21`	`25`	`DefaultAuthentication = new VapidAuthentication(_options.PublicKey, _options.PrivateKey)`
`22`	`26`	`{`
`23`		`- Subject = _options.Subject`
	`27`	`+ Subject = _options.Subject,`
	`28`	`+ TokenCache = vapidTokenCache`
`24`	`29`	`}`
`25`	`30`	`};`
	`31`	`+`
	`32`	`+ _logger = logger;`
`26`	`33`	`}`
`27`	`34`
`28`	`35`	`public void SendNotification(PushSubscription subscription, string payload)`
`29`	`36`	`{`
`30`		`- _pushClient.RequestPushMessageDeliveryAsync(subscription, new PushMessage(payload)).Wait();`
	`37`	`+ try`
	`38`	`+ {`
	`39`	`+ _pushClient.RequestPushMessageDeliveryAsync(subscription, new PushMessage(payload)).Wait();`
	`40`	`+ }`
	`41`	`+ catch (Exception ex)`
	`42`	`+ {`
	`43`	`+ _logger?.LogError(ex, "Failed requesting push message delivery to {0}.", subscription.Endpoint);`
	`44`	`+ }`
`31`	`45`	`}`
`32`	`46`	`}`
`33`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Microsoft.Extensions.DependencyInjection;`
	`2`	`+using Lib.Net.Http.WebPush.Authentication;`
`2`	`3`	`using Demo.AspNetCore.PushNotifications.Services.Abstractions;`
`3`	`4`
`4`	`5`	`namespace Demo.AspNetCore.PushNotifications.Services.PushService`
`@@ -7,6 +8,8 @@ public static class PushServiceServiceCollectionExtensions`
`7`	`8`	`{`
`8`	`9`	`public static IServiceCollection AddPushServicePushNotificationService(this IServiceCollection services)`
`9`	`10`	`{`
	`11`	`+ services.AddMemoryCache();`
	`12`	`+ services.AddSingleton<IVapidTokenCache, MemoryVapidTokenCache>();`
`10`	`13`	`services.AddSingleton<IPushNotificationService, PushServicePushNotificationService>();`
`11`	`14`
`12`	`15`	`return services;`