From 540ac5d2414bb711aa73b1ba099d111f80d136db Mon Sep 17 00:00:00 2001 From: Valentin Tolmer Date: Sun, 31 Oct 2021 21:20:30 +0900 Subject: [PATCH] app: Migrate Login to CommonComponent --- app/src/components/login.rs | 73 ++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/app/src/components/login.rs b/app/src/components/login.rs index 0bbfe80..9c86a22 100644 --- a/app/src/components/login.rs +++ b/app/src/components/login.rs @@ -1,21 +1,17 @@ -use crate::infra::api::HostService; +use crate::infra::{ + api::HostService, + common_component::{CommonComponent, CommonComponentParts}, +}; use anyhow::{anyhow, bail, Context, Result}; use lldap_auth::*; use validator_derive::Validate; -use yew::{ - prelude::*, - services::{fetch::FetchTask, ConsoleService}, -}; +use yew::{prelude::*, services::ConsoleService}; use yew_form::Form; use yew_form_derive::Model; pub struct LoginForm { - link: ComponentLink, - on_logged_in: Callback<(String, bool)>, - error: Option, + common: CommonComponentParts, form: Form, - // Used to keep the request alive long enough. - task: Option, } /// The fields of the form, with the constraints. @@ -44,8 +40,8 @@ pub enum Msg { AuthenticationFinishResponse(Result<(String, bool)>), } -impl LoginForm { - fn handle_message(&mut self, msg: ::Message) -> Result { +impl CommonComponent for LoginForm { + fn handle_msg(&mut self, msg: ::Message) -> Result { match msg { Msg::Update => Ok(true), Msg::Submit => { @@ -61,11 +57,10 @@ impl LoginForm { username, login_start_request: message, }; - self.task = Some(HostService::login_start( - req, - self.link - .callback_once(move |r| Msg::AuthenticationStartResponse((state, r))), - )?); + self.common + .call_backend(HostService::login_start, req, move |r| { + Msg::AuthenticationStartResponse((state, r)) + })?; Ok(true) } Msg::AuthenticationStartResponse((login_start, res)) => { @@ -77,8 +72,8 @@ impl LoginForm { // Common error, we want to print a full error to the console but only a // simple one to the user. ConsoleService::error(&format!("Invalid username or password: {}", e)); - self.error = Some(anyhow!("Invalid username or password")); - self.task = None; + self.common.error = Some(anyhow!("Invalid username or password")); + self.common.cancel_task(); return Ok(true); } Ok(l) => l, @@ -87,20 +82,26 @@ impl LoginForm { server_data: res.server_data, credential_finalization: login_finish.message, }; - self.task = Some(HostService::login_finish( + self.common.call_backend( + HostService::login_finish, req, - self.link.callback_once(Msg::AuthenticationFinishResponse), - )?); + Msg::AuthenticationFinishResponse, + )?; Ok(false) } Msg::AuthenticationFinishResponse(user_info) => { - self.task = None; - self.on_logged_in + self.common.cancel_task(); + self.common + .on_logged_in .emit(user_info.context("Could not log in")?); Ok(true) } } } + + fn mut_common(&mut self) -> &mut CommonComponentParts { + &mut self.common + } } impl Component for LoginForm { @@ -109,25 +110,13 @@ impl Component for LoginForm { fn create(props: Self::Properties, link: ComponentLink) -> Self { LoginForm { - link, - on_logged_in: props.on_logged_in, - error: None, + common: CommonComponentParts::::create(props, link), form: Form::::new(FormModel::default()), - task: None, } } fn update(&mut self, msg: Self::Message) -> ShouldRender { - self.error = None; - match self.handle_message(msg) { - Err(e) => { - ConsoleService::error(&e.to_string()); - self.error = Some(e); - self.task = None; - true - } - Ok(b) => b, - } + CommonComponentParts::::update(self, msg) } fn change(&mut self, _: Self::Properties) -> ShouldRender { @@ -153,7 +142,7 @@ impl Component for LoginForm { field_name="username" placeholder="Username" autocomplete="username" - oninput=self.link.callback(|_| Msg::Update) /> + oninput=self.common.callback(|_| Msg::Update) />
@@ -175,13 +164,13 @@ impl Component for LoginForm {
- { if let Some(e) = &self.error { + { if let Some(e) = &self.common.error { html! { e.to_string() } } else { html! {} } }