public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 1/6] ui: dc/AuthEditBase: only add tfa field on auth modes that support that
Date: Thu,  1 Jul 2021 14:25:01 +0200	[thread overview]
Message-ID: <20210701122506.503289-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210701122506.503289-1-d.csapak@proxmox.com>

for now that are all, but we will ad one where that is not possible

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Utils.js           |  3 +++
 www/manager6/dc/AuthEditBase.js | 14 +++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 44d72c7b..d728c4be 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -733,17 +733,20 @@ Ext.define('PVE.Utils', {
 	    ipanel: 'pveAuthADPanel',
 	    syncipanel: 'pveAuthLDAPSyncPanel',
 	    add: true,
+	    tfa: true,
 	},
 	ldap: {
 	    name: gettext('LDAP Server'),
 	    ipanel: 'pveAuthLDAPPanel',
 	    syncipanel: 'pveAuthLDAPSyncPanel',
 	    add: true,
+	    tfa: true,
 	},
 	pam: {
 	    name: 'Linux PAM',
 	    ipanel: 'pveAuthBasePanel',
 	    add: false,
+	    tfa: true,
 	},
 	pve: {
 	    name: 'Proxmox VE authentication server',
diff --git a/www/manager6/dc/AuthEditBase.js b/www/manager6/dc/AuthEditBase.js
index f07052a0..e18fbc3b 100644
--- a/www/manager6/dc/AuthEditBase.js
+++ b/www/manager6/dc/AuthEditBase.js
@@ -24,6 +24,8 @@ Ext.define('PVE.panel.AuthBase', {
     initComponent: function() {
 	let me = this;
 
+	let options = PVE.Utils.authSchema[me.type];
+
 	if (!me.column1) { me.column1 = []; }
 	if (!me.column2) { me.column2 = []; }
 	if (!me.columnB) { me.columnB = []; }
@@ -45,11 +47,13 @@ Ext.define('PVE.panel.AuthBase', {
 	    uncheckedValue: 0,
 	});
 
-	// last field of column2is tfa
-	me.column2.push({
-	    xtype: 'pveTFASelector',
-	    deleteEmpty: !me.isCreate,
-	});
+	if (options.tfa) {
+	    // last field of column2is tfa
+	    me.column2.push({
+		xtype: 'pveTFASelector',
+		deleteEmpty: !me.isCreate,
+	    });
+	}
 
 	me.columnB.push({
 	    xtype: 'textfield',
-- 
2.30.2





  parent reply	other threads:[~2021-07-01 12:42 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-01 12:24 [pve-devel] [PATCH access-control/manager] add openid gui handling Dominik Csapak
2021-07-01 12:25 ` [pve-devel] [PATCH access-control 1/1] api: user: add realmtype to user list Dominik Csapak
2021-07-02 11:48   ` [pve-devel] applied: " Thomas Lamprecht
2021-07-01 12:25 ` Dominik Csapak [this message]
2021-07-01 12:25 ` [pve-devel] [PATCH manager 2/6] ui: dc: add AuthEditOpenId panel Dominik Csapak
2021-07-01 12:25 ` [pve-devel] [PATCH manager 3/6] ui: dc/UserView: disable TFA button based on realm type Dominik Csapak
2021-07-01 12:25 ` [pve-devel] [PATCH manager 4/6] ui: dc/UserView: disable Password " Dominik Csapak
2021-07-01 12:25 ` [pve-devel] [PATCH manager 5/6] ui: Utils: refactor userid parsing to Utils Dominik Csapak
2021-07-01 12:25 ` [pve-devel] [PATCH manager 6/6] ui: Workspace: use domains info to hide password/tfa items Dominik Csapak
2021-07-02 13:28   ` [pve-devel] applied: " Thomas Lamprecht
2021-07-02 13:28 ` [pve-devel] applied-series: [PATCH access-control/manager] add openid gui handling 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=20210701122506.503289-3-d.csapak@proxmox.com \
    --to=d.csapak@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal