From 3e554af64a8cecdcba8e39e6e07be1a2d9c4d338 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 27 Nov 2019 11:34:27 -0500 Subject: simplify --- teleterm-web/src/model.rs | 10 +++------- teleterm-web/src/protocol.rs | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'teleterm-web') diff --git a/teleterm-web/src/model.rs b/teleterm-web/src/model.rs index c500600..8a88660 100644 --- a/teleterm-web/src/model.rs +++ b/teleterm-web/src/model.rs @@ -62,13 +62,9 @@ impl Model { } crate::Msg::LoggedIn(response) => match response { Ok(response) => { - self.config.username = response.username.clone(); - if let Some(username) = response.username { - log::debug!("logged in as {}", username); - orders.send_msg(crate::Msg::Refresh); - } else { - log::error!("failed to log in"); - } + log::debug!("logged in as {}", response.username); + self.config.username = Some(response.username); + orders.send_msg(crate::Msg::Refresh); } Err(e) => { log::error!("error logging in: {:?}", e); diff --git a/teleterm-web/src/protocol.rs b/teleterm-web/src/protocol.rs index afcfad1..d69618f 100644 --- a/teleterm-web/src/protocol.rs +++ b/teleterm-web/src/protocol.rs @@ -34,5 +34,5 @@ pub(crate) struct Size { #[derive(Clone, Debug, serde::Deserialize)] pub(crate) struct LoginResponse { - pub username: Option, + pub username: String, } -- cgit v1.2.3-54-g00ecf