Improve error reporting, handle string response from host app

Author: max-baz

chrome/background.browserify.js

@@ -62,6 +62,13 @@ function onMessage(request, sender, sendResponse) {
             var error = chrome.runtime.lastError.message;
             console.error(error);
             sendResponse({ status: "ERROR", error: error });
+            return;
+          }
+
+          if (typeof response == "string") {
+            console.error(response);
+            sendResponse({ status: "ERROR", error: response });
+            return;
           }
 
           chrome.tabs.query({ lastFocusedWindow: true, active: true }, function(
@@ -93,6 +100,12 @@ function onMessage(request, sender, sendResponse) {
             return;
           }
 
+          if (typeof response == "string") {
+            console.error(response);
+            sendResponse({ status: "ERROR", error: response });
+            return;
+          }
+
           let text = "";
           if (request.what === "password") {
             text = response.p;
@@ -136,6 +149,19 @@ function onMessage(request, sender, sendResponse) {
         app,
         { action: "get", entry: request.entry, settings: getSettings() },
         function(response) {
+          if (chrome.runtime.lastError) {
+            var error = chrome.runtime.lastError.message;
+            console.error(error);
+            sendResponse({ status: "ERROR", error: error });
+            return;
+          }
+
+          if (typeof response == "string") {
+            console.error(response);
+            sendResponse({ status: "ERROR", error: response });
+            return;
+          }
+
           if (!response.hasOwnProperty("url") || response.url.length == 0) {
             // guess url from login path if not available in the host app response
             response.url = parseUrlFromEntry(request.entry);

chrome/script.browserify.js

@@ -230,18 +230,15 @@ function searchPassword(_domain, action = "search", useFillOnSubmit = true) {
       { action: action, domain: _domain, settings: settings },
       function(response) {
         if (chrome.runtime.lastError) {
-          error = chrome.runtime.lastError.message;
-          console.error(error);
+          return resetWithError(chrome.runtime.lastError.message);
         }
 
-        searching = false;
-
         if (typeof response == "string") {
-          error = response;
-          m.redraw();
-          return;
+          return resetWithError(response);
         }
 
+        searching = false;
+
         logins = resultLogins = response ? response : [];
         document.getElementById("filter-search").textContent = domain;
         fillOnSubmit = useFillOnSubmit && logins.length > 0;
@@ -281,7 +278,6 @@ function launchURL() {
     if (response.error) {
       return resetWithError(response.error);
     }
-
     window.close();
   });
 }
@@ -294,15 +290,10 @@ function getLoginData() {
   chrome.runtime.sendMessage(
     { action: "login", entry: this, urlDuringSearch: urlDuringSearch },
     function(response) {
-      searching = false;
-      fillOnSubmit = false;
-
       if (response.error) {
-        error = response.error;
-        m.redraw();
-      } else {
-        window.close();
+        return resetWithError(response.error);
       }
+      window.close();
     }
   );
 }
@@ -312,9 +303,7 @@ function loginToClipboard() {
     { action: "copyToClipboard", entry: this.entry, what: this.what },
     function(response) {
       if (response.error) {
-        error = response.error;
-        m.redraw();
-        return;
+        return resetWithError(response.error);
       }
 
       copyToClipboard(response.text);
@@ -395,6 +384,7 @@ function oncreate() {
 }
 
 function resetWithError(errMsg) {
+  console.error(errMsg);
   domain = "";
   logins = resultLogins = [];
   fillOnSubmit = false;