From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH backup 2/2] gui: enumerate recovery keys and list in 2nd factor window
Date: Mon, 18 Jan 2021 12:46:47 +0100 [thread overview]
Message-ID: <20210118114647.632-2-w.bumiller@proxmox.com> (raw)
In-Reply-To: <20210118114647.632-1-w.bumiller@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
www/LoginView.js | 20 +++++++++++++++++---
www/window/AddTfaRecovery.js | 7 ++++++-
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/www/LoginView.js b/www/LoginView.js
index fa8772b5..2dd84de9 100644
--- a/www/LoginView.js
+++ b/www/LoginView.js
@@ -281,9 +281,9 @@ Ext.define('PBS.login.TfaWindow', {
me.lookup('totpButton').setVisible(false);
}
- if (!view.challenge.recovery) {
+ if (!view.challenge.recovery || !view.challenge.recovery.length) {
me.lookup('recoveryButton').setVisible(false);
- } else if (view.challenge.recovery === "low") {
+ } else if (view.challenge.recovery.length <= 3) {
me.lookup('recoveryButton')
.setIconCls('fa fa-fw fa-exclamation-triangle');
}
@@ -384,7 +384,12 @@ Ext.define('PBS.login.TfaWindow', {
me.lookup('webauthnButton').setVisible(false);
me.lookup('recoveryButton').setText(gettext("Confirm"));
me.lookup('recoveryInfo').setVisible(true);
- if (view.challenge.recovery === "low") {
+ console.log("RECOVERY:", view.challenge.recovery);
+ me.lookup('availableRecovery').update(Ext.String.htmlEncode(
+ gettext('Available recovery keys: ') + view.challenge.recovery.join(', ')
+ ));
+ me.lookup('availableRecovery').setVisible(true);
+ if (view.challenge.recovery.length <= 3) {
me.lookup('recoveryLow').setVisible(true);
}
}
@@ -456,6 +461,15 @@ Ext.define('PBS.login.TfaWindow', {
textAlign: "center",
},
},
+ {
+ xtype: 'box',
+ padding: '0 5',
+ reference: 'availableRecovery',
+ hidden: true,
+ style: {
+ textAlign: "center",
+ },
+ },
{
xtype: 'box',
padding: '0 5',
diff --git a/www/window/AddTfaRecovery.js b/www/window/AddTfaRecovery.js
index b63e8576..1718f026 100644
--- a/www/window/AddTfaRecovery.js
+++ b/www/window/AddTfaRecovery.js
@@ -24,7 +24,12 @@ Ext.define('PBS.window.AddTfaRecovery', {
return;
}
- let values = response.result.data.recovery.join("\n");
+ let values = response
+ .result
+ .data
+ .recovery
+ .map((v, i) => `${i}: ${v}`)
+ .join("\n");
Ext.create('PBS.window.TfaRecoveryShow', {
autoShow: true,
userid: this.getViewModel().get('userid'),
--
2.20.1
next prev parent reply other threads:[~2021-01-18 11:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 11:46 [pbs-devel] [PATCH backup 1/2] tfa: remember recovery indices Wolfgang Bumiller
2021-01-18 11:46 ` Wolfgang Bumiller [this message]
2021-01-18 12:52 ` [pbs-devel] applied: [PATCH backup 2/2] gui: enumerate recovery keys and list in 2nd factor window Thomas Lamprecht
2021-01-18 12:52 ` [pbs-devel] applied: [PATCH backup 1/2] tfa: remember recovery indices Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210118114647.632-2-w.bumiller@proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox