From 385e36a746f5db5b71a04d7347f5f3e25003f69a Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 23 Apr 2016 03:32:32 -0400
Subject: [PATCH] Show invalid-login prompt if no API key

This can be improved further in #953.
---
 chrome/content/zotero/xpcom/error.js          |  2 +-
 .../content/zotero/xpcom/sync/syncRunner.js   | 35 ++++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/chrome/content/zotero/xpcom/error.js b/chrome/content/zotero/xpcom/error.js
index 7b8bdd056..6aa0107cb 100644
--- a/chrome/content/zotero/xpcom/error.js
+++ b/chrome/content/zotero/xpcom/error.js
@@ -40,7 +40,7 @@ Zotero.Error.prototype.name = "Zotero Error";
 Zotero.Error.ERROR_UNKNOWN = 0;
 Zotero.Error.ERROR_MISSING_OBJECT = 1;
 Zotero.Error.ERROR_FULL_SYNC_REQUIRED = 2;
-Zotero.Error.ERROR_SYNC_USERNAME_NOT_SET = 3;
+Zotero.Error.ERROR_API_KEY_NOT_SET = 3;
 Zotero.Error.ERROR_INVALID_SYNC_LOGIN = 4;
 Zotero.Error.ERROR_ZFS_OVER_QUOTA = 5;
 Zotero.Error.ERROR_ZFS_UPLOAD_QUEUE_LIMIT = 6;
diff --git a/chrome/content/zotero/xpcom/sync/syncRunner.js b/chrome/content/zotero/xpcom/sync/syncRunner.js
index de945bfaa..3b39eeec2 100644
--- a/chrome/content/zotero/xpcom/sync/syncRunner.js
+++ b/chrome/content/zotero/xpcom/sync/syncRunner.js
@@ -118,23 +118,19 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 		// Purge deleted objects so they don't cause sync errors (e.g., long tags)
 		yield Zotero.purgeDataObjects(true);
 		
-		var apiKey = yield _getAPIKey();
-		if (!apiKey) {
-			let msg = "API key not set";
-			let e = new Zotero.Error(msg, 0, { dialogButtonText: null })
-			this.updateIcons(e);
-			_syncInProgress = false;
-			return false;
-		}
-		if (_firstInSession) {
-			options.firstInSession = true;
-			_firstInSession = false;
-		}
-		
-		_syncInProgress = true;
-		this.updateIcons('animate');
-		
 		try {
+			let apiKey = yield _getAPIKey();
+			if (!apiKey) {
+				throw new Zotero.Error("API key not set", Zotero.Error.ERROR_API_KEY_NOT_SET)
+			}
+			
+			if (_firstInSession) {
+				options.firstInSession = true;
+				_firstInSession = false;
+			}
+			
+			this.updateIcons('animate');
+		
 			let client = this.getAPIClient({ apiKey });
 			let keyInfo = yield this.checkAccess(client, options);
 			
@@ -846,7 +842,7 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 	this.checkError = Zotero.Promise.coroutine(function* (e, options = {}) {
 		if (e.name && e.name == 'Zotero Error') {
 			switch (e.error) {
-				case Zotero.Error.ERROR_SYNC_USERNAME_NOT_SET:
+				case Zotero.Error.ERROR_API_KEY_NOT_SET:
 				case Zotero.Error.ERROR_INVALID_SYNC_LOGIN:
 					// TODO: the setTimeout() call below should just simulate a click on the sync error icon
 					// instead of creating its own dialog, but updateIcons() doesn't yet provide full control
@@ -855,7 +851,6 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 					// TODO: localize (=>done) and combine with below (=>?)
 					var msg = Zotero.getString('sync.error.invalidLogin.text');
 					e.message = msg;
-					e.data = {};
 					e.dialogText = msg;
 					e.dialogButtonText = Zotero.getString('sync.openSyncPreferences');
 					e.dialogButtonCallback = function () {
@@ -866,7 +861,7 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 					};
 					
 					// Manual click
-					if (!background) {
+					if (!options.background) {
 						setTimeout(function () {
 							var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
 										.getService(Components.interfaces.nsIWindowMediator);
@@ -876,7 +871,7 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 										.getService(Components.interfaces.nsIPromptService);
 							var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
 												+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_CANCEL);
-							if (e.error == Zotero.Error.ERROR_SYNC_USERNAME_NOT_SET) {
+							if (e.error == Zotero.Error.ERROR_API_KEY_NOT_SET) {
 								var title = Zotero.getString('sync.error.usernameNotSet');
 								var msg = Zotero.getString('sync.error.usernameNotSet.text');
 							}