From: "Shan Shaji" <s.shaji@proxmox.com>
To: "Michael Köppl" <m.koeppl@proxmox.com>,
"Proxmox VE development discussion" <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH proxmox_login_manager v2 2/2] fix #6409: add `isDefaultRealm` check to pre-select realm in login form
Date: Tue, 03 Jun 2025 12:31:40 +0200 [thread overview]
Message-ID: <DACTV281YYPE.9X9VC5IKLR22@noor> (raw)
In-Reply-To: <88c1c2e6-3b9d-4afc-9f6d-0604befb1524@proxmox.com>
Thank you for catching that. Will create another patch.
On Tue Jun 3, 2025 at 11:48 AM CEST, Michael Köppl wrote:
> On 5/26/25 17:41, Shan Shaji wrote:
> > When the `default` property was selected inside the realm of the web
> > UI, the app's login page was not showing the default realm instead,
> > it was always showing PAM.
> >
> > This commit adds the `isDefaultRealm` boolean check to find the
> > default realm.
>
> nit: commit message should not say "This commit..."
>
> >
> > Signed-off-by: Shan Shaji <s.shaji@proxmox.com>
> > ---
> >
> > changes since v1:
> > * generated the patch again by comparing with master
> >
> > lib/proxmox_login_form.dart | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/lib/proxmox_login_form.dart b/lib/proxmox_login_form.dart
> > index 5916563..4ed495d 100644
> > --- a/lib/proxmox_login_form.dart
> > +++ b/lib/proxmox_login_form.dart
> > @@ -697,7 +697,7 @@ class _ProxmoxLoginPageState extends State<ProxmoxLoginPage> {
> > response?.sort((a, b) => a!.realm.compareTo(b!.realm));
> >
> > final selection = response?.singleWhere(
> > - (e) => e!.realm == widget.userModel?.realm,
> > + (e) => e!.realm == widget.userModel?.realm || e.isDefaultRealm,
>
> This change will make the singleWhere throw a StateError "too many
> elements" if the user was already signed in on an instance with a realm
> different from the default realm and tries to connect to their PVE host
> again. singleWhere expects a single element to fulfill the condition. If
> multiple do it, it causes an exception. In this case, one realm would
> match the user's selected realm and another would match the default realm.
>
> To make it more clear what I mean:
> - Sign into a PVE host using PAM
> - Change the default realm to "PVE" in the web UI
> - Sign out from the PVE host in the app (do not delete the site)
> - Try to sign in again. Progress spinner with "Connecting..." since the
> exception is uncaught.
>
> I think the logic for this would have to be more along the lines of:
>
> final selection = response?.singleWhere(
> (e) {
> if (widget.userModel?.realm != null) {
> return e!.realm == widget.userModel?.realm;
> } else {
> return e!.isDefaultRealm;
> }
> },
> orElse: () => response?.first,
> );
>
> This gives priority to the user's selection if there is one.
> > orElse: () => response?.first,
> > );
> >
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2025-06-03 10:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-26 15:41 [pve-devel] [PATCH proxmox{_dart_api_client, _login_manager} v2 0/2] fix #6409: login manager doesn't pre-selects default authentication realm Shan Shaji
2025-05-26 15:41 ` [pve-devel] [PATCH proxmox_dart_api_client v2 1/2] fix #6409: add `default` property to `PveAccessDomainModel` Shan Shaji
2025-05-26 15:41 ` [pve-devel] [PATCH proxmox_login_manager v2 2/2] fix #6409: add `isDefaultRealm` check to pre-select realm in login form Shan Shaji
2025-06-03 9:48 ` Michael Köppl
2025-06-03 10:31 ` Shan Shaji [this message]
2025-06-03 12:24 ` Shan Shaji
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=DACTV281YYPE.9X9VC5IKLR22@noor \
--to=s.shaji@proxmox.com \
--cc=m.koeppl@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