[pve-devel] [PATCH SERIES manager] fix #6311: ui: prevent consent text from showing twice for oidc

[pve-devel] [PATCH SERIES manager] fix #6311: ui: prevent consent text from showing twice for oidc

[Thomas Skinner]

Fixes an issue where the consent banner is shown twice when using OIDC for login

manager:

Thomas Skinner (1):
  fix #6311: ui: prevent consent text from showing twice for oidc

 www/manager6/window/LoginWindow.js | 15 +++++++++------
-- 
2.39.5


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH manager 1/1] fix #6311: ui: prevent consent text from showing twice for oidc

[Thomas Skinner]

Signed-off-by: Thomas Skinner <thomas@atskinner.net>
---
 www/manager6/window/LoginWindow.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/www/manager6/window/LoginWindow.js b/www/manager6/window/LoginWindow.js
index b4dff0c1..a1ba3cdb 100644
--- a/www/manager6/window/LoginWindow.js
+++ b/www/manager6/window/LoginWindow.js
@@ -22,12 +22,15 @@ Ext.define('PVE.window.LoginWindow', {
 
 	init: async function() {
 	    if (Proxmox.ConsentText) {
-		Ext.create("Proxmox.window.ConsentModal", {
-		    autoShow: true,
-		    consent: Proxmox.Markdown.parse(
-			Proxmox.Utils.base64ToUtf8(Proxmox.ConsentText),
-		    ),
-		});
+		let oidc_auth_redirect = Proxmox.Utils.getOpenIDRedirectionAuthorization();
+		if (oidc_auth_redirect === undefined) {
+		    Ext.create("Proxmox.window.ConsentModal", {
+			autoShow: true,
+			consent: Proxmox.Markdown.parse(
+			    Proxmox.Utils.base64ToUtf8(Proxmox.ConsentText),
+			),
+		    });
+		}
 	    }
 	},
 
-- 
2.39.5


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH manager 1/1] fix #6311: ui: prevent consent text from showing twice for oidc

[Gabriel Goller]

Oof, didn't test with OIDC, my bad.

Not an OIDC expert, so would be nice if someone else chimes in, but it
works as advertised with a simple keycloak server setup.

Consider:
Tested-by: Gabriel Goller <g.goller@proxmox.com>



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH manager 1/1] fix #6311: ui: prevent consent text from showing twice for oidc

[Thomas Lamprecht]

On Sun, 13 Apr 2025 21:18:36 -0500, Thomas Skinner wrote:
> 


Applied, thanks!

For future UI patches please follow our JavaScript style guide, e.g. for
casing we prefer camelCase there [0].

[0]: https://pve.proxmox.com/wiki/Javascript_Style_Guide#Casing

[1/1] fix #6311: ui: prevent consent text from showing twice for oidc
      commit: 1d3ff80fe5842625f24ea04517034b9ee3564de4


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel