Skip to content

Honor store-specific enableOTP setting #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Honor store-specific enableOTP setting #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9416f2
Honor store-specific enableOTP setting
shinenelson Apr 9, 2021
01fb410
use getSetting() to fetch enableOTP in background.js
shinenelson Apr 10, 2021
edc88b7
use login-scoped settings in popup/detailsInterface.js
shinenelson Apr 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ async function handleMessage(settings, message, sendResponse) {
}
break;
case "copyOTP":
if (settings.enableOTP) {
if (getSetting("enableOTP", message.login, settings)) {
try {
if (!message.login.fields.otp) {
throw new Exception("No OTP seed available");
Expand Down Expand Up @@ -815,7 +815,7 @@ async function handleMessage(settings, message, sendResponse) {

// copy OTP token after fill
if (
settings.enableOTP &&
getSetting("enableOTP", message.login, settings) &&
typeof message.login !== "undefined" &&
message.login.fields.hasOwnProperty("otp")
) {
Expand Down Expand Up @@ -982,7 +982,7 @@ async function parseFields(settings, login) {
}

// preprocess otp
if (settings.enableOTP && login.fields.hasOwnProperty("otp")) {
if (getSetting("enableOTP", login, settings) && login.fields.hasOwnProperty("otp")) {
if (login.fields.otp.match(/^otpauth:\/\/.+/i)) {
// attempt to parse otp data as URI
try {
Expand Down
2 changes: 1 addition & 1 deletion src/popup/detailsInterface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function view(ctl, params) {
]),
(() => {
if (
this.settings.enableOTP &&
(this.settings.enableOTP || login.store.settings.enableOTP) &&
login.fields.otp &&
login.fields.otp.params.type === "totp"
) {
Expand Down