mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix login manager (and syncing) breakage in Firefox 41

Browse source
This commit is contained in:
Dan Stillman 2015-09-23 05:02:40 -04:00
parent a547db134e
commit b55e6536ec
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
chrome/content/zotero/xpcom/storage/webdav.js
View file

@ -31,7 +31,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
var _cachedCredentials = false; var _cachedCredentials = false;
var _loginManagerHost = 'chrome://zotero'; var _loginManagerHost = 'chrome://zotero';
var _loginManagerURL = 'Zotero Storage Server'; var _loginManagerURL = '/';
var _lastSyncIDLength = 30; var _lastSyncIDLength = 30;
@ -699,7 +699,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
Zotero.debug('Getting WebDAV password'); Zotero.debug('Getting WebDAV password');
var loginManager = Components.classes["@mozilla.org/login-manager;1"] var loginManager = Components.classes["@mozilla.org/login-manager;1"]
.getService(Components.interfaces.nsILoginManager); .getService(Components.interfaces.nsILoginManager);
var logins = loginManager.findLogins({}, _loginManagerHost, _loginManagerURL, null); var logins = loginManager.findLogins({}, _loginManagerHost, "", null);
// Find user from returned array of nsILoginInfo objects // Find user from returned array of nsILoginInfo objects
for (var i = 0; i < logins.length; i++) { for (var i = 0; i < logins.length; i++) {
@ -722,7 +722,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
var loginManager = Components.classes["@mozilla.org/login-manager;1"] var loginManager = Components.classes["@mozilla.org/login-manager;1"]
.getService(Components.interfaces.nsILoginManager); .getService(Components.interfaces.nsILoginManager);
var logins = loginManager.findLogins({}, _loginManagerHost, _loginManagerURL, null); var logins = loginManager.findLogins({}, _loginManagerHost, "", null);
for (var i = 0; i < logins.length; i++) { for (var i = 0; i < logins.length; i++) {
Zotero.debug('Clearing WebDAV passwords'); Zotero.debug('Clearing WebDAV passwords');
@ -731,7 +731,6 @@ Zotero.Sync.Storage.WebDAV = (function () {
} }
if (password) { if (password) {
Zotero.debug(_loginManagerURL);
var nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1", var nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
Components.interfaces.nsILoginInfo, "init"); Components.interfaces.nsILoginInfo, "init");
var loginInfo = new nsLoginInfo(_loginManagerHost, _loginManagerURL, var loginInfo = new nsLoginInfo(_loginManagerHost, _loginManagerURL,

6
chrome/content/zotero/xpcom/sync.js
View file

@ -1235,7 +1235,7 @@ Zotero.Sync.Server = new function () {
var loginManager = Components.classes["@mozilla.org/login-manager;1"] var loginManager = Components.classes["@mozilla.org/login-manager;1"]
.getService(Components.interfaces.nsILoginManager); .getService(Components.interfaces.nsILoginManager);
try { try {
var logins = loginManager.findLogins({}, _loginManagerHost, _loginManagerURL, null); var logins = loginManager.findLogins({}, _loginManagerHost, "", null);
} }
catch (e) { catch (e) {
Zotero.debug(e); Zotero.debug(e);
@ -1273,7 +1273,7 @@ Zotero.Sync.Server = new function () {
var loginManager = Components.classes["@mozilla.org/login-manager;1"] var loginManager = Components.classes["@mozilla.org/login-manager;1"]
.getService(Components.interfaces.nsILoginManager); .getService(Components.interfaces.nsILoginManager);
var logins = loginManager.findLogins({}, _loginManagerHost, _loginManagerURL, null); var logins = loginManager.findLogins({}, _loginManagerHost, "", null);
for (var i = 0; i < logins.length; i++) { for (var i = 0; i < logins.length; i++) {
Zotero.debug('Clearing Zotero sync credentials'); Zotero.debug('Clearing Zotero sync credentials');
loginManager.removeLogin(logins[i]); loginManager.removeLogin(logins[i]);
@ -1332,7 +1332,7 @@ Zotero.Sync.Server = new function () {
this.apiVersion = 9; this.apiVersion = 9;
var _loginManagerHost = 'chrome://zotero'; var _loginManagerHost = 'chrome://zotero';
var _loginManagerURL = 'Zotero Sync Server'; var _loginManagerURL = '/';
var _serverURL = ZOTERO_CONFIG.SYNC_URL; var _serverURL = ZOTERO_CONFIG.SYNC_URL;