Skip to content

Commit a5f5e27

Browse files
committed
fix enableOTP handling to match docs: prioritize store, then extension config
1 parent e342264 commit a5f5e27

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/background.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ async function handleMessage(settings, message, sendResponse) {
724724
}
725725
break;
726726
case "copyOTP":
727-
if (settings.enableOTP) {
727+
if (helpers.getSetting("enableOTP", message.login, settings)) {
728728
try {
729729
if (!message.login.fields.otp) {
730730
throw new Exception("No OTP seed available");
@@ -796,8 +796,8 @@ async function handleMessage(settings, message, sendResponse) {
796796

797797
// copy OTP token after fill
798798
if (
799-
settings.enableOTP &&
800799
typeof message.login !== "undefined" &&
800+
helpers.getSetting("enableOTP", message.login, settings) &&
801801
message.login.fields.hasOwnProperty("otp")
802802
) {
803803
copyToClipboard(helpers.makeTOTP(message.login.fields.otp.params));
@@ -963,7 +963,7 @@ async function parseFields(settings, login) {
963963
}
964964

965965
// preprocess otp
966-
if (settings.enableOTP && login.fields.hasOwnProperty("otp")) {
966+
if (helpers.getSetting("enableOTP", login, settings) && login.fields.hasOwnProperty("otp")) {
967967
if (login.fields.otp.match(/^otpauth:\/\/.+/i)) {
968968
// attempt to parse otp data as URI
969969
try {

src/popup/detailsInterface.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function view(ctl, params) {
103103
]),
104104
(() => {
105105
if (
106-
this.settings.enableOTP &&
106+
helpers.getSetting("enableOTP", login, this.settings) &&
107107
login.fields.otp &&
108108
login.fields.otp.params.type === "totp"
109109
) {

0 commit comments

Comments
 (0)