Support for username and password command line args [VPNWIN-2855]

Author: Thomas Felices

src/Client/ProtonVPN.Client/Handlers/SessionSettingsHandler.cs

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2024 Proton AG
+ *
+ * This file is part of ProtonVPN.
+ *
+ * ProtonVPN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ProtonVPN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using ProtonVPN.Client.EventMessaging.Contracts;
+using ProtonVPN.Client.Handlers.Bases;
+using ProtonVPN.Client.Logic.Auth.Contracts.Enums;
+using ProtonVPN.Client.Logic.Auth.Contracts.Messages;
+using ProtonVPN.Client.Settings.Contracts;
+
+namespace ProtonVPN.Client.Handlers;
+
+public class SessionSettingsHandler : IHandler,
+    IEventMessageReceiver<AuthenticationStatusChanged>
+{
+    private readonly ISessionSettings _sessionSettings;
+
+    public SessionSettingsHandler(
+        ISessionSettings sessionSettings)
+    {
+        _sessionSettings = sessionSettings;
+    }
+
+    public void Receive(AuthenticationStatusChanged message)
+    {
+        if (message.AuthenticationStatus != AuthenticationStatus.LoggedOut)
+        {
+            _sessionSettings.ClearCredentials();
+        }
+    }
+}

src/Client/ProtonVPN.Client/Services/Bootstrapping/Bootstrapper.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Proton AG
+ * Copyright (c) 2025 Proton AG
  *
  * This file is part of ProtonVPN.
  *
@@ -19,7 +19,6 @@
 
 using Microsoft.Windows.AppLifecycle;
 using ProtonVPN.Client.Common.Dispatching;
-using ProtonVPN.Client.Contracts.Services.Browsing;
 using ProtonVPN.Client.Core.Services.Activation;
 using ProtonVPN.Client.Localization.Contracts;
 using ProtonVPN.Client.Logic.Auth.Contracts;
@@ -50,6 +49,7 @@ public class Bootstrapper : IBootstrapper
     private readonly IUpdatesManager _updatesManager;
     private readonly IGlobalSettingsMigrator _globalSettingsMigrator;
     private readonly ISettings _settings;
+    private readonly ISessionSettings _sessionSettings;
     private readonly ILogger _logger;
     private readonly IMainWindowActivator _mainWindowActivator;
     private readonly IVpnPlanUpdater _vpnPlanUpdater;
@@ -64,6 +64,7 @@ public Bootstrapper(
         IUpdatesManager updatesManager,
         IGlobalSettingsMigrator settingsMigrator,
         ISettings settings,
+        ISessionSettings sessionSettings,
         ILogger logger,
         ILocalizationProvider localizer,
         IConnectionManager connectionManager,
@@ -80,6 +81,7 @@ public Bootstrapper(
         _updatesManager = updatesManager;
         _globalSettingsMigrator = settingsMigrator;
         _settings = settings;
+        _sessionSettings = sessionSettings;
         _logger = logger;
         _mainWindowActivator = mainWindowActivator;
         _vpnPlanUpdater = vpnPlanUpdater;
@@ -119,6 +121,7 @@ private void OnCurrentAppInstanceActivated(object? sender, AppActivationArgument
                 case ExtendedActivationKind.Protocol:
                     HandleProtocolActivationArguments(e.Data as ProtocolActivatedEventArgs);
                     break;
+
                 default:
                     _logger.Info<AppLog>($"Handle {e.Kind} activation - Activate window");
                     _mainWindowActivator.Activate();
@@ -176,6 +179,24 @@ private void HandleCommandLineArguments()
                     _settings.WireGuardConnectionTimeout = DefaultSettings.WireGuardConnectionTimeout;
                 }
             }
+            else if (arg.EqualsIgnoringCase("-username") || arg.EqualsIgnoringCase("-u"))
+            {
+                int usernameIndex = i + 1;
+                if (usernameIndex < args.Length)
+                {
+                    _sessionSettings.Username = args[usernameIndex];
+                    i++;
+                }
+            }
+            else if (arg.EqualsIgnoringCase("-password") || arg.EqualsIgnoringCase("-p"))
+            {
+                int passwordIndex = i + 1;
+                if (passwordIndex < args.Length)
+                {
+                    _sessionSettings.Password = args[passwordIndex];
+                    i++;
+                }
+            }
         }
 
         HandleProtonInstallerArguments(args);

src/Client/ProtonVPN.Client/UI/Login/Pages/SignInPageViewModel.cs

@@ -32,6 +32,7 @@
 using ProtonVPN.Client.Logic.Auth.Contracts.Messages;
 using ProtonVPN.Client.Logic.Auth.Contracts.Models;
 using ProtonVPN.Client.Logic.Connection.Contracts.GuestHole;
+using ProtonVPN.Client.Settings.Contracts;
 using ProtonVPN.Client.UI.Login.Bases;
 using ProtonVPN.Client.UI.Login.Enums;
 using ProtonVPN.Client.UI.Login.Overlays;
@@ -48,6 +49,7 @@ public partial class SignInPageViewModel : LoginPageViewModelBase
     private readonly IEventMessageSender _eventMessageSender;
     private readonly IApiAvailabilityVerifier _apiAvailabilityVerifier;
     private readonly IGuestHoleManager _guestHoleManager;
+    private readonly ISessionSettings _sessionSettings;
     private readonly SsoLoginOverlayViewModel _ssoLoginOverlayViewModel;
 
     [ObservableProperty]
@@ -114,6 +116,7 @@ public SignInPageViewModel(
         IEventMessageSender eventMessageSender,
         IApiAvailabilityVerifier apiAvailabilityVerifier,
         IGuestHoleManager guestHoleManager,
+        ISessionSettings sessionSettings,
         SsoLoginOverlayViewModel ssoLoginOverlayViewModel,
         IViewModelHelper viewModelHelper)
         : base(parentViewNavigator, viewModelHelper)
@@ -123,6 +126,7 @@ public SignInPageViewModel(
         _eventMessageSender = eventMessageSender;
         _apiAvailabilityVerifier = apiAvailabilityVerifier;
         _guestHoleManager = guestHoleManager;
+        _sessionSettings = sessionSettings;
         _ssoLoginOverlayViewModel = ssoLoginOverlayViewModel;
     }
 
@@ -185,7 +189,8 @@ private bool ValidateForm()
 
     private bool CanSignIn()
     {
-        return !IsSigningIn;
+        return !IsSigningIn 
+            && _userAuthenticator.AuthenticationStatus == AuthenticationStatus.LoggedOut;
     }
 
     private async Task<AuthResult> HandleSrpLoginAsync()
@@ -284,6 +289,21 @@ protected override void OnActivated()
         base.OnActivated();
 
         _userAuthenticator.ClearUnauthSessionDetails();
+
+        if (_userAuthenticator.IsAutoLogin != true && SignInCommand.CanExecute(null))
+        {
+            if (!string.IsNullOrEmpty(_sessionSettings.Username))
+            {
+                Username = _sessionSettings.Username.Trim();
+
+                if (!string.IsNullOrEmpty(_sessionSettings.Password)) 
+                {
+                    Password = _sessionSettings.Password.Trim();
+
+                    SignInCommand.Execute(null);
+                }
+            }
+        }
     }
 
     partial void OnSignInFormTypeChanged(SignInFormType oldValue, SignInFormType newValue)

src/Client/Settings/ProtonVPN.Client.Settings.Contracts/ISessionSettings.cs

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2025 Proton AG
+ *
+ * This file is part of ProtonVPN.
+ *
+ * ProtonVPN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ProtonVPN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace ProtonVPN.Client.Settings.Contracts;
+
+public interface ISessionSettings
+{
+    string Username { get; set; }
+
+    string Password { get; set; }
+
+    void ClearCredentials();
+}

src/Client/Settings/ProtonVPN.Client.Settings.Installers/SettingsModule.cs

@@ -34,6 +34,7 @@ protected override void Load(ContainerBuilder builder)
     {
         builder.RegisterType<Settings>().As<ISettings>().SingleInstance();
         builder.RegisterType<GlobalSettings>().As<IGlobalSettings>().SingleInstance();
+        builder.RegisterType<SessionSettings>().As<ISessionSettings>().SingleInstance();
 
         builder.RegisterType<UserSettingsFileReaderWriter>().As<IUserSettingsFileReaderWriter>().SingleInstance();
         builder.RegisterType<GlobalSettingsFileReaderWriter>().As<IGlobalSettingsFileReaderWriter>().SingleInstance();

src/Client/Settings/ProtonVPN.Client.Settings/SessionSettings.cs

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025 Proton AG
+ *
+ * This file is part of ProtonVPN.
+ *
+ * ProtonVPN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ProtonVPN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using ProtonVPN.Client.Settings.Contracts;
+
+namespace ProtonVPN.Client.Settings;
+
+public class SessionSettings : ISessionSettings
+{
+    public string Username { get; set; } = string.Empty;
+
+    public string Password { get; set; } = string.Empty;
+
+    public void ClearCredentials()
+    {
+        Username = string.Empty;
+        Password = string.Empty;
+    }
+}