Handle 410 and 404 responses from Push Service. Resolves #9

Author: tpeczek

Demo.AspNetCore.PushNotifications.Services.PushService/PushServicePushNotificationService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
@@ -13,12 +14,13 @@ internal class PushServicePushNotificationService : IPushNotificationService
     {
         private readonly PushNotificationServiceOptions _options;
         private readonly PushServiceClient _pushClient;
+        private readonly IPushSubscriptionStoreAccessorProvider _subscriptionStoreAccessorProvider;
 
         private readonly ILogger _logger;
 
         public string PublicKey { get { return _options.PublicKey; } }
 
-        public PushServicePushNotificationService(IOptions<PushNotificationServiceOptions> optionsAccessor, PushServiceClient pushClient, IVapidTokenCache vapidTokenCache, ILogger<PushServicePushNotificationService> logger)
+        public PushServicePushNotificationService(IOptions<PushNotificationServiceOptions> optionsAccessor, PushServiceClient pushClient, IVapidTokenCache vapidTokenCache, IPushSubscriptionStoreAccessorProvider subscriptionStoreAccessorProvider, ILogger<PushServicePushNotificationService> logger)
         {
             _options = optionsAccessor.Value;
 
@@ -29,6 +31,7 @@ public PushServicePushNotificationService(IOptions<PushNotificationServiceOption
                 TokenCache = vapidTokenCache
             };
 
+            _subscriptionStoreAccessorProvider = subscriptionStoreAccessorProvider;
             _logger = logger;
         }
 
@@ -45,7 +48,28 @@ public async Task SendNotificationAsync(PushSubscription subscription, PushMessa
             }
             catch (Exception ex)
             {
-                _logger?.LogError(ex, "Failed requesting push message delivery to {0}.", subscription.Endpoint);
+                await HandlePushMessageDeliveryExceptionAsync(ex, subscription);
+            }
+        }
+
+        private async Task HandlePushMessageDeliveryExceptionAsync(Exception exception, PushSubscription subscription)
+        {
+            PushServiceClientException pushServiceClientException = exception as PushServiceClientException;
+
+            if (pushServiceClientException is null)
+            {
+                _logger?.LogError(exception, "Failed requesting push message delivery to {0}.", subscription.Endpoint);
+            }
+            else
+            {
+                if ((pushServiceClientException.StatusCode == HttpStatusCode.NotFound) || (pushServiceClientException.StatusCode == HttpStatusCode.Gone))
+                {
+                    using (IPushSubscriptionStoreAccessor subscriptionStoreAccessor = _subscriptionStoreAccessorProvider.GetPushSubscriptionStoreAccessor())
+                    {
+                        await subscriptionStoreAccessor.PushSubscriptionStore.DiscardSubscriptionAsync(subscription.Endpoint);
+                    }
+                    _logger?.LogInformation("Subscription has expired or is no longer valid and has been removed.");
+                }
             }
         }
     }