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

fx-compat: Update nsILoginManager::findLogins() calls

Browse source
This commit is contained in:
Dan Stillman 2022-05-01 06:41:31 -04:00
parent d838bc952a
commit f4675c02df
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,7 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
var loginManager = Components.classes["@mozilla.org/login-manager;1"]
.getService(Components.interfaces.nsILoginManager);
var logins = loginManager.findLogins({}, this._loginManagerHost, null, this._loginManagerRealm);
var logins = loginManager.findLogins(this._loginManagerHost, null, this._loginManagerRealm);
// Find user from returned array of nsILoginInfo objects
for (var i = 0; i < logins.length; i++) {
if (logins[i].username == username) {
@ -93,7 +93,7 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
}
// Pre-4.0.28.5 format, broken for findLogins and removeLogin in Fx41
logins = loginManager.findLogins({}, "chrome://zotero", "", null);
logins = loginManager.findLogins("chrome://zotero", "", null);
for (var i = 0; i < logins.length; i++) {
if (logins[i].username == username
&& logins[i].formSubmitURL == "Zotero Storage Server") {
@ -120,7 +120,7 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
var loginManager = Components.classes["@mozilla.org/login-manager;1"]
.getService(Components.interfaces.nsILoginManager);
var logins = loginManager.findLogins({}, this._loginManagerHost, null, this._loginManagerRealm);
var logins = loginManager.findLogins(this._loginManagerHost, null, this._loginManagerRealm);
for (var i = 0; i < logins.length; i++) {
Zotero.debug('Clearing WebDAV passwords');
if (logins[i].httpRealm == this._loginManagerRealm) {
@ -130,7 +130,7 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
}
// Pre-4.0.28.5 format, broken for findLogins and removeLogin in Fx41
logins = loginManager.findLogins({}, this._loginManagerHost, "", null);
logins = loginManager.findLogins(this._loginManagerHost, "", null);
for (var i = 0; i < logins.length; i++) {
Zotero.debug('Clearing old WebDAV passwords');
if (logins[i].formSubmitURL == "Zotero Storage Server") {

7
chrome/content/zotero/xpcom/sync/syncLocal.js
View file

@ -400,7 +400,6 @@ Zotero.Sync.Data.Local = {
_getAPIKeyLoginInfo: function () {
try {
var logins = Services.logins.findLogins(
{},
this._loginManagerHost,
null,
this._loginManagerRealm
@ -449,7 +448,7 @@ Zotero.Sync.Data.Local = {
var loginManager = Components.classes["@mozilla.org/login-manager;1"]
.getService(Components.interfaces.nsILoginManager);
try {
var logins = loginManager.findLogins({}, loginManagerHost, null, loginManagerRealm);
var logins = loginManager.findLogins(loginManagerHost, null, loginManagerRealm);
}
catch (e) {
Zotero.logError(e);
@ -464,7 +463,7 @@ Zotero.Sync.Data.Local = {
}
// Pre-4.0.28.5 format, broken for findLogins and removeLogin in Fx41,
var logins = loginManager.findLogins({}, loginManagerHost, "", null);
var logins = loginManager.findLogins(loginManagerHost, "", null);
for (let i = 0; i < logins.length; i++) {
if (logins[i].username == username
&& logins[i].formSubmitURL == "Zotero Sync Server") {
@ -484,7 +483,7 @@ Zotero.Sync.Data.Local = {
var loginManager = Components.classes["@mozilla.org/login-manager;1"]
.getService(Components.interfaces.nsILoginManager);
try {
var logins = loginManager.findLogins({}, loginManagerHost, null, loginManagerRealm);
var logins = loginManager.findLogins(loginManagerHost, null, loginManagerRealm);
}
catch (e) {
Zotero.logError(e);