keep password around after login and until account verification (if not verified already)

Author: foglio1024

src/client/Launcher/Controllers/AccountVerificationModalController.cs

@@ -8,15 +8,10 @@ internal sealed partial class AccountVerificationModalController : ModalControll
     [NotifyCanExecuteChangedFor(nameof(ConfirmCommand))]
     private string _token = string.Empty;
 
-    [ObservableProperty]
-    [NotifyCanExecuteChangedFor(nameof(ConfirmCommand))]
-    private string _password = string.Empty;
-
     [ObservableProperty]
     private ActionStatus _actionStatus;
 
     public bool CanConfirm => !string.IsNullOrEmpty(Token)
-                           && !string.IsNullOrEmpty(Password)
                            && ActionStatus is not ActionStatus.Pending;
 
     public AccountVerificationModalController(IServiceProvider services, MainController mainController)
@@ -31,7 +26,7 @@ private async Task ConfirmAsync()
         try
         {
             ActionStatus = ActionStatus.Pending;
-            await MainController.Gateway.Rest.VerifyAccountTokenAsync(_session.AccountName!, Password, new AccountsVerifyRequest
+            await MainController.Gateway.Rest.VerifyAccountTokenAsync(_session.AccountName!, _session.Password!, new AccountsVerifyRequest
             {
                 Token = Token,
             }).ConfigureAwait(true);
@@ -62,7 +57,7 @@ private async Task ResendEmailAsync()
         try
         {
             ActionStatus = ActionStatus.Pending;
-            await MainController.Gateway.Rest.SendAccountEmailAsync(_session.AccountName!, Password)
+            await MainController.Gateway.Rest.SendAccountEmailAsync(_session.AccountName!, _session.Password!)
                 .ConfigureAwait(true);
 
             ActionStatus = ActionStatus.Successful;

src/client/Launcher/Controllers/LoginModalController.cs

@@ -44,7 +44,7 @@ private async Task LoginAsync()
 
                 if (resp.SessionTicket != null)
                 {
-                    _session.Login(Email, resp);
+                    _session.Login(Email, resp, resp.IsVerifying ? Password : null);
 
                     ActionStatus = ActionStatus.Successful;
 

src/client/Launcher/Controllers/RegistrationModalController.cs

@@ -48,7 +48,7 @@ await MainController.Gateway.Rest
 
             if (resp.SessionTicket != null)
             {
-                _session.Login(Email, resp);
+                _session.Login(Email, resp, Password);
 
                 ActionStatus = ActionStatus.Successful;
 

src/client/Launcher/UserSession.cs

@@ -10,14 +10,21 @@ internal sealed class UserSession
 
     public bool IsVerified { get; private set; }
 
+    public string? Password { get; private set; }
+
     public bool IsLoggedIn => AccountName is not null;
 
-    public void Login(string accountName, AccountsAuthenticateResponse response)
+    public void Login(string accountName, AccountsAuthenticateResponse response, string? password = null)
     {
         AccountName = accountName;
         SessionTicket = response.SessionTicket;
         IsVerified = !response.IsVerifying;
 
+        if (!string.IsNullOrEmpty(password) && !IsVerified)
+        {
+            Password = password;
+        }
+
         StatusChanged?.Invoke();
     }
 
@@ -26,13 +33,15 @@ public void Logout()
         AccountName = null;
         SessionTicket = null;
         IsVerified = false;
+        Password = null;
 
         StatusChanged?.Invoke();
     }
 
     public void Verify()
     {
         IsVerified = true;
+        Password = null;
 
         StatusChanged?.Invoke();
     }

src/client/Launcher/Views/AccountVerificationForm.axaml

@@ -47,11 +47,11 @@
          x:Name="TokenTextBox"
          Text="{Binding Token, Mode=TwoWay}"
          />
-        <TextBox VerticalAlignment="Center"
+        <!--<TextBox VerticalAlignment="Center"
                  Watermark="Password"
                  PasswordChar="•"
                  Text="{Binding Password, Mode=TwoWay}"
-                 />
+                 />-->
         <Button CornerRadius="8"
                 Classes="main"
                 HorizontalAlignment="Stretch"