colin/browserpass-extension
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
colin
2022-11-06 01:53:32 -07:00
parent 92060876c9
commit 1f2b7b1e45
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/background.js
View File

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

2
src/popup/detailsInterface.js
View File

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