From f74dfb5fbb86ea05ebe4634dcc7d23169a7e5564 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 25 Aug 2018 17:21:42 -0400
Subject: [PATCH] centralize type deserialization

---
 src/Notifications/AzureQueueHostedService.cs    | 8 +-------
 src/Notifications/Controllers/SendController.cs | 5 +----
 src/Notifications/HubHelpers.cs                 | 5 +++--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/Notifications/AzureQueueHostedService.cs b/src/Notifications/AzureQueueHostedService.cs
index 05baf77cf6..a3af1f046b 100644
--- a/src/Notifications/AzureQueueHostedService.cs
+++ b/src/Notifications/AzureQueueHostedService.cs
@@ -3,13 +3,11 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core;
-using Bit.Core.Models;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Queue;
-using Newtonsoft.Json;
 
 namespace Bit.Notifications
 {
@@ -68,11 +66,7 @@ namespace Bit.Notifications
                 {
                     foreach(var message in messages)
                     {
-                        var notificationJson = message.AsString;
-                        var notification = JsonConvert.DeserializeObject<PushNotificationData<object>>(
-                            notificationJson);
-                        await HubHelpers.SendNotificationToHubAsync(notification.Type, notificationJson,
-                            _hubContext, cancellationToken);
+                        await HubHelpers.SendNotificationToHubAsync(message.AsString, _hubContext, cancellationToken);
                         await _queue.DeleteMessageAsync(message);
                     }
                 }
diff --git a/src/Notifications/Controllers/SendController.cs b/src/Notifications/Controllers/SendController.cs
index d53982d90a..7a99c8f8ac 100644
--- a/src/Notifications/Controllers/SendController.cs
+++ b/src/Notifications/Controllers/SendController.cs
@@ -1,12 +1,10 @@
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Bit.Core.Models;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
-using Newtonsoft.Json;
 
 namespace Bit.Notifications
 {
@@ -29,8 +27,7 @@ namespace Bit.Notifications
                 var notificationJson = await reader.ReadToEndAsync();
                 if(!string.IsNullOrWhiteSpace(notificationJson))
                 {
-                    var notification = JsonConvert.DeserializeObject<PushNotificationData<object>>(notificationJson);
-                    await HubHelpers.SendNotificationToHubAsync(notification.Type, notificationJson, _hubContext);
+                    await HubHelpers.SendNotificationToHubAsync(notificationJson, _hubContext);
                 }
             }
         }
diff --git a/src/Notifications/HubHelpers.cs b/src/Notifications/HubHelpers.cs
index f955cc1ced..2a9cc403d3 100644
--- a/src/Notifications/HubHelpers.cs
+++ b/src/Notifications/HubHelpers.cs
@@ -9,10 +9,11 @@ namespace Bit.Notifications
 {
     public static class HubHelpers
     {
-        public static async Task SendNotificationToHubAsync(PushType type, string notificationJson,
+        public static async Task SendNotificationToHubAsync(string notificationJson,
             IHubContext<NotificationsHub> hubContext, CancellationToken cancellationToken = default(CancellationToken))
         {
-            switch(type)
+            var notification = JsonConvert.DeserializeObject<PushNotificationData<object>>(notificationJson);
+            switch(notification.Type)
             {
                 case PushType.SyncCipherUpdate:
                 case PushType.SyncCipherCreate: