fix enableOTP handling to match docs: prioritize store, then extension config

This commit is contained in:
2022-11-05 23:32:26 -07:00
parent e342264adf
commit a5f5e27b5f
2 changed files with 4 additions and 4 deletions

View File

@@ -724,7 +724,7 @@ async function handleMessage(settings, message, sendResponse) {
}
break;
case "copyOTP":
if (settings.enableOTP) {
if (helpers.getSetting("enableOTP", message.login, settings)) {
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) &&
message.login.fields.hasOwnProperty("otp")
) {
copyToClipboard(helpers.makeTOTP(message.login.fields.otp.params));
@@ -963,7 +963,7 @@ async function parseFields(settings, login) {
}
// preprocess otp
if (settings.enableOTP && login.fields.hasOwnProperty("otp")) {
if (helpers.getSetting("enableOTP", login, settings) && login.fields.hasOwnProperty("otp")) {
if (login.fields.otp.match(/^otpauth:\/\/.+/i)) {
// attempt to parse otp data as URI
try {

View File

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