From 5766c1f6f370d49392a66bf9529a9970996dbd81 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 17 Aug 2018 18:04:11 -0400
Subject: [PATCH] enable notifications services

---
 src/Admin/Views/Logs/Index.cshtml                           | 2 +-
 .../Implementations/MultiServicePushNotificationService.cs  | 6 +++---
 src/Notifications/Properties/launchSettings.json            | 4 ++--
 src/Notifications/Startup.cs                                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Admin/Views/Logs/Index.cshtml b/src/Admin/Views/Logs/Index.cshtml
index a6cbfcfa5..ae14cfcec 100644
--- a/src/Admin/Views/Logs/Index.cshtml
+++ b/src/Admin/Views/Logs/Index.cshtml
@@ -21,7 +21,7 @@
         <option asp-selected="@(Model.Project == "Billing")" value="Billing">Billing</option>
         <option asp-selected="@(Model.Project == "Events")" value="Events">Events</option>
         <option asp-selected="@(Model.Project == "Identity")" value="Identity">Identity</option>
-        <option asp-selected="@(Model.Project == "Scim")" value="Scim">Scim</option>
+        <option asp-selected="@(Model.Project == "Notifications")" value="Notifications">Notifications</option>
         <option asp-selected="@(Model.Project == "Icons")" value="Icons">Icons</option>
     </select>
     <button type="submit" class="btn btn-primary mb-2" title="Search"><i class="fa fa-search"></i> Search</button>
diff --git a/src/Core/Services/Implementations/MultiServicePushNotificationService.cs b/src/Core/Services/Implementations/MultiServicePushNotificationService.cs
index bd47b2afa..8952a9ae1 100644
--- a/src/Core/Services/Implementations/MultiServicePushNotificationService.cs
+++ b/src/Core/Services/Implementations/MultiServicePushNotificationService.cs
@@ -30,8 +30,8 @@ namespace Bit.Core.Services
                 if(CoreHelpers.SettingHasValue(globalSettings.InternalIdentityKey) &&
                     CoreHelpers.SettingHasValue(globalSettings.BaseServiceUri.InternalNotifications))
                 {
-                    // _services.Add(new NotificationsApiPushNotificationService(
-                    //    globalSettings, httpContextAccessor, hubLogger));
+                    _services.Add(new NotificationsApiPushNotificationService(
+                        globalSettings, httpContextAccessor, hubLogger));
                 }
             }
             else
@@ -42,7 +42,7 @@ namespace Bit.Core.Services
                 }
                 if(CoreHelpers.SettingHasValue(globalSettings.Notifications?.ConnectionString))
                 {
-                    // _services.Add(new AzureQueuePushNotificationService(globalSettings, httpContextAccessor));
+                    _services.Add(new AzureQueuePushNotificationService(globalSettings, httpContextAccessor));
                 }
             }
         }
diff --git a/src/Notifications/Properties/launchSettings.json b/src/Notifications/Properties/launchSettings.json
index 60107fae3..0bb43fce0 100644
--- a/src/Notifications/Properties/launchSettings.json
+++ b/src/Notifications/Properties/launchSettings.json
@@ -10,14 +10,14 @@
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
-      "launchBrowser": true,
+      "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "Notifications": {
       "commandName": "Project",
-      "launchBrowser": true,
+      "launchBrowser": false,
       "applicationUrl": "http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/src/Notifications/Startup.cs b/src/Notifications/Startup.cs
index 56821d27e..e8c30b78d 100644
--- a/src/Notifications/Startup.cs
+++ b/src/Notifications/Startup.cs
@@ -105,7 +105,7 @@ namespace Bit.Notifications
             // Add SignlarR
             app.UseSignalR(routes =>
             {
-                routes.MapHub<NotificationsHub>("/notifications-hub");
+                routes.MapHub<NotificationsHub>("/hub");
             });
 
             // Add MVC to the request pipeline.