all lists on lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH SERIES manager] fix #6311: ui: prevent consent text from showing twice for oidc
@ 2025-04-14  2:18 Thomas Skinner
  2025-04-14  2:18 ` [pve-devel] [PATCH manager 1/1] " Thomas Skinner
  0 siblings, 1 reply; 4+ messages in thread
From: Thomas Skinner @ 2025-04-14  2:18 UTC (permalink / raw)
  To: pve-devel; +Cc: 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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [pve-devel] [PATCH manager 1/1] fix #6311: ui: prevent consent text from showing twice for oidc
  2025-04-14  2:18 [pve-devel] [PATCH SERIES manager] fix #6311: ui: prevent consent text from showing twice for oidc Thomas Skinner
@ 2025-04-14  2:18 ` Thomas Skinner
  2025-04-14 12:53   ` Gabriel Goller
  2025-04-15 12:07   ` Thomas Lamprecht
  0 siblings, 2 replies; 4+ messages in thread
From: Thomas Skinner @ 2025-04-14  2:18 UTC (permalink / raw)
  To: pve-devel; +Cc: 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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [pve-devel] [PATCH manager 1/1] fix #6311: ui: prevent consent text from showing twice for oidc
  2025-04-14  2:18 ` [pve-devel] [PATCH manager 1/1] " Thomas Skinner
@ 2025-04-14 12:53   ` Gabriel Goller
  2025-04-15 12:07   ` Thomas Lamprecht
  1 sibling, 0 replies; 4+ messages in thread
From: Gabriel Goller @ 2025-04-14 12:53 UTC (permalink / raw)
  To: Thomas Skinner; +Cc: pve-devel

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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [pve-devel] [PATCH manager 1/1] fix #6311: ui: prevent consent text from showing twice for oidc
  2025-04-14  2:18 ` [pve-devel] [PATCH manager 1/1] " Thomas Skinner
  2025-04-14 12:53   ` Gabriel Goller
@ 2025-04-15 12:07   ` Thomas Lamprecht
  1 sibling, 0 replies; 4+ messages in thread
From: Thomas Lamprecht @ 2025-04-15 12:07 UTC (permalink / raw)
  To: pve-devel, Thomas Skinner

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


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-04-15 12:08 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-04-14  2:18 [pve-devel] [PATCH SERIES manager] fix #6311: ui: prevent consent text from showing twice for oidc Thomas Skinner
2025-04-14  2:18 ` [pve-devel] [PATCH manager 1/1] " Thomas Skinner
2025-04-14 12:53   ` Gabriel Goller
2025-04-15 12:07   ` Thomas Lamprecht

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal