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-05 21:30:49 -07:00
parent 55889b8f61
commit 70113ee29e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/background.js
View File

@ -565,12 +565,12 @@ async function getFullSettings() {
* Get most relevant setting value * Get most relevant setting value
* *
* @param string key Setting key * @param string key Setting key
* @param object login Login object * @param object login Login object (or null)
* @param object settings Settings object * @param object settings Settings object
* @return object Setting value * @return object Setting value
*/ */
function getSetting(key, login, settings) { function getSetting(key, login, settings) {
if (typeof login.settings[key] !== "undefined") { if (login !== null && typeof login.settings[key] !== "undefined") {
return login.settings[key]; return login.settings[key];
} }
if (typeof settings.stores[login.store.id].settings[key] !== "undefined") { if (typeof settings.stores[login.store.id].settings[key] !== "undefined") {
@ -743,7 +743,7 @@ async function handleMessage(settings, message, sendResponse) {
} }
break; break;
case "copyOTP": case "copyOTP":
if (settings.enableOTP) { if (getSetting("enableOTP", null, settings)) {
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");
@ -815,7 +815,7 @@ async function handleMessage(settings, message, sendResponse) {
// copy OTP token after fill // copy OTP token after fill
if ( if (
settings.enableOTP && getSetting("enableOTP", null, settings) &&
typeof message.login !== "undefined" && typeof message.login !== "undefined" &&
message.login.fields.hasOwnProperty("otp") message.login.fields.hasOwnProperty("otp")
) { ) {
@ -982,7 +982,7 @@ async function parseFields(settings, login) {
} }
// preprocess otp // preprocess otp
if (settings.enableOTP && login.fields.hasOwnProperty("otp")) { if (getSetting("enableOTP", null, settings) && 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 {