From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH widget-toolkit 2/2] tfa: show 'Locked' in 'Enabled' column if tfa is locked
Date: Tue, 6 Jun 2023 12:03:18 +0200 [thread overview]
Message-ID: <20230606100318.110005-2-w.bumiller@proxmox.com> (raw)
In-Reply-To: <20230606100318.110005-1-w.bumiller@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
This one's new.
src/panel/TfaView.js | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/panel/TfaView.js b/src/panel/TfaView.js
index e7a09a9..58b8a3a 100644
--- a/src/panel/TfaView.js
+++ b/src/panel/TfaView.js
@@ -67,8 +67,11 @@ Ext.define('Proxmox.panel.TfaView', {
onLoad: function(store, data, success) {
if (!success) return;
+ let now = new Date().getTime() / 1000;
let records = [];
Ext.Array.each(data, user => {
+ let tfa_locked = (user.data['tfa-locked-until'] || 0) > now;
+ let totp_locked = user.data['totp-locked'];
Ext.Array.each(user.data.entries, entry => {
records.push({
fullid: `${user.id}/${entry.id}`,
@@ -77,6 +80,7 @@ Ext.define('Proxmox.panel.TfaView', {
description: entry.description,
created: entry.created,
enable: entry.enable,
+ locked: tfa_locked || (entry.type === 'totp' && totp_locked),
});
});
});
@@ -154,8 +158,10 @@ Ext.define('Proxmox.panel.TfaView', {
renderUser: fullid => fullid.split('/')[0],
- renderEnabled: enabled => {
- if (enabled === undefined) {
+ renderEnabled: function(enabled, metaData, record) {
+ if (record.data.locked) {
+ return gettext("Locked");
+ } else if (enabled === undefined) {
return Proxmox.Utils.yesText;
} else {
return Proxmox.Utils.format_boolean(enabled);
--
2.39.2
next prev parent reply other threads:[~2023-06-06 10:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-06 10:03 [pve-devel] [PATCH v3 widget-toolkit 1/2] tfa: improve UX for recovery keys and when none are left Wolfgang Bumiller
2023-06-06 10:03 ` Wolfgang Bumiller [this message]
2023-06-07 16:07 ` [pve-devel] applied: [PATCH widget-toolkit 2/2] tfa: show 'Locked' in 'Enabled' column if tfa is locked Thomas Lamprecht
2023-06-07 16:07 ` [pve-devel] applied: [PATCH v3 widget-toolkit 1/2] tfa: improve UX for recovery keys and when none are left 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=20230606100318.110005-2-w.bumiller@proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=pve-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