Compare commits
3 Commits
wip/nixos
...
temp/debug
Author | SHA1 | Date | |
---|---|---|---|
5573c45158 | |||
73a405c008 | |||
4c7d3533a3 |
@@ -450,7 +450,7 @@ async function fillFields(settings, login, fields) {
|
||||
// build focus or submit request
|
||||
let focusOrSubmitRequest = {
|
||||
origin: new BrowserpassURL(settings.tab.url).origin,
|
||||
autoSubmit: getSetting("autoSubmit", login, settings),
|
||||
autoSubmit: helpers.getSetting("autoSubmit", login, settings),
|
||||
filledFields: filledFields,
|
||||
};
|
||||
|
||||
@@ -561,25 +561,6 @@ async function getFullSettings() {
|
||||
return settings;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get most relevant setting value
|
||||
*
|
||||
* @param string key Setting key
|
||||
* @param object login Login object
|
||||
* @param object settings Settings object
|
||||
* @return object Setting value
|
||||
*/
|
||||
function getSetting(key, login, settings) {
|
||||
if (typeof login.settings[key] !== "undefined") {
|
||||
return login.settings[key];
|
||||
}
|
||||
if (typeof settings.stores[login.store.id].settings[key] !== "undefined") {
|
||||
return settings.stores[login.store.id].settings[key];
|
||||
}
|
||||
|
||||
return settings[key];
|
||||
}
|
||||
|
||||
/**
|
||||
* Deep copy an object
|
||||
*
|
||||
@@ -968,7 +949,7 @@ async function parseFields(settings, login) {
|
||||
if (key === "secret" && lines.length) {
|
||||
login.fields.secret = lines[0];
|
||||
} else if (key === "login") {
|
||||
const defaultUsername = getSetting("username", login, settings);
|
||||
const defaultUsername = helpers.getSetting("username", login, settings);
|
||||
login.fields[key] = defaultUsername || login.login.match(/([^\/]+)$/)[1];
|
||||
} else {
|
||||
delete login.fields[key];
|
||||
|
@@ -11,12 +11,44 @@ const BrowserpassURL = require("@browserpass/url");
|
||||
module.exports = {
|
||||
prepareLogins,
|
||||
filterSortLogins,
|
||||
getSetting,
|
||||
ignoreFiles,
|
||||
makeTOTP,
|
||||
expTest,
|
||||
};
|
||||
|
||||
function expTest(foo) {
|
||||
return foo * 2;
|
||||
}
|
||||
|
||||
const SettingScope = {
|
||||
// query a setting first from the login, then the store, then globally
|
||||
Login: "login",
|
||||
// query a setting first from the store, then globally
|
||||
Store: "store",
|
||||
};
|
||||
|
||||
//----------------------------------- Function definitions ----------------------------------//
|
||||
|
||||
/**
|
||||
* Get most relevant setting value
|
||||
*
|
||||
* @param string key Setting key
|
||||
* @param object login Login object
|
||||
* @param object settings Settings object
|
||||
* @return object Setting value
|
||||
*/
|
||||
function getSetting(key, login, settings) {
|
||||
if (typeof login.settings[key] !== "undefined") {
|
||||
return login.settings[key];
|
||||
}
|
||||
if (typeof settings.stores[login.store.id].settings[key] !== "undefined") {
|
||||
return settings.stores[login.store.id].settings[key];
|
||||
}
|
||||
|
||||
return settings[key];
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the deepest available domain component of a path
|
||||
*
|
||||
|
Reference in New Issue
Block a user