[pve-devel] [PATCH proxmox-login-manager 1/2] saved login: don't give outdated ticket to login form

[pve-devel] [PATCH proxmox-login-manager 1/2] saved login: don't give outdated ticket to login form

[Dominik Csapak]

if the user was logged in in the past, but that ticket expired, we still
gave the expired ticket to the login form which tried to login with
that, producing a login error the first time the user pressed login.

we already get the correct ticket in a variable, so use that.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 lib/proxmox_login_selector.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/proxmox_login_selector.dart b/lib/proxmox_login_selector.dart
index e599461..8573ab0 100644
--- a/lib/proxmox_login_selector.dart
+++ b/lib/proxmox_login_selector.dart
@@ -207,7 +207,7 @@ class _ProxmoxLoginSelectorState extends State<ProxmoxLoginSelector> {
         builder: (context) => ProxmoxLoginPage(
               userModel: user,
               isCreate: isCreate,
-              ticket: user?.ticket,
+              ticket: ticket,
               password: password,
             )));
     refreshFromStorage();
-- 
2.30.2

[pve-devel] [PATCH proxmox-login-manager 2/2] tfa: allow closing tfa form

[Dominik Csapak]

abort the login when the form returns null. This happens if the user
presses 'X' in the tfa form.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 lib/proxmox_login_form.dart | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/proxmox_login_form.dart b/lib/proxmox_login_form.dart
index dbc912a..861947d 100644
--- a/lib/proxmox_login_form.dart
+++ b/lib/proxmox_login_form.dart
@@ -433,11 +433,21 @@ class _ProxmoxLoginPageState extends State<ProxmoxLoginPage> {
 
       if (client.credentials.tfa != null &&
           client.credentials.tfa!.kinds().length > 0) {
-        client = await Navigator.of(context).push(MaterialPageRoute(
+        ProxmoxApiClient? tfaclient =
+            await Navigator.of(context).push(MaterialPageRoute(
           builder: (context) => ProxmoxTfaForm(
             apiClient: client,
           ),
         ));
+
+        if (tfaclient != null) {
+          client = tfaclient;
+        } else {
+          setState(() {
+            _progressModel.inProgress -= 1;
+          });
+          return;
+        }
       }
 
       final status = await client.getClusterStatus();
-- 
2.30.2

[pve-devel] applied-series: [PATCH proxmox-login-manager 1/2] saved login: don't give outdated ticket to login form

[Thomas Lamprecht]

Am 04/07/2023 um 15:53 schrieb Dominik Csapak:
> if the user was logged in in the past, but that ticket expired, we still
> gave the expired ticket to the login form which tried to login with
> that, producing a login error the first time the user pressed login.
> 
> we already get the correct ticket in a variable, so use that.
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  lib/proxmox_login_selector.dart | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
>

applied both patches, thanks!