From a5f5e27b5f3abe2252f68c59959c3c30ac1a603b Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Sat, 5 Nov 2022 23:32:26 -0700
Subject: [PATCH] fix `enableOTP` handling to match docs: prioritize store,
 then extension config

---
 src/background.js             | 6 +++---
 src/popup/detailsInterface.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/background.js b/src/background.js
index fda8712..26c8e79 100644
--- a/src/background.js
+++ b/src/background.js
@@ -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 {
diff --git a/src/popup/detailsInterface.js b/src/popup/detailsInterface.js
index 7c0a450..f3f0c9d 100644
--- a/src/popup/detailsInterface.js
+++ b/src/popup/detailsInterface.js
@@ -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"
                 ) {