From e1c7111fc69493d2357cbd6b46e41f814ec703ae Mon Sep 17 00:00:00 2001
From: Alex Donec <alex@don.ec>
Date: Mon, 31 Oct 2022 03:34:04 +0300
Subject: [PATCH 1/4] Fix: placeholder text not showing

---
 warpgate-web/src/theme/_theme.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/warpgate-web/src/theme/_theme.scss b/warpgate-web/src/theme/_theme.scss
index fa093ca0..87a58d1d 100644
--- a/warpgate-web/src/theme/_theme.scss
+++ b/warpgate-web/src/theme/_theme.scss
@@ -92,3 +92,12 @@ input:-webkit-autofill:focus {
 .page-item.active .page-link {
     text-decoration: underline;
 }
+
+// Fix placeholder text with floating FormGroup labels
+.form-floating>.form-control::placeholder {
+    color: revert;
+}
+
+.form-floating>.form-control:not(:focus)::placeholder {
+    color: transparent;
+}

From 895bc9d422dcb8e1c333e59901bd53dd226457d3 Mon Sep 17 00:00:00 2001
From: Alex Donec <alex@don.ec>
Date: Mon, 31 Oct 2022 03:34:51 +0300
Subject: [PATCH 2/4] Add placeholder text for username #440

---
 warpgate-web/src/admin/Target.svelte | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/warpgate-web/src/admin/Target.svelte b/warpgate-web/src/admin/Target.svelte
index e9ffced1..fd5c6847 100644
--- a/warpgate-web/src/admin/Target.svelte
+++ b/warpgate-web/src/admin/Target.svelte
@@ -148,7 +148,10 @@ async function toggleRole (role: Role) {
         </div>
 
         <FormGroup floating label="Username">
-            <input class="form-control" bind:value={target.options.username} />
+            <input class="form-control"
+                placeholder="Note: blank value here will forward username from warpgate authenticated user"
+                bind:value={target.options.username} 
+            />
         </FormGroup>
 
         <div class="d-flex">

From 9b3ce401a0d57e07656ae702ba41e5cd1ac429ea Mon Sep 17 00:00:00 2001
From: Alex Donec <alex@don.ec>
Date: Mon, 31 Oct 2022 03:40:47 +0300
Subject: [PATCH 3/4] Add username forward for #440

---
 warpgate-protocol-ssh/src/server/session.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/warpgate-protocol-ssh/src/server/session.rs b/warpgate-protocol-ssh/src/server/session.rs
index 7cdad45c..d5c45d4c 100644
--- a/warpgate-protocol-ssh/src/server/session.rs
+++ b/warpgate-protocol-ssh/src/server/session.rs
@@ -1472,12 +1472,17 @@ impl ServerSession {
                 .map(|(t, opt)| (t.clone(), opt.clone()))
         };
 
-        let Some((target, ssh_options)) = target else {
+        let Some((target, mut ssh_options)) = target else {
             self.target = TargetSelection::NotFound(target_name.to_string());
             warn!("Selected target not found");
             return Ok(());
         };
 
+        // Forward username from the authenticated user to the target, if target has no username
+        if ssh_options.username.is_empty() {
+            ssh_options.username = username.to_string();
+        }
+
         let _ = self.server_handle.lock().await.set_target(&target).await;
         self.target = TargetSelection::Found(target, ssh_options);
         Ok(())

From f16f8278fe6bbec9568b330a5bec2f178a59c626 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <e@ajenti.org>
Date: Wed, 2 Nov 2022 19:36:13 +0100
Subject: [PATCH 4/4] wording

---
 warpgate-web/src/admin/Target.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/warpgate-web/src/admin/Target.svelte b/warpgate-web/src/admin/Target.svelte
index fd5c6847..6a88ac77 100644
--- a/warpgate-web/src/admin/Target.svelte
+++ b/warpgate-web/src/admin/Target.svelte
@@ -149,8 +149,8 @@ async function toggleRole (role: Role) {
 
         <FormGroup floating label="Username">
             <input class="form-control"
-                placeholder="Note: blank value here will forward username from warpgate authenticated user"
-                bind:value={target.options.username} 
+                placeholder="Use the currently logged in user's name"
+                bind:value={target.options.username}
             />
         </FormGroup>