From 669c0ae948c82d29a90e3182888a77374b71c684 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 25 Nov 2019 14:20:12 -0500
Subject: use the correct username to log in on the server side

now that we're persisting it properly
---
 teleterm/src/web/list.rs  | 13 ++++++-------
 teleterm/src/web/watch.rs |  8 +++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/teleterm/src/web/list.rs b/teleterm/src/web/list.rs
index 0906f82..88ba181 100644
--- a/teleterm/src/web/list.rs
+++ b/teleterm/src/web/list.rs
@@ -8,7 +8,9 @@ pub fn run(
     let session = gotham::middleware::session::SessionData::<
         crate::web::SessionData,
     >::borrow_from(&state);
-    if session.username.is_none() {
+    let auth = if let Some(username) = &session.username {
+        crate::protocol::Auth::plain(username)
+    } else {
         return (
             state,
             hyper::Response::builder()
@@ -16,7 +18,7 @@ pub fn run(
                 .body(hyper::Body::empty())
                 .unwrap(),
         );
-    }
+    };
 
     let config = crate::web::Config::borrow_from(&state);
 
@@ -27,11 +29,8 @@ pub fn run(
                 .context(crate::error::Connect { address }),
         )
     });
-    let client = crate::client::Client::list(
-        "teleterm-web",
-        connector,
-        &crate::protocol::Auth::plain("test"),
-    );
+    let client =
+        crate::client::Client::list("teleterm-web", connector, &auth);
 
     let (w_sessions, r_sessions) = tokio::sync::oneshot::channel();
 
diff --git a/teleterm/src/web/watch.rs b/teleterm/src/web/watch.rs
index 74a59dd..8f59704 100644
--- a/teleterm/src/web/watch.rs
+++ b/teleterm/src/web/watch.rs
@@ -18,7 +18,9 @@ pub fn run(
     let session = gotham::middleware::session::SessionData::<
         crate::web::SessionData,
     >::borrow_from(&state);
-    if session.username.is_none() {
+    let auth = if let Some(username) = &session.username {
+        crate::protocol::Auth::plain(username)
+    } else {
         return (
             state,
             hyper::Response::builder()
@@ -26,7 +28,7 @@ pub fn run(
                 .body(hyper::Body::empty())
                 .unwrap(),
         );
-    }
+    };
 
     let body = hyper::Body::take_from(&mut state);
     let headers = hyper::HeaderMap::take_from(&mut state);
@@ -60,7 +62,7 @@ pub fn run(
         let client = crate::client::Client::watch(
             "teleterm-web",
             connector,
-            &crate::protocol::Auth::plain("test"),
+            &auth,
             &query_params.id,
         );
 
-- 
cgit v1.2.3