Notifications

src/Server/Coderr.Server.Api/Core/Users/Commands/DeleteBrowserSubscription.cs

@@ -0,0 +1,9 @@
+namespace Coderr.Server.Api.Core.Users.Commands
+{
+    [Message]
+    public class DeleteBrowserSubscription
+    {
+        public int UserId { get; set; }
+        public string Endpoint { get; set; }
+    }
+}

src/Server/Coderr.Server.Api/Core/Users/Commands/StoreBrowserSubscription.cs

@@ -0,0 +1,17 @@
+namespace Coderr.Server.Api.Core.Users.Commands
+{
+    /// <summary>
+    /// https://tools.ietf.org/html/draft-ietf-webpush-encryption-08
+    /// </summary>
+    [Message]
+    public class StoreBrowserSubscription
+    {
+        public int UserId { get; set; }
+        public string Endpoint { get; set; }
+
+        public string PublicKey { get; set; }
+        public string AuthenticationSecret { get; set; }
+
+        public int? ExpirationTime { get; set; }
+    }
+}

src/Server/Coderr.Server.Api/Core/Users/Commands/UpdateNotifications.cs

@@ -16,11 +16,6 @@ public class UpdateNotifications
         /// </summary>
         public NotificationState NotifyOnNewIncidents { get; set; }
 
-        /// <summary>
-        ///     How to notify when a new report is created (receive an exception)
-        /// </summary>
-        public NotificationState NotifyOnNewReport { get; set; }
-
         /// <summary>
         ///     How to notify user when a peak is detected
         /// </summary>
@@ -36,6 +31,7 @@ public class UpdateNotifications
         /// </summary>
         public NotificationState NotifyOnUserFeedback { get; set; }
 
+
         /// <summary>
         ///     User that configured its settings.
         /// </summary>

src/Server/Coderr.Server.Api/Core/Users/NotificationSettings.cs

@@ -12,11 +12,6 @@ public class NotificationSettings
         /// </summary>
         public NotificationState NotifyOnNewIncidents { get; set; }
 
-        /// <summary>
-        ///     How to notify when a new report is created (receive an exception)
-        /// </summary>
-        public NotificationState NotifyOnNewReport { get; set; }
-
         /// <summary>
         ///     How to notify user when a peak is detected
         /// </summary>

src/Server/Coderr.Server.Api/Core/Users/NotificationState.cs

@@ -8,21 +8,26 @@ public enum NotificationState
         /// <summary>
         ///     Use global setting
         /// </summary>
-        UseGlobalSetting,
+        UseGlobalSetting = 1,
 
         /// <summary>
         ///     Do not notify
         /// </summary>
-        Disabled,
+        Disabled = 2,
 
         /// <summary>
         ///     By cellphone (text message)
         /// </summary>
-        Cellphone,
+        Cellphone = 3,
 
         /// <summary>
         ///     By email
         /// </summary>
-        Email
+        Email = 4,
+
+        /// <summary>
+        /// Use browser/desktop notifications.
+        /// </summary>
+        BrowserNotification = 5
     }
 }

src/Server/Coderr.Server.App/Core/Notifications/Commands/DeleteBrowserSubscriptionHandler.cs

@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using Coderr.Server.Api.Core.Users.Commands;
+using DotNetCqs;
+
+namespace Coderr.Server.App.Core.Notifications.Commands
+{
+    internal class DeleteBrowserSubscriptionHandler : IMessageHandler<DeleteBrowserSubscription>
+    {
+        private readonly INotificationsRepository _repository;
+
+        public DeleteBrowserSubscriptionHandler(INotificationsRepository repository)
+        {
+            _repository = repository;
+        }
+
+        public async Task HandleAsync(IMessageContext context, DeleteBrowserSubscription message)
+        {
+            await _repository.DeleteBrowserSubscription(message.UserId, message.Endpoint);
+        }
+    }
+}

src/Server/Coderr.Server.App/Core/Notifications/Commands/StoreBrowserSubscriptionHandler.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Threading.Tasks;
+using Coderr.Server.Abstractions.Security;
+using Coderr.Server.Api.Core.Users.Commands;
+using Coderr.Server.Domain.Modules.UserNotifications;
+using DotNetCqs;
+
+namespace Coderr.Server.App.Core.Notifications.Commands
+{
+    internal class StoreBrowserSubscriptionHandler : IMessageHandler<StoreBrowserSubscription>
+    {
+        private readonly INotificationsRepository _notificationsRepository;
+
+        public StoreBrowserSubscriptionHandler(INotificationsRepository notificationsRepository)
+        {
+            _notificationsRepository = notificationsRepository;
+        }
+
+        public async Task HandleAsync(IMessageContext context, StoreBrowserSubscription message)
+        {
+            var subscription = new BrowserSubscription
+            {
+                AccountId = context.Principal.GetAccountId(),
+                AuthenticationSecret = message.AuthenticationSecret,
+                Endpoint = message.Endpoint,
+                PublicKey = message.PublicKey,
+                ExpiresAtUtc = message.ExpirationTime == null
+                    ? (DateTime?) null
+                    : DateTime.UtcNow.AddMilliseconds(message.ExpirationTime.Value)
+            };
+            await _notificationsRepository.Save(subscription);
+        }
+    }
+}

src/Server/Coderr.Server.App/Core/Notifications/INotificationsRepository.cs

@@ -2,12 +2,13 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
+using Coderr.Server.Api.Core.Users.Commands;
 using Coderr.Server.Domain.Modules.UserNotifications;
 
 namespace Coderr.Server.App.Core.Notifications
 {
     /// <summary>
-    ///     Repository for notification settings
+    ///     Repository for managing notification settings
     /// </summary>
     public interface INotificationsRepository
     {
@@ -45,5 +46,8 @@ public interface INotificationsRepository
         /// <returns>task</returns>
         /// <exception cref="ArgumentNullException">notificationSettings</exception>
         Task UpdateAsync(UserNotificationSettings notificationSettings);
+
+        Task Save(BrowserSubscription message);
+        Task DeleteBrowserSubscription(int accountId, string endpoint);
     }
 }

src/Server/Coderr.Server.App/Core/Reports/Config/ReportConfig.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using Coderr.Server.Abstractions.Config;
-using Coderr.Server.Infrastructure.Configuration;
-//using Coderr.Server.ReportAnalyzer.Abstractions.ErrorReports;
 
 namespace Coderr.Server.App.Core.Reports.Config
 {

src/Server/Coderr.Server.App/Core/Reports/Jobs/DeleteReportsBelowReportLimit.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Data;
-using System.Diagnostics;
 using Coderr.Server.Abstractions.Boot;
 using Coderr.Server.Abstractions.Config;
 using Coderr.Server.App.Core.Reports.Config;

src/Server/Coderr.Server.App/Core/Users/WebApi/GetUserSettingsHandler.cs

@@ -38,7 +38,6 @@ public async Task<GetUserSettingsResult> HandleAsync(IMessageContext context, Ge
                     NotifyOnReOpenedIncident = settings.ReopenedIncident.ConvertEnum<NotificationState>(),
                     NotifyOnUserFeedback = settings.UserFeedback.ConvertEnum<NotificationState>(),
                     NotifyOnPeaks = settings.ApplicationSpike.ConvertEnum<NotificationState>(),
-                    NotifyOnNewReport = settings.NewReport.ConvertEnum<NotificationState>(),
                     NotifyOnNewIncidents = settings.NewIncident.ConvertEnum<NotificationState>()
                 }
             };

src/Server/Coderr.Server.App/Core/Users/WebApi/UpdateNotificationsHandler.cs

@@ -45,7 +45,6 @@ public async Task HandleAsync(IMessageContext context, UpdateNotifications comma
 
             settings.ApplicationSpike = command.NotifyOnPeaks.ConvertEnum<NotificationState>();
             settings.NewIncident = command.NotifyOnNewIncidents.ConvertEnum<NotificationState>();
-            settings.NewReport = command.NotifyOnNewReport.ConvertEnum<NotificationState>();
             settings.ReopenedIncident = command.NotifyOnReOpenedIncident.ConvertEnum<NotificationState>();
             settings.UserFeedback = command.NotifyOnUserFeedback.ConvertEnum<NotificationState>();
             await _notificationsRepository.UpdateAsync(settings);

src/Server/Coderr.Server.Domain/Modules/UserNotifications/BrowserSubscription.cs

@@ -0,0 +1,26 @@
+using System;
+
+namespace Coderr.Server.Domain.Modules.UserNotifications
+{
+    public class BrowserSubscription
+    {
+        public int AccountId { get; set; }
+
+        public DateTime CreatedAtUtc { get; set; } = DateTime.UtcNow;
+
+        /// <summary>
+        /// </summary>
+        public string AuthenticationSecret { get; set; }
+
+        public string Endpoint { get; set; }
+
+        public DateTime? ExpiresAtUtc { get; set; }
+
+        public int Id { get; set; }
+
+        /// <summary>
+        ///     https://developer.mozilla.org/en-US/docs/Web/API/PushSubscription/getKey
+        /// </summary>
+        public string PublicKey { get; set; }
+    }
+}

src/Server/Coderr.Server.Domain/Modules/UserNotifications/IUserNotificationsRepository.cs

@@ -16,5 +16,9 @@ public interface IUserNotificationsRepository
         [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]
         [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
         Task<IEnumerable<UserNotificationSettings>> GetAllAsync(int applicationId);
+
+        Task<IReadOnlyList<BrowserSubscription>> GetSubscriptions(int accountId);
+        Task Delete(BrowserSubscription subscription);
+
     }
 }

src/Server/Coderr.Server.Domain/Modules/UserNotifications/NotificationState.cs

@@ -8,21 +8,31 @@ public enum NotificationState
         /// <summary>
         ///     Use global setting
         /// </summary>
-        UseGlobalSetting,
+        UseGlobalSetting = 1,
 
         /// <summary>
         ///     Do not notify
         /// </summary>
-        Disabled,
+        Disabled = 2,
 
         /// <summary>
         ///     By cellphone (text message)
         /// </summary>
-        Cellphone,
+        Cellphone = 3,
 
         /// <summary>
         ///     By email
         /// </summary>
-        Email
+        Email = 4,
+
+        /// <summary>
+        ///     Send a browser notification to the user
+        /// </summary>
+        /// <remarks>
+        ///     <para>
+        ///         Requires that the user have approved it (by a javascript request).
+        ///     </para>
+        /// </remarks>
+        BrowserNotification = 5
     }
 }

src/Server/Coderr.Server.Domain/Modules/UserNotifications/UserNotificationSettings.cs

@@ -18,6 +18,13 @@ public UserNotificationSettings(int accountId, int applicationId)
             if (accountId <= 0) throw new ArgumentOutOfRangeException("accountId");
             AccountId = accountId;
             ApplicationId = applicationId;
+            if (applicationId != 0)
+                return;
+
+            ApplicationSpike = NotificationState.Disabled;
+            NewIncident = NotificationState.Disabled;
+            ReopenedIncident = NotificationState.Disabled;
+            UserFeedback = NotificationState.Disabled;
         }
 
         /// <summary>
@@ -47,11 +54,6 @@ protected UserNotificationSettings()
         /// </summary>
         public NotificationState NewIncident { get; set; }
 
-        /// <summary>
-        ///     Notify each time a new exception is received (no matter if it's unique or not)
-        /// </summary>
-        public NotificationState NewReport { get; set; }
-
         /// <summary>
         ///     Notify when we received a report for an incident that has been closed
         /// </summary>

src/Server/Coderr.Server.ReportAnalyzer.Abstractions/Feedback/FeedbackAttachedToIncident.cs

@@ -5,6 +5,16 @@
     /// </summary>
     public class FeedbackAttachedToIncident
     {
+        /// <summary>
+        ///     Application that the incident belongs to.
+        /// </summary>
+        public int ApplicationId { get; set; }
+
+        /// <summary>
+        ///     Name of the application that the feedback is for.
+        /// </summary>
+        public string ApplicationName { get; set; }
+
         /// <summary>
         ///     Incident that the feedback was attached to.
         /// </summary>

src/Server/Coderr.Server.ReportAnalyzer/Feedback/Handlers/AttachFeedbackToIncident.cs

@@ -25,9 +25,10 @@ public async Task HandleAsync(IMessageContext context, ReportAddedToIncident e)
                 return;
 
             feedback.AssignToReport(e.Report.Id, e.Incident.Id, e.Incident.ApplicationId);
-
             var evt = new FeedbackAttachedToIncident
             {
+                ApplicationId = e.Incident.ApplicationId,
+                ApplicationName = e.Incident.ApplicationName,
                 IncidentId = e.Incident.Id,
                 Message = feedback.Description,
                 UserEmailAddress = feedback.EmailAddress

src/Server/Coderr.Server.ReportAnalyzer/Inbound/SaveReportHandler.cs

@@ -182,8 +182,9 @@ private async Task<AppInfo> GetAppAsync(string appKey)
         {
             using (var cmd = _unitOfWork.CreateDbCommand())
             {
-                cmd.CommandText = "SELECT Id, SharedSecret FROM Applications WHERE AppKey = @key";
+                cmd.CommandText = "SELECT Id, SharedSecret FROM Applications WHERE AppKey = @key OR AppKey = @key2";
                 cmd.AddParameter("key", appKey);
+                cmd.AddParameter("key2", appKey.Replace("-", ""));
                 using (var reader = await cmd.ExecuteReaderAsync())
                 {
                     if (!await reader.ReadAsync())