From 640126f39a29604a4ee19066fcc4f530c9fa9083 Mon Sep 17 00:00:00 2001 From: Valentin Tolmer Date: Sun, 31 Oct 2021 22:41:28 +0900 Subject: [PATCH] app: Migrate Logout to CommonComponent --- app/src/components/logout.rs | 64 +++++++++++++++++------------------- app/src/infra/api.rs | 3 +- 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/app/src/components/logout.rs b/app/src/components/logout.rs index 0b49b5e..2f8f111 100644 --- a/app/src/components/logout.rs +++ b/app/src/components/logout.rs @@ -1,13 +1,13 @@ -use crate::infra::{api::HostService, cookies::delete_cookie}; +use crate::infra::{ + api::HostService, + common_component::{CommonComponent, CommonComponentParts}, + cookies::delete_cookie, +}; use anyhow::Result; use yew::prelude::*; -use yew::services::{fetch::FetchTask, ConsoleService}; pub struct LogoutButton { - link: ComponentLink, - on_logged_out: Callback<()>, - // Used to keep the request alive long enough. - _task: Option, + common: CommonComponentParts, } #[derive(Clone, PartialEq, Properties)] @@ -20,43 +20,39 @@ pub enum Msg { LogoutCompleted(Result<()>), } +impl CommonComponent for LogoutButton { + fn handle_msg(&mut self, msg: ::Message) -> Result { + match msg { + Msg::LogoutRequested => { + self.common + .call_backend(HostService::logout, (), Msg::LogoutCompleted)?; + } + Msg::LogoutCompleted(res) => { + res?; + delete_cookie("user_id")?; + self.common.props.on_logged_out.emit(()); + } + } + Ok(false) + } + + fn mut_common(&mut self) -> &mut CommonComponentParts { + &mut self.common + } +} + impl Component for LogoutButton { type Message = Msg; type Properties = Props; fn create(props: Self::Properties, link: ComponentLink) -> Self { LogoutButton { - link, - on_logged_out: props.on_logged_out, - _task: None, + common: CommonComponentParts::::create(props, link), } } fn update(&mut self, msg: Self::Message) -> ShouldRender { - match msg { - Msg::LogoutRequested => { - match HostService::logout(self.link.callback(Msg::LogoutCompleted)) { - Ok(task) => self._task = Some(task), - Err(e) => ConsoleService::error(&e.to_string()), - }; - false - } - Msg::LogoutCompleted(res) => { - if let Err(e) = res { - ConsoleService::error(&e.to_string()); - } - match delete_cookie("user_id") { - Err(e) => { - ConsoleService::error(&e.to_string()); - false - } - Ok(()) => { - self.on_logged_out.emit(()); - true - } - } - } - } + CommonComponentParts::::update(self, msg) } fn change(&mut self, _: Self::Properties) -> ShouldRender { @@ -67,7 +63,7 @@ impl Component for LogoutButton { html! { } diff --git a/app/src/infra/api.rs b/app/src/infra/api.rs index e721bc4..c63203f 100644 --- a/app/src/infra/api.rs +++ b/app/src/infra/api.rs @@ -223,7 +223,8 @@ impl HostService { ) } - pub fn logout(callback: Callback>) -> Result { + // The `_request` parameter is to make it the same shape as the other functions. + pub fn logout(_request: (), callback: Callback>) -> Result { call_server_empty_response_with_error_message( "/auth/logout", yew::format::Nothing,