Implementing auto-fallback to Windows username. (#415)

* Implementing auto-fallback to Windows username. * mosh.exe recompiled. * Minor change, as required by Menno.
felixse · Jun 25, 2019 · 45338d0 · 45338d0
1 parent 04ed5d8
commit 45338d0
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 3 deletions.
diff --git a/FluentTerminal.App.Services/Implementation/DefaultValueProvider.cs b/FluentTerminal.App.Services/Implementation/DefaultValueProvider.cs
@@ -26,7 +26,8 @@ public ApplicationSettings GetDefaultApplicationSettings()
                 ShowNewOutputIndicator = false,
                 EnableTrayIcon = true,
                 ShowCustomTitleInTitlebar = true,
-                UseMoshByDefault = true
+                UseMoshByDefault = true,
+                AutoFallbackToWindowsUsernameInLinks = true
             };
         }
 

diff --git a/FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs b/FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs
@@ -140,6 +140,20 @@ public bool UseMoshByDefault
             }
         }
 
+        public bool AutoFallbackToWindowsUsernameInLinks
+        {
+            get => _applicationSettings.AutoFallbackToWindowsUsernameInLinks;
+            set
+            {
+                if (_applicationSettings.AutoFallbackToWindowsUsernameInLinks != value)
+                {
+                    _applicationSettings.AutoFallbackToWindowsUsernameInLinks = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
         public bool BottomIsSelected
         {
             get => TabsPosition == TabsPosition.Bottom;
@@ -305,6 +319,7 @@ private async Task RestoreDefaults()
                 EnableTrayIcon = defaults.EnableTrayIcon;
                 ShowCustomTitleInTitlebar = defaults.ShowCustomTitleInTitlebar;
                 UseMoshByDefault = defaults.UseMoshByDefault;
+                AutoFallbackToWindowsUsernameInLinks = defaults.AutoFallbackToWindowsUsernameInLinks;
             }
         }
 

diff --git a/FluentTerminal.App.ViewModels/SshProfileViewModel.cs b/FluentTerminal.App.ViewModels/SshProfileViewModel.cs
@@ -115,9 +115,11 @@ private void InitializeViewModelPropertiesPrivate(SshProfile sshProfile)
             {
                 _trayProcessCommunicationService.GetUserName().ContinueWith(t =>
                 {
-                    if (string.IsNullOrEmpty(Username))
+                    var username = t.Result;
+
+                    if (string.IsNullOrEmpty(Username) && !string.IsNullOrEmpty(username))
                     {
-                        Username = t.Result;
+                        ApplicationView.RunOnDispatcherThread(() => Username = username);
                     }
                 }, TaskContinuationOptions.OnlyOnRanToCompletion);
             }

diff --git a/FluentTerminal.App/App.xaml.cs b/FluentTerminal.App/App.xaml.cs
@@ -210,6 +210,12 @@ protected override async void OnActivated(IActivatedEventArgs args)
                         return;
                     }
 
+                    if (_applicationSettings.AutoFallbackToWindowsUsernameInLinks &&
+                        string.IsNullOrEmpty(connectionInfo.Username))
+                    {
+                        connectionInfo.Username = await _trayProcessCommunicationService.GetUserName();
+                    }
+
                     SshConnectionInfoValidationResult result = connectionInfo.Validate();
 
                     if (result == SshConnectionInfoValidationResult.Valid)

diff --git a/FluentTerminal.App/MoshExecutables/x64/mosh.exe b/FluentTerminal.App/MoshExecutables/x64/mosh.exe
diff --git a/FluentTerminal.App/MoshExecutables/x86/mosh.exe b/FluentTerminal.App/MoshExecutables/x86/mosh.exe
diff --git a/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml b/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml
@@ -166,6 +166,12 @@
                     Margin="{StaticResource ItemMargin}"
                     Header="Default to Mosh for SSH connections"
                     IsOn="{x:Bind ViewModel.UseMoshByDefault, Mode=TwoWay}" />
+
+                <ToggleSwitch
+                    x:Uid="AutoFallbackToWindowsUsername"
+                    Margin="{StaticResource ItemMargin}"
+                    Header="Use Windows username when opening SSH URLs that don't specify one"
+                    IsOn="{x:Bind ViewModel.AutoFallbackToWindowsUsernameInLinks, Mode=TwoWay}" />
             </StackPanel>
         </ScrollViewer>
     </Grid>

diff --git a/FluentTerminal.Models/ApplicationSettings.cs b/FluentTerminal.Models/ApplicationSettings.cs
@@ -18,5 +18,6 @@ public class ApplicationSettings
         public bool EnableTrayIcon { get; set; }
         public bool ShowCustomTitleInTitlebar { get; set; }
         public bool UseMoshByDefault { get; set; }
+        public bool AutoFallbackToWindowsUsernameInLinks { get; set; }
     }
 }