From 81ad214f2ff39c42f368a58f347f47483a02c2da Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 12 Jul 2017 13:38:06 -0400
Subject: [PATCH] misc fixes

---
 src/_locales/en/messages.json                 |  2 +-
 src/popup/app/settings/settingsController.js  | 18 ++++++++---------
 src/popup/app/tools/toolsController.js        |  2 +-
 .../app/vault/vaultAttachmentsController.js   |  2 +-
 .../app/vault/views/vaultAttachments.html     |  3 +++
 src/services/loginService.js                  | 20 +++++++++++++++++--
 6 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 6ff59e8a59..e7d0924c43 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -751,7 +751,7 @@
     "message": "Select a file.",
     "description": "Select a file."
   },
-  "fileTooLarge": {
+  "maxFileSize": {
     "message": "Maximum file size is 100 MB.",
     "description": "Maximum file size is 100 MB."
   }
diff --git a/src/popup/app/settings/settingsController.js b/src/popup/app/settings/settingsController.js
index cb0be5a9b2..a40cc0a423 100644
--- a/src/popup/app/settings/settingsController.js
+++ b/src/popup/app/settings/settingsController.js
@@ -80,7 +80,9 @@
                 cancelButtonText: i18nService.cancel
             }, function (confirmed) {
                 $analytics.eventTrack('Clicked Change Password');
-                alertCallback(confirmed);
+                if (confirmed) {
+                    chrome.tabs.create({ url: 'https://help.bitwarden.com/article/change-your-master-password/' });
+                }
             });
         };
 
@@ -93,7 +95,9 @@
                 cancelButtonText: i18nService.cancel
             }, function (confirmed) {
                 $analytics.eventTrack('Clicked Change Email');
-                alertCallback(confirmed);
+                if (confirmed) {
+                    chrome.tabs.create({ url: 'https://help.bitwarden.com/article/change-your-email/' });
+                }
             });
         };
 
@@ -106,16 +110,12 @@
                 cancelButtonText: i18nService.cancel
             }, function (confirmed) {
                 $analytics.eventTrack('Clicked Two-step Login');
-                alertCallback(confirmed);
+                if (confirmed) {
+                    chrome.tabs.create({ url: 'https://help.bitwarden.com/article/setup-two-step-login/' });
+                }
             });
         };
 
-        function alertCallback(confirmed) {
-            if (confirmed) {
-                chrome.tabs.create({ url: 'https://vault.bitwarden.com' });
-            }
-        }
-
         $scope.rate = function () {
             $analytics.eventTrack('Rate Extension');
 
diff --git a/src/popup/app/tools/toolsController.js b/src/popup/app/tools/toolsController.js
index 11922a0cb1..03a5e6024b 100644
--- a/src/popup/app/tools/toolsController.js
+++ b/src/popup/app/tools/toolsController.js
@@ -28,7 +28,7 @@
             }, function (confirmed) {
                 if (confirmed) {
                     $analytics.eventTrack('Launch Web Vault For Import');
-                    chrome.tabs.create({ url: 'https://vault.bitwarden.com' });
+                    chrome.tabs.create({ url: 'https://help.bitwarden.com/article/import-data/' });
                 }
             });
         };
diff --git a/src/popup/app/vault/vaultAttachmentsController.js b/src/popup/app/vault/vaultAttachmentsController.js
index ad6ba7c7f0..85a719da93 100644
--- a/src/popup/app/vault/vaultAttachmentsController.js
+++ b/src/popup/app/vault/vaultAttachmentsController.js
@@ -21,7 +21,7 @@ angular
             }
 
             if (files[0].size > 104857600) { // 100 MB
-                toastr.error(i18nService.fileTooLarge, i18nService.errorsOccurred);
+                toastr.error(i18nService.maxFileSize, i18nService.errorsOccurred);
                 return deferred.promise;
             }
 
diff --git a/src/popup/app/vault/views/vaultAttachments.html b/src/popup/app/vault/views/vaultAttachments.html
index 53ff9c29e4..848a88bfba 100644
--- a/src/popup/app/vault/views/vaultAttachments.html
+++ b/src/popup/app/vault/views/vaultAttachments.html
@@ -37,6 +37,9 @@
                         <input type="file" id="file" name="file" />
                     </div>
                 </div>
+                <div class="list-section-footer">
+                    {{i18n.maxFileSize}}
+                </div>
             </div>
         </div>
     </div>
diff --git a/src/services/loginService.js b/src/services/loginService.js
index 043c3f7fe8..d81efaeddd 100644
--- a/src/services/loginService.js
+++ b/src/services/loginService.js
@@ -383,7 +383,7 @@ function initLoginService() {
                         });
                     },
                     function (response) {
-                        handleError(response, deferred);
+                        handleErrorMessage(response, deferred);
                     });
             });
         };
@@ -435,7 +435,7 @@ function initLoginService() {
                 deferred.resolve();
             });
         }, function (response) {
-            handleError(response, deferred);
+            handleErrorMessage(response, deferred);
         });
 
         return deferred.promise;
@@ -444,4 +444,20 @@ function initLoginService() {
     function handleError(error, deferred) {
         deferred.reject(error);
     }
+
+    function handleErrorMessage(error, deferred) {
+        if (error.validationErrors) {
+            for (var key in error.validationErrors) {
+                if (!error.validationErrors.hasOwnProperty(key)) {
+                    continue;
+                }
+                if (error.validationErrors[key].length) {
+                    deferred.reject(error.validationErrors[key][0]);
+                    return;
+                }
+            }
+        }
+        deferred.reject(error.message);
+        return;
+    }
 };