From 2ce1b12f6e437a8694cdd237846bbbcb24a13228 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 12 Oct 2016 22:26:28 -0400
Subject: [PATCH] Handle empty password and uri fields when
 encrypting/decrypting

---
 src/Web/wwwroot/app/services/cipherService.js | 8 ++++----
 src/Web/wwwroot/app/services/importService.js | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Web/wwwroot/app/services/cipherService.js b/src/Web/wwwroot/app/services/cipherService.js
index 78aa75db63..73268e48f1 100644
--- a/src/Web/wwwroot/app/services/cipherService.js
+++ b/src/Web/wwwroot/app/services/cipherService.js
@@ -24,9 +24,9 @@ angular
                 folderId: encryptedSite.FolderId,
                 favorite: encryptedSite.Favorite,
                 name: cryptoService.decrypt(encryptedSite.Name),
-                uri: cryptoService.decrypt(encryptedSite.Uri),
+                uri: encryptedSite.Uri && encryptedSite.Uri !== '' ? cryptoService.decrypt(encryptedSite.Uri) : null,
                 username: encryptedSite.Username && encryptedSite.Username !== '' ? cryptoService.decrypt(encryptedSite.Username) : null,
-                password: cryptoService.decrypt(encryptedSite.Password),
+                password: encryptedSite.Password && encryptedSite.Password !== '' ? cryptoService.decrypt(encryptedSite.Password) : null,
                 notes: encryptedSite.Notes && encryptedSite.Notes !== '' ? cryptoService.decrypt(encryptedSite.Notes) : null
             };
 
@@ -79,10 +79,10 @@ angular
                 'type': 1,
                 folderId: unencryptedSite.folderId === '' ? null : unencryptedSite.folderId,
                 favorite: unencryptedSite.favorite !== null ? unencryptedSite.favorite : false,
-                uri: cryptoService.encrypt(unencryptedSite.uri, key),
+                uri: !unencryptedSite.uri || unencryptedSite.uri === '' ? null : cryptoService.encrypt(unencryptedSite.uri, key),
                 name: cryptoService.encrypt(unencryptedSite.name, key),
                 username: !unencryptedSite.username || unencryptedSite.username === '' ? null : cryptoService.encrypt(unencryptedSite.username, key),
-                password: cryptoService.encrypt(unencryptedSite.password, key),
+                password: !unencryptedSite.password || unencryptedSite.password === '' ? null : cryptoService.encrypt(unencryptedSite.password, key),
                 notes: !unencryptedSite.notes || unencryptedSite.notes === '' ? null : cryptoService.encrypt(unencryptedSite.notes, key)
             };
         };
diff --git a/src/Web/wwwroot/app/services/importService.js b/src/Web/wwwroot/app/services/importService.js
index 94325bd453..a2e3ea9a13 100644
--- a/src/Web/wwwroot/app/services/importService.js
+++ b/src/Web/wwwroot/app/services/importService.js
@@ -181,6 +181,9 @@
                         success(folders, sites, siteRelationships);
                     }
                 }
+                else {
+                    error();
+                }
             };
 
             reader.onerror = function (evt) {