From 3e554af64a8cecdcba8e39e6e07be1a2d9c4d338 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Wed, 27 Nov 2019 11:34:27 -0500
Subject: simplify

---
 teleterm/src/web/login.rs | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'teleterm/src/web/login.rs')

diff --git a/teleterm/src/web/login.rs b/teleterm/src/web/login.rs
index 9c1d869..2873887 100644
--- a/teleterm/src/web/login.rs
+++ b/teleterm/src/web/login.rs
@@ -8,12 +8,12 @@ use gotham::state::FromState as _;
     gotham_derive::StaticResponseExtender,
 )]
 pub struct QueryParams {
-    username: Option<String>,
+    username: String,
 }
 
 #[derive(serde::Serialize)]
 struct Response {
-    username: Option<String>,
+    username: String,
 }
 
 pub fn run(
@@ -23,17 +23,6 @@ pub fn run(
         let query_params = QueryParams::borrow_from(&state);
         query_params.username.clone()
     };
-    let username = if let Some(username) = username {
-        username
-    } else {
-        return (
-            state,
-            hyper::Response::builder()
-                .status(hyper::StatusCode::BAD_REQUEST)
-                .body(hyper::Body::empty())
-                .unwrap(),
-        );
-    };
 
     let config = crate::web::Config::borrow_from(&state);
 
@@ -80,10 +69,7 @@ pub fn run(
     (
         state,
         hyper::Response::new(hyper::Body::from(
-            serde_json::to_string(&Response {
-                username: Some(username),
-            })
-            .unwrap(),
+            serde_json::to_string(&Response { username }).unwrap(),
         )),
     )
 }
-- 
cgit v1.2.3-54-g00ecf