From 00d79d0fffbacf2c0104aea8cd162fdfb388b790 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kspearrin@imobile3.com>
Date: Wed, 29 Jun 2016 21:17:46 -0400
Subject: [PATCH] Push service fixes. Specific pushes for cipher type deletes.

---
 src/Core/Enums/PushType.cs       |  5 +++--
 src/Core/Services/PushService.cs | 19 +++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/Core/Enums/PushType.cs b/src/Core/Enums/PushType.cs
index ea383a5899..ec847584b6 100644
--- a/src/Core/Enums/PushType.cs
+++ b/src/Core/Enums/PushType.cs
@@ -4,7 +4,8 @@
     {
         SyncCipherUpdate = 0,
         SyncCipherCreate = 1,
-        SyncCipherDelete = 2,
-        SyncCiphers = 3
+        SyncSiteDelete = 2,
+        SyncFolderDelete = 3,
+        SyncCiphers = 4
     }
 }
diff --git a/src/Core/Services/PushService.cs b/src/Core/Services/PushService.cs
index f143f64f94..375a322e3d 100644
--- a/src/Core/Services/PushService.cs
+++ b/src/Core/Services/PushService.cs
@@ -11,6 +11,7 @@ using PushSharp.Core;
 using System.Security.Cryptography.X509Certificates;
 using Bit.Core.Domains;
 using Bit.Core.Enums;
+using System.Text.RegularExpressions;
 
 namespace Bit.Core.Services
 {
@@ -43,7 +44,17 @@ namespace Bit.Core.Services
 
         public async Task PushSyncCipherDeleteAsync(Cipher cipher)
         {
-            await PushCipherAsync(cipher, PushType.SyncCipherDelete);
+            switch(cipher.Type)
+            {
+                case CipherType.Folder:
+                    await PushCipherAsync(cipher, PushType.SyncFolderDelete);
+                    break;
+                case CipherType.Site:
+                    await PushCipherAsync(cipher, PushType.SyncSiteDelete);
+                    break;
+                default:
+                    break;
+            }
         }
 
         private async Task PushCipherAsync(Cipher cipher, PushType type)
@@ -55,7 +66,7 @@ namespace Bit.Core.Services
                 UserId = cipher.UserId
             };
 
-            await PushToAllUserDevicesAsync(cipher.UserId, new JObject(message));
+            await PushToAllUserDevicesAsync(cipher.UserId, JObject.FromObject(message));
         }
 
         public async Task PushSyncCiphersAsync(Guid userId)
@@ -212,6 +223,10 @@ namespace Bit.Core.Services
 
         private X509Certificate2 GetCertificate(string thumbprint)
         {
+            // Clean possible garbage characters from thumbprint copy/paste
+            // ref http://stackoverflow.com/questions/8448147/problems-with-x509store-certificates-find-findbythumbprint
+            thumbprint = Regex.Replace(thumbprint, @"[^\da-zA-z]", string.Empty).ToUpper();
+
             X509Certificate2 cert = null;
             var certStore = new X509Store(StoreName.My, StoreLocation.CurrentUser);
             certStore.Open(OpenFlags.ReadOnly);