suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show invalid-login prompt if no API key

Browse Source 
This can be improved further in #953.
This commit is contained in:
Dan Stillman 2016-04-23 03:32:32 -04:00
parent 352eff2f04
commit 385e36a746
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrome/content/zotero/xpcom/error.js
View File

@ -40,7 +40,7 @@ Zotero.Error.prototype.name = "Zotero Error";
Zotero.Error.ERROR_UNKNOWN = 0; Zotero.Error.ERROR_UNKNOWN = 0;
Zotero.Error.ERROR_MISSING_OBJECT = 1; Zotero.Error.ERROR_MISSING_OBJECT = 1;
Zotero.Error.ERROR_FULL_SYNC_REQUIRED = 2; 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_INVALID_SYNC_LOGIN = 4;
Zotero.Error.ERROR_ZFS_OVER_QUOTA = 5; Zotero.Error.ERROR_ZFS_OVER_QUOTA = 5;
Zotero.Error.ERROR_ZFS_UPLOAD_QUEUE_LIMIT = 6; Zotero.Error.ERROR_ZFS_UPLOAD_QUEUE_LIMIT = 6;

19
chrome/content/zotero/xpcom/sync/syncRunner.js
View File

@ -118,23 +118,19 @@ Zotero.Sync.Runner_Module = function (options = {}) {
// Purge deleted objects so they don't cause sync errors (e.g., long tags) // Purge deleted objects so they don't cause sync errors (e.g., long tags)
yield Zotero.purgeDataObjects(true); yield Zotero.purgeDataObjects(true);
var apiKey = yield _getAPIKey(); try {
let apiKey = yield _getAPIKey();
if (!apiKey) { if (!apiKey) {
let msg = "API key not set"; throw new Zotero.Error("API key not set", Zotero.Error.ERROR_API_KEY_NOT_SET)
let e = new Zotero.Error(msg, 0, { dialogButtonText: null })
this.updateIcons(e);
_syncInProgress = false;
return false;
} }
if (_firstInSession) { if (_firstInSession) {
options.firstInSession = true; options.firstInSession = true;
_firstInSession = false; _firstInSession = false;
} }
_syncInProgress = true;
this.updateIcons('animate'); this.updateIcons('animate');
try {
let client = this.getAPIClient({ apiKey }); let client = this.getAPIClient({ apiKey });
let keyInfo = yield this.checkAccess(client, options); 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 = {}) { this.checkError = Zotero.Promise.coroutine(function* (e, options = {}) {
if (e.name && e.name == 'Zotero Error') { if (e.name && e.name == 'Zotero Error') {
switch (e.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: case Zotero.Error.ERROR_INVALID_SYNC_LOGIN:
// TODO: the setTimeout() call below should just simulate a click on the sync error icon // 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 // 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 (=>?) // TODO: localize (=>done) and combine with below (=>?)
var msg = Zotero.getString('sync.error.invalidLogin.text'); var msg = Zotero.getString('sync.error.invalidLogin.text');
e.message = msg; e.message = msg;
e.data = {};
e.dialogText = msg; e.dialogText = msg;
e.dialogButtonText = Zotero.getString('sync.openSyncPreferences'); e.dialogButtonText = Zotero.getString('sync.openSyncPreferences');
e.dialogButtonCallback = function () { e.dialogButtonCallback = function () {
@ -866,7 +861,7 @@ Zotero.Sync.Runner_Module = function (options = {}) {
}; };
// Manual click // Manual click
if (!background) { if (!options.background) {
setTimeout(function () { setTimeout(function () {
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(Components.interfaces.nsIWindowMediator); .getService(Components.interfaces.nsIWindowMediator);
@ -876,7 +871,7 @@ Zotero.Sync.Runner_Module = function (options = {}) {
.getService(Components.interfaces.nsIPromptService); .getService(Components.interfaces.nsIPromptService);
var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING) var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_CANCEL); + (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 title = Zotero.getString('sync.error.usernameNotSet');
var msg = Zotero.getString('sync.error.usernameNotSet.text'); var msg = Zotero.getString('sync.error.usernameNotSet.text');
} }