1 Commits

Author SHA1 Message Date
5573c45158 debug: try exporting a function
i don't understand why i can't export my enum.
2022-11-06 01:13:55 -07:00
3 changed files with 18 additions and 18 deletions

View File

@@ -724,7 +724,7 @@ async function handleMessage(settings, message, sendResponse) {
}
break;
case "copyOTP":
if (helpers.getSetting("enableOTP", message.login, settings, helpers.SettingScope.Store)) {
if (settings.enableOTP) {
try {
if (!message.login.fields.otp) {
throw new Exception("No OTP seed available");
@@ -796,8 +796,8 @@ async function handleMessage(settings, message, sendResponse) {
// copy OTP token after fill
if (
settings.enableOTP &&
typeof message.login !== "undefined" &&
helpers.getSetting("enableOTP", message.login, settings, helpers.SettingScope.Store) &&
message.login.fields.hasOwnProperty("otp")
) {
copyToClipboard(helpers.makeTOTP(message.login.fields.otp.params));
@@ -963,10 +963,7 @@ async function parseFields(settings, login) {
}
// preprocess otp
if (
helpers.getSetting("enableOTP", login, settings, helpers.SettingScope.Store) &&
login.fields.hasOwnProperty("otp")
) {
if (settings.enableOTP && login.fields.hasOwnProperty("otp")) {
if (login.fields.otp.match(/^otpauth:\/\/.+/i)) {
// attempt to parse otp data as URI
try {

View File

@@ -8,20 +8,24 @@ const hash = require("hash.js");
const Authenticator = require("otplib").authenticator.Authenticator;
const BrowserpassURL = require("@browserpass/url");
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",
};
module.exports = {
prepareLogins,
filterSortLogins,
getSetting,
ignoreFiles,
makeTOTP,
SettingScope,
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 ----------------------------------//
@@ -32,11 +36,10 @@ module.exports = {
* @param string key Setting key
* @param object login Login object
* @param object settings Settings object
* @param string scope SettingScope value to specify where to search for the setting (optional)
* @return object Setting value
*/
function getSetting(key, login, settings, scope = SettingScope.Login) {
if (scope === SettingScope.Login && typeof login.settings[key] !== "undefined") {
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") {

View File

@@ -103,7 +103,7 @@ function view(ctl, params) {
]),
(() => {
if (
helpers.getSetting("enableOTP", login, this.settings, helpers.SettingScope.Store) &&
this.settings.enableOTP &&
login.fields.otp &&
login.fields.otp.params.type === "totp"
) {