diff --git a/Cargo.lock b/Cargo.lock index 591cc19..98477c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -352,12 +352,6 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" -[[package]] -name = "anymap" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" - [[package]] name = "arrayref" version = "0.3.6" @@ -660,12 +654,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg-match" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8100e46ff92eb85bf6dc2930c73f2a4f7176393c84a9446b3d501e1b354e7b34" - [[package]] name = "chrono" version = "0.4.23" @@ -1524,14 +1512,18 @@ checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "gloo" -version = "0.2.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ce6f2dfa9f57f15b848efa2aade5e1850dc72986b87a2b0752d44ca08f4967" +checksum = "23947965eee55e3e97a5cd142dd4c10631cc349b48cecca0ed230fd296f568cd" dependencies = [ - "gloo-console-timer", + "gloo-console", + "gloo-dialogs", "gloo-events", "gloo-file", + "gloo-render", + "gloo-storage", "gloo-timers", + "gloo-utils", ] [[package]] @@ -1548,11 +1540,12 @@ dependencies = [ ] [[package]] -name = "gloo-console-timer" -version = "0.1.0" +name = "gloo-dialogs" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b48675544b29ac03402c6dffc31a912f716e38d19f7e74b78b7e900ec3c941ea" +checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" dependencies = [ + "wasm-bindgen", "web-sys", ] @@ -1568,22 +1561,70 @@ dependencies = [ [[package]] name = "gloo-file" -version = "0.1.0" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9fecfe46b5dc3cc46f58e98ba580cc714f2c93860796d002eb3527a465ef49" +checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7" dependencies = [ + "futures-channel", "gloo-events", "js-sys", "wasm-bindgen", "web-sys", ] +[[package]] +name = "gloo-net" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9902a044653b26b99f7e3693a42f171312d9be8b26b5697bd1e43ad1f8a35e10" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-render" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-storage" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480" +dependencies = [ + "gloo-utils", + "js-sys", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gloo-timers" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" dependencies = [ + "futures-channel", + "futures-core", "js-sys", "wasm-bindgen", ] @@ -2258,19 +2299,6 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if", - "ryu", - "static_assertions", -] - [[package]] name = "libc" version = "0.2.139" @@ -2388,6 +2416,8 @@ dependencies = [ "base64 0.13.1", "chrono", "gloo-console", + "gloo-file", + "gloo-net", "graphql_client 0.10.0", "http", "image", @@ -2401,12 +2431,12 @@ dependencies = [ "validator", "validator_derive 0.16.0", "wasm-bindgen", + "wasm-bindgen-futures", "web-sys", "yew", "yew-router", "yew_form", "yew_form_derive", - "yewtil", ] [[package]] @@ -2586,17 +2616,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf51a729ecf40266a2368ad335a5fdde43471f545a967109cd62146ecf8b66ff" -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "lexical-core", - "memchr", - "version_check", -] - [[package]] name = "nom" version = "7.1.3" @@ -3287,6 +3306,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + [[package]] name = "rsa" version = "0.6.1" @@ -3411,6 +3436,12 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "scoped-tls-hkt" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e9d7eaddb227e8fbaaa71136ae0e1e913ca159b86c7da82f3e8f0044ad3a63" + [[package]] name = "scopeguard" version = "1.1.0" @@ -3576,6 +3607,18 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-wasm-bindgen" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "618365e8e586c22123d692b72a7d791d5ee697817b65a218cdf12a98870af0f7" +dependencies = [ + "fnv", + "js-sys", + "serde", + "wasm-bindgen", +] + [[package]] name = "serde_bytes" version = "0.11.9" @@ -4480,8 +4523,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", - "serde", - "serde_json", "wasm-bindgen-macro", ] @@ -4727,26 +4768,17 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yew" -version = "0.18.0" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d5154faef86dddd2eb333d4755ea5643787d20aca683e58759b0e53351409f" +checksum = "2a1ccb53e57d3f7d847338cf5758befa811cabe207df07f543c06f502f9998cd" dependencies = [ - "anyhow", - "anymap", - "bincode", - "cfg-if", - "cfg-match", "console_error_panic_hook", "gloo", - "http", + "gloo-utils", "indexmap", "js-sys", - "log", - "ryu", - "serde", - "serde_json", + "scoped-tls-hkt", "slab", - "thiserror", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4755,12 +4787,13 @@ dependencies = [ [[package]] name = "yew-macro" -version = "0.18.0" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6e23bfe3dc3933fbe9592d149c9985f3047d08c637a884b9344c21e56e092ef" +checksum = "5fab79082b556d768d6e21811869c761893f0450e1d550a67892b9bce303b7bb" dependencies = [ "boolinator", "lazy_static", + "proc-macro-error", "proc-macro2", "quote", "syn", @@ -4768,60 +4801,52 @@ dependencies = [ [[package]] name = "yew-router" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27666236d9597eac9be560e841e415e20ba67020bc8cd081076be178e159c8bc" +checksum = "155804f6f3aa309f596d5c3fa14486a94e7756f1edd7634569949e401d5099f2" dependencies = [ - "cfg-if", - "cfg-match", "gloo", + "gloo-utils", "js-sys", - "log", - "nom 5.1.2", + "route-recognizer", "serde", - "serde_json", + "serde-wasm-bindgen", + "serde_urlencoded", + "thiserror", "wasm-bindgen", "web-sys", "yew", "yew-router-macro", - "yew-router-route-parser", ] [[package]] name = "yew-router-macro" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c0ace2924b7a175e2d1c0e62ee7022a5ad840040dcd52414ce5f410ab322dba" +checksum = "39049d193b52eaad4ffc80916bf08806d142c90b5edcebd527644de438a7e19a" dependencies = [ "proc-macro2", "quote", "syn", - "yew-router-route-parser", -] - -[[package]] -name = "yew-router-route-parser" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de4a67208fb46b900af18a7397938b01f379dfc18da34799cfa8347eec715697" -dependencies = [ - "nom 5.1.2", ] [[package]] name = "yew_form" version = "0.1.8" -source = "git+https://github.com/jfbilodeau/yew_form?rev=67050812695b7a8a90b81b0637e347fc6629daed#67050812695b7a8a90b81b0637e347fc6629daed" +source = "git+https://github.com/jfbilodeau/yew_form?rev=4b9fabffb63393ec7626a4477fd36de12a07fac9#4b9fabffb63393ec7626a4477fd36de12a07fac9" dependencies = [ + "gloo-console", "validator", "validator_derive 0.14.0", + "wasm-bindgen", + "web-sys", "yew", ] [[package]] name = "yew_form_derive" version = "0.1.8" -source = "git+https://github.com/jfbilodeau/yew_form?rev=67050812695b7a8a90b81b0637e347fc6629daed#67050812695b7a8a90b81b0637e347fc6629daed" +source = "git+https://github.com/jfbilodeau/yew_form?rev=4b9fabffb63393ec7626a4477fd36de12a07fac9#4b9fabffb63393ec7626a4477fd36de12a07fac9" dependencies = [ "proc-macro2", "quote", @@ -4829,19 +4854,6 @@ dependencies = [ "yew_form", ] -[[package]] -name = "yewtil" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8543663ac49cd613df079282a1d8bdbdebdad6e02bac229f870fd4237b5d9aaa" -dependencies = [ - "log", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "yew", -] - [[package]] name = "zeroize" version = "1.5.7" diff --git a/app/Cargo.toml b/app/Cargo.toml index c5573f1..cc489be 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -9,22 +9,24 @@ include = ["src/**/*", "queries/**/*", "Cargo.toml", "../schema.graphql"] anyhow = "1" base64 = "0.13" gloo-console = "0.2.3" +gloo-file = "0.2.3" +gloo-net = "*" graphql_client = "0.10" http = "0.2" jwt = "0.13" rand = "0.8" serde = "1" serde_json = "1" +url-escape = "0.1.1" validator = "=0.14" validator_derive = "*" wasm-bindgen = "0.2" -yew = "0.18" -yewtil = "*" -yew-router = "0.15" +wasm-bindgen-futures = "*" +yew = "0.19.3" +yew-router = "0.16" # Needed because of https://github.com/tkaitchuck/aHash/issues/95 indexmap = "=1.6.2" -url-escape = "0.1.1" [dependencies.web-sys] version = "0.3" @@ -57,11 +59,11 @@ version = "0.24" [dependencies.yew_form] git = "https://github.com/jfbilodeau/yew_form" -rev = "67050812695b7a8a90b81b0637e347fc6629daed" +rev = "4b9fabffb63393ec7626a4477fd36de12a07fac9" [dependencies.yew_form_derive] git = "https://github.com/jfbilodeau/yew_form" -rev = "67050812695b7a8a90b81b0637e347fc6629daed" +rev = "4b9fabffb63393ec7626a4477fd36de12a07fac9" [lib] crate-type = ["cdylib"] diff --git a/app/src/components/add_group_member.rs b/app/src/components/add_group_member.rs index 0ac4e23..79c056c 100644 --- a/app/src/components/add_group_member.rs +++ b/app/src/components/add_group_member.rs @@ -52,23 +52,25 @@ pub struct Props { } impl CommonComponent for AddGroupMemberComponent { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg( + &mut self, + ctx: &Context, + msg: ::Message, + ) -> Result { match msg { Msg::UserListResponse(response) => { self.user_list = Some(response?.users); - self.common.cancel_task(); } - Msg::SubmitAddMember => return self.submit_add_member(), + Msg::SubmitAddMember => return self.submit_add_member(ctx), Msg::AddMemberResponse(response) => { response?; - self.common.cancel_task(); let user = self .selected_user .as_ref() .expect("Could not get selected user") .clone(); // Remove the user from the dropdown. - self.common.on_user_added_to_group.emit(user); + ctx.props().on_user_added_to_group.emit(user); } Msg::SelectionChanged(option_props) => { let was_some = self.selected_user.is_some(); @@ -88,23 +90,25 @@ impl CommonComponent for AddGroupMemberComponent { } impl AddGroupMemberComponent { - fn get_user_list(&mut self) { + fn get_user_list(&mut self, ctx: &Context) { self.common.call_graphql::( + ctx, list_user_names::Variables { filters: None }, Msg::UserListResponse, "Error trying to fetch user list", ); } - fn submit_add_member(&mut self) -> Result { + fn submit_add_member(&mut self, ctx: &Context) -> Result { let user_id = match self.selected_user.clone() { None => return Ok(false), Some(user) => user.id, }; self.common.call_graphql::( + ctx, add_user_to_group::Variables { user: user_id, - group: self.common.group_id, + group: ctx.props().group_id, }, Msg::AddMemberResponse, "Error trying to initiate adding the user to a group", @@ -112,8 +116,8 @@ impl AddGroupMemberComponent { Ok(true) } - fn get_selectable_user_list(&self, user_list: &[User]) -> Vec { - let user_groups = self.common.users.iter().collect::>(); + fn get_selectable_user_list(&self, ctx: &Context, user_list: &[User]) -> Vec { + let user_groups = ctx.props().users.iter().collect::>(); user_list .iter() .filter(|u| !user_groups.contains(u)) @@ -126,32 +130,29 @@ impl Component for AddGroupMemberComponent { type Message = Msg; type Properties = Props; - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(ctx: &Context) -> Self { let mut res = Self { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), user_list: None, selected_user: None, }; - res.get_user_list(); + res.get_user_list(ctx); res } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { CommonComponentParts::::update_and_report_error( self, + ctx, msg, - self.common.on_error.clone(), + ctx.props().on_error.clone(), ) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { - let link = &self.common; + fn view(&self, ctx: &Context) -> Html { + let link = ctx.link(); if let Some(user_list) = &self.user_list { - let to_add_user_list = self.get_selectable_user_list(user_list); + let to_add_user_list = self.get_selectable_user_list(ctx, user_list); #[allow(unused_braces)] let make_select_option = |user: User| { html_nested! { diff --git a/app/src/components/add_user_to_group.rs b/app/src/components/add_user_to_group.rs index 1130ffb..7e8ce81 100644 --- a/app/src/components/add_user_to_group.rs +++ b/app/src/components/add_user_to_group.rs @@ -64,16 +64,18 @@ pub struct Props { } impl CommonComponent for AddUserToGroupComponent { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg( + &mut self, + ctx: &Context, + msg: ::Message, + ) -> Result { match msg { Msg::GroupListResponse(response) => { self.group_list = Some(response?.groups.into_iter().map(Into::into).collect()); - self.common.cancel_task(); } - Msg::SubmitAddGroup => return self.submit_add_group(), + Msg::SubmitAddGroup => return self.submit_add_group(ctx), Msg::AddGroupResponse(response) => { response?; - self.common.cancel_task(); // Adding the user to the group succeeded, we're not in the process of adding a // group anymore. let group = self @@ -82,7 +84,7 @@ impl CommonComponent for AddUserToGroupComponent { .expect("Could not get selected group") .clone(); // Remove the group from the dropdown. - self.common.on_user_added_to_group.emit(group); + ctx.props().on_user_added_to_group.emit(group); } Msg::SelectionChanged(option_props) => { let was_some = self.selected_group.is_some(); @@ -102,22 +104,24 @@ impl CommonComponent for AddUserToGroupComponent { } impl AddUserToGroupComponent { - fn get_group_list(&mut self) { + fn get_group_list(&mut self, ctx: &Context) { self.common.call_graphql::( + ctx, get_group_list::Variables, Msg::GroupListResponse, "Error trying to fetch group list", ); } - fn submit_add_group(&mut self) -> Result { + fn submit_add_group(&mut self, ctx: &Context) -> Result { let group_id = match &self.selected_group { None => return Ok(false), Some(group) => group.id, }; self.common.call_graphql::( + ctx, add_user_to_group::Variables { - user: self.common.username.clone(), + user: ctx.props().username.clone(), group: group_id, }, Msg::AddGroupResponse, @@ -126,8 +130,8 @@ impl AddUserToGroupComponent { Ok(true) } - fn get_selectable_group_list(&self, group_list: &[Group]) -> Vec { - let user_groups = self.common.groups.iter().collect::>(); + fn get_selectable_group_list(&self, props: &Props, group_list: &[Group]) -> Vec { + let user_groups = props.groups.iter().collect::>(); group_list .iter() .filter(|g| !user_groups.contains(g)) @@ -139,32 +143,29 @@ impl AddUserToGroupComponent { impl Component for AddUserToGroupComponent { type Message = Msg; type Properties = Props; - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(ctx: &Context) -> Self { let mut res = Self { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), group_list: None, selected_group: None, }; - res.get_group_list(); + res.get_group_list(ctx); res } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { CommonComponentParts::::update_and_report_error( self, + ctx, msg, - self.common.on_error.clone(), + ctx.props().on_error.clone(), ) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { - let link = &self.common; + fn view(&self, ctx: &Context) -> Html { + let link = ctx.link(); if let Some(group_list) = &self.group_list { - let to_add_group_list = self.get_selectable_group_list(group_list); + let to_add_group_list = self.get_selectable_group_list(ctx.props(), group_list); #[allow(unused_braces)] let make_select_option = |group: Group| { html_nested! { diff --git a/app/src/components/app.rs b/app/src/components/app.rs index ed0d387..d2d48fb 100644 --- a/app/src/components/app.rs +++ b/app/src/components/app.rs @@ -9,7 +9,7 @@ use crate::{ logout::LogoutButton, reset_password_step1::ResetPasswordStep1Form, reset_password_step2::ResetPasswordStep2Form, - router::{AppRoute, Link, NavButton}, + router::{AppRoute, Link, Redirect}, user_details::UserDetails, user_table::UserTable, }, @@ -17,21 +17,31 @@ use crate::{ }; use gloo_console::error; -use yew::{prelude::*, services::fetch::FetchTask}; +use yew::{ + function_component, + html::Scope, + prelude::{html, Component, Html}, + Context, +}; use yew_router::{ - agent::{RouteAgentDispatcher, RouteRequest}, - route::Route, - router::Router, - service::RouteService, + prelude::{History, Location}, + scope_ext::RouterScopeExt, + BrowserRouter, Switch, }; +#[function_component(AppContainer)] +pub fn app_container() -> Html { + html! { + + + + } +} + pub struct App { - link: ComponentLink, user_info: Option<(String, bool)>, redirect_to: Option, - route_dispatcher: RouteAgentDispatcher, password_reset_enabled: Option, - task: Option, } pub enum Msg { @@ -44,9 +54,8 @@ impl Component for App { type Message = Msg; type Properties = (); - fn create(_: Self::Properties, link: ComponentLink) -> Self { - let mut app = Self { - link, + fn create(ctx: &Context) -> Self { + let app = Self { user_info: get_cookie("user_id") .unwrap_or_else(|e| { error!(&e.to_string()); @@ -60,48 +69,42 @@ impl Component for App { None }) }), - redirect_to: Self::get_redirect_route(), - route_dispatcher: RouteAgentDispatcher::new(), + redirect_to: Self::get_redirect_route(ctx), password_reset_enabled: None, - task: None, }; - app.task = Some( - HostService::probe_password_reset( - app.link.callback_once(Msg::PasswordResetProbeFinished), - ) - .unwrap(), - ); - app.apply_initial_redirections(); + let link = ctx.link().clone(); + wasm_bindgen_futures::spawn_local(async move { + let result = HostService::probe_password_reset().await; + link.send_message(Msg::PasswordResetProbeFinished(result)); + }); + app.apply_initial_redirections(ctx); app } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { + let history = ctx.link().history().unwrap(); match msg { Msg::Login((user_name, is_admin)) => { self.user_info = Some((user_name.clone(), is_admin)); - self.route_dispatcher - .send(RouteRequest::ChangeRoute(Route::from( - self.redirect_to.take().unwrap_or_else(|| { - if is_admin { - AppRoute::ListUsers - } else { - AppRoute::UserDetails(user_name.clone()) - } - }), - ))); + history.push(self.redirect_to.take().unwrap_or_else(|| { + if is_admin { + AppRoute::ListUsers + } else { + AppRoute::UserDetails { + user_id: user_name.clone(), + } + } + })); } Msg::Logout => { self.user_info = None; self.redirect_to = None; - self.route_dispatcher - .send(RouteRequest::ReplaceRoute(Route::from(AppRoute::Login))); + history.push(AppRoute::Login); } Msg::PasswordResetProbeFinished(Ok(enabled)) => { - self.task = None; self.password_reset_enabled = Some(enabled); } Msg::PasswordResetProbeFinished(Err(err)) => { - self.task = None; self.password_reset_enabled = Some(false); error!(&format!( "Could not probe for password reset support: {err:#}" @@ -111,24 +114,20 @@ impl Component for App { true } - fn change(&mut self, _: Self::Properties) -> ShouldRender { - false - } - - fn view(&self) -> Html { - let link = self.link.clone(); + fn view(&self, ctx: &Context) -> Html { + let link = ctx.link().clone(); let is_admin = self.is_admin(); let password_reset_enabled = self.password_reset_enabled; html! {
- {self.view_banner()} + {self.view_banner(ctx)}
-
- - render={Router::render(move |s| Self::dispatch_route(s, &link, is_admin, password_reset_enabled))} +
+ + render={Switch::render(move |routes| Self::dispatch_route(routes, &link, is_admin, password_reset_enabled))} /> -
+
{self.view_footer()}
@@ -138,59 +137,56 @@ impl Component for App { } impl App { - fn get_redirect_route() -> Option { - let route_service = RouteService::<()>::new(); - let current_route = route_service.get_path(); - if current_route.is_empty() - || current_route == "/" - || current_route.contains("login") - || current_route.contains("reset-password") - { - None - } else { - use yew_router::Switch; - AppRoute::from_route_part::<()>(current_route, None).0 - } + fn get_redirect_route(ctx: &Context) -> Option { + let history = ctx.link().history().unwrap(); + let route = history.location().route::(); + route.and_then(|route| match route { + AppRoute::Index + | AppRoute::Login + | AppRoute::StartResetPassword + | AppRoute::FinishResetPassword { token: _ } => None, + _ => Some(route), + }) } - fn apply_initial_redirections(&mut self) { - let route_service = RouteService::<()>::new(); - let current_route = route_service.get_path(); - if current_route.contains("reset-password") { - if self.password_reset_enabled == Some(false) { - self.route_dispatcher - .send(RouteRequest::ReplaceRoute(Route::from(AppRoute::Login))); - } - return; - } - match &self.user_info { - None => { - self.route_dispatcher - .send(RouteRequest::ReplaceRoute(Route::from(AppRoute::Login))); - } - Some((user_name, is_admin)) => match &self.redirect_to { - Some(url) => { - self.route_dispatcher - .send(RouteRequest::ReplaceRoute(Route::from(url.clone()))); + fn apply_initial_redirections(&self, ctx: &Context) { + let history = ctx.link().history().unwrap(); + let route = history.location().route::(); + let redirection = if let Some(route) = route { + if matches!( + route, + AppRoute::StartResetPassword | AppRoute::FinishResetPassword { token: _ } + ) && self.password_reset_enabled == Some(false) + { + Some(AppRoute::Login) + } else { + match &self.user_info { + None => Some(AppRoute::Login), + Some((user_name, is_admin)) => match &self.redirect_to { + Some(url) => Some(url.clone()), + None => { + if *is_admin { + Some(AppRoute::ListUsers) + } else { + Some(AppRoute::UserDetails { + user_id: user_name.clone(), + }) + } + } + }, } - None => { - if *is_admin { - self.route_dispatcher - .send(RouteRequest::ReplaceRoute(Route::from(AppRoute::ListUsers))); - } else { - self.route_dispatcher - .send(RouteRequest::ReplaceRoute(Route::from( - AppRoute::UserDetails(user_name.clone()), - ))); - } - } - }, + } + } else { + Some(AppRoute::Login) + }; + if let Some(redirect_to) = redirection { + history.push(redirect_to); } } fn dispatch_route( - switch: AppRoute, - link: &ComponentLink, + switch: &AppRoute, + link: &Scope, is_admin: bool, password_reset_enabled: Option, ) -> Html { @@ -204,10 +200,10 @@ impl App { AppRoute::Index | AppRoute::ListUsers => html! {
- + {"Create a user"} - +
}, AppRoute::CreateGroup => html! { @@ -216,41 +212,41 @@ impl App { AppRoute::ListGroups => html! {
- + {"Create a group"} - +
}, - AppRoute::GroupDetails(group_id) => html! { - + AppRoute::GroupDetails { group_id } => html! { + }, - AppRoute::UserDetails(username) => html! { - + AppRoute::UserDetails { user_id } => html! { + }, - AppRoute::ChangePassword(username) => html! { - + AppRoute::ChangePassword { user_id } => html! { + }, AppRoute::StartResetPassword => match password_reset_enabled { Some(true) => html! { }, Some(false) => { - App::dispatch_route(AppRoute::Login, link, is_admin, password_reset_enabled) + html! { } } None => html! {}, }, - AppRoute::FinishResetPassword(token) => match password_reset_enabled { - Some(true) => html! { }, + AppRoute::FinishResetPassword { token } => match password_reset_enabled { + Some(true) => html! { }, Some(false) => { - App::dispatch_route(AppRoute::Login, link, is_admin, password_reset_enabled) + html! { } } None => html! {}, }, } } - fn view_banner(&self) -> Html { - let link = &self.link; + fn view_banner(&self, ctx: &Context) -> Html { + let link = ctx.link(); html! {
@@ -265,7 +261,7 @@ impl App {
  • + to={AppRoute::ListUsers}> {"Users"} @@ -273,7 +269,7 @@ impl App {
  • + to={AppRoute::ListGroups}> {"Groups"} @@ -311,7 +307,7 @@ impl App {
  • + to={AppRoute::UserDetails{ user_id: user_id.clone() }}> {"View details"}
    • diff --git a/app/src/components/change_password.rs b/app/src/components/change_password.rs index 1e65046..d6d59d3 100644 --- a/app/src/components/change_password.rs +++ b/app/src/components/change_password.rs @@ -1,21 +1,18 @@ use crate::{ - components::router::{AppRoute, NavButton}, + components::router::{AppRoute, Link}, infra::{ api::HostService, common_component::{CommonComponent, CommonComponentParts}, }, }; -use anyhow::{anyhow, bail, Context, Result}; +use anyhow::{anyhow, bail, Result}; use gloo_console::error; use lldap_auth::*; use validator_derive::Validate; use yew::prelude::*; use yew_form::Form; use yew_form_derive::Model; -use yew_router::{ - agent::{RouteAgentDispatcher, RouteRequest}, - route::Route, -}; +use yew_router::{prelude::History, scope_ext::RouterScopeExt}; #[derive(PartialEq, Eq, Default)] enum OpaqueData { @@ -57,7 +54,6 @@ pub struct ChangePasswordForm { common: CommonComponentParts, form: Form, opaque_data: OpaqueData, - route_dispatcher: RouteAgentDispatcher, } #[derive(Clone, PartialEq, Eq, Properties)] @@ -76,15 +72,20 @@ pub enum Msg { } impl CommonComponent for ChangePasswordForm { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg( + &mut self, + ctx: &Context, + msg: ::Message, + ) -> Result { + use anyhow::Context; match msg { Msg::FormUpdate => Ok(true), Msg::Submit => { if !self.form.validate() { bail!("Check the form for errors"); } - if self.common.is_admin { - self.handle_msg(Msg::SubmitNewPassword) + if ctx.props().is_admin { + self.handle_msg(ctx, Msg::SubmitNewPassword) } else { let old_password = self.form.model().old_password; if old_password.is_empty() { @@ -96,14 +97,14 @@ impl CommonComponent for ChangePasswordForm { .context("Could not initialize login")?; self.opaque_data = OpaqueData::Login(login_start_request.state); let req = login::ClientLoginStartRequest { - username: self.common.username.clone(), + username: ctx.props().username.clone(), login_start_request: login_start_request.message, }; self.common.call_backend( - HostService::login_start, - req, + ctx, + HostService::login_start(req), Msg::AuthenticationStartResponse, - )?; + ); Ok(true) } } @@ -122,7 +123,7 @@ impl CommonComponent for ChangePasswordForm { } _ => panic!("Unexpected data in opaque_data field"), }; - self.handle_msg(Msg::SubmitNewPassword) + self.handle_msg(ctx, Msg::SubmitNewPassword) } Msg::SubmitNewPassword => { let mut rng = rand::rngs::OsRng; @@ -131,15 +132,15 @@ impl CommonComponent for ChangePasswordForm { opaque::client::registration::start_registration(&new_password, &mut rng) .context("Could not initiate password change")?; let req = registration::ClientRegistrationStartRequest { - username: self.common.username.clone(), + username: ctx.props().username.clone(), registration_start_request: registration_start_request.message, }; self.opaque_data = OpaqueData::Registration(registration_start_request.state); self.common.call_backend( - HostService::register_start, - req, + ctx, + HostService::register_start(req), Msg::RegistrationStartResponse, - )?; + ); Ok(true) } Msg::RegistrationStartResponse(res) => { @@ -159,22 +160,20 @@ impl CommonComponent for ChangePasswordForm { registration_upload: registration_finish.message, }; self.common.call_backend( - HostService::register_finish, - req, + ctx, + HostService::register_finish(req), Msg::RegistrationFinishResponse, - ) + ); } _ => panic!("Unexpected data in opaque_data field"), - }?; + }; Ok(false) } Msg::RegistrationFinishResponse(response) => { - self.common.cancel_task(); if response.is_ok() { - self.route_dispatcher - .send(RouteRequest::ChangeRoute(Route::from( - AppRoute::UserDetails(self.common.username.clone()), - ))); + ctx.link().history().unwrap().push(AppRoute::UserDetails { + user_id: ctx.props().username.clone(), + }); } response?; Ok(true) @@ -191,26 +190,21 @@ impl Component for ChangePasswordForm { type Message = Msg; type Properties = Props; - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(_: &Context) -> Self { ChangePasswordForm { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), form: yew_form::Form::::new(FormModel::default()), opaque_data: OpaqueData::None, - route_dispatcher: RouteAgentDispatcher::new(), } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { - CommonComponentParts::::update(self, msg) + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { + CommonComponentParts::::update(self, ctx, msg) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { - let is_admin = self.common.is_admin; - let link = &self.common; + fn view(&self, ctx: &Context) -> Html { + let is_admin = ctx.props().is_admin; + let link = ctx.link(); type Field = yew_form::Field; html! { <> @@ -305,12 +299,12 @@ impl Component for ChangePasswordForm { {"Save changes"} - + to={AppRoute::UserDetails{user_id: ctx.props().username.clone()}}> {"Back"} - +
    diff --git a/app/src/components/create_group.rs b/app/src/components/create_group.rs index c1b5f05..a7e6641 100644 --- a/app/src/components/create_group.rs +++ b/app/src/components/create_group.rs @@ -8,10 +8,7 @@ use graphql_client::GraphQLQuery; use validator_derive::Validate; use yew::prelude::*; use yew_form_derive::Model; -use yew_router::{ - agent::{RouteAgentDispatcher, RouteRequest}, - route::Route, -}; +use yew_router::{prelude::History, scope_ext::RouterScopeExt}; #[derive(GraphQLQuery)] #[graphql( @@ -24,7 +21,6 @@ pub struct CreateGroup; pub struct CreateGroupForm { common: CommonComponentParts, - route_dispatcher: RouteAgentDispatcher, form: yew_form::Form, } @@ -41,7 +37,11 @@ pub enum Msg { } impl CommonComponent for CreateGroupForm { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg( + &mut self, + ctx: &Context, + msg: ::Message, + ) -> Result { match msg { Msg::Update => Ok(true), Msg::SubmitForm => { @@ -53,6 +53,7 @@ impl CommonComponent for CreateGroupForm { name: model.groupname, }; self.common.call_graphql::( + ctx, req, Msg::CreateGroupResponse, "Error trying to create group", @@ -64,8 +65,7 @@ impl CommonComponent for CreateGroupForm { "Created group '{}'", &response?.create_group.display_name )); - self.route_dispatcher - .send(RouteRequest::ChangeRoute(Route::from(AppRoute::ListGroups))); + ctx.link().history().unwrap().push(AppRoute::ListGroups); Ok(true) } } @@ -80,24 +80,19 @@ impl Component for CreateGroupForm { type Message = Msg; type Properties = (); - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(_: &Context) -> Self { Self { - common: CommonComponentParts::::create(props, link), - route_dispatcher: RouteAgentDispatcher::new(), + common: CommonComponentParts::::create(), form: yew_form::Form::::new(CreateGroupModel::default()), } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { - CommonComponentParts::::update(self, msg) + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { + CommonComponentParts::::update(self, ctx, msg) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { - let link = &self.common; + fn view(&self, ctx: &Context) -> Html { + let link = ctx.link(); type Field = yew_form::Field; html! {
    diff --git a/app/src/components/create_user.rs b/app/src/components/create_user.rs index 7ee0fab..34de174 100644 --- a/app/src/components/create_user.rs +++ b/app/src/components/create_user.rs @@ -5,17 +5,14 @@ use crate::{ common_component::{CommonComponent, CommonComponentParts}, }, }; -use anyhow::{bail, Context, Result}; +use anyhow::{bail, Result}; use gloo_console::log; use graphql_client::GraphQLQuery; use lldap_auth::{opaque, registration}; use validator_derive::Validate; use yew::prelude::*; use yew_form_derive::Model; -use yew_router::{ - agent::{RouteAgentDispatcher, RouteRequest}, - route::Route, -}; +use yew_router::{prelude::History, scope_ext::RouterScopeExt}; #[derive(GraphQLQuery)] #[graphql( @@ -28,7 +25,6 @@ pub struct CreateUser; pub struct CreateUserForm { common: CommonComponentParts, - route_dispatcher: RouteAgentDispatcher, form: yew_form::Form, } @@ -73,7 +69,11 @@ pub enum Msg { } impl CommonComponent for CreateUserForm { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg( + &mut self, + ctx: &Context, + msg: ::Message, + ) -> Result { match msg { Msg::Update => Ok(true), Msg::SubmitForm => { @@ -93,6 +93,7 @@ impl CommonComponent for CreateUserForm { }, }; self.common.call_graphql::( + ctx, req, Msg::CreateUserResponse, "Error trying to create user", @@ -122,12 +123,11 @@ impl CommonComponent for CreateUserForm { registration_start_request: message, }; self.common - .call_backend(HostService::register_start, req, move |r| { + .call_backend(ctx, HostService::register_start(req), move |r| { Msg::RegistrationStartResponse((state, r)) - }) - .context("Error trying to create user")?; + }); } else { - self.update(Msg::SuccessfulCreation); + self.update(ctx, Msg::SuccessfulCreation); } Ok(false) } @@ -143,22 +143,19 @@ impl CommonComponent for CreateUserForm { server_data: response.server_data, registration_upload: registration_upload.message, }; - self.common - .call_backend( - HostService::register_finish, - req, - Msg::RegistrationFinishResponse, - ) - .context("Error trying to register user")?; + self.common.call_backend( + ctx, + HostService::register_finish(req), + Msg::RegistrationFinishResponse, + ); Ok(false) } Msg::RegistrationFinishResponse(response) => { response?; - self.handle_msg(Msg::SuccessfulCreation) + self.handle_msg(ctx, Msg::SuccessfulCreation) } Msg::SuccessfulCreation => { - self.route_dispatcher - .send(RouteRequest::ChangeRoute(Route::from(AppRoute::ListUsers))); + ctx.link().history().unwrap().push(AppRoute::ListUsers); Ok(true) } } @@ -173,24 +170,19 @@ impl Component for CreateUserForm { type Message = Msg; type Properties = (); - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(_: &Context) -> Self { Self { - common: CommonComponentParts::::create(props, link), - route_dispatcher: RouteAgentDispatcher::new(), + common: CommonComponentParts::::create(), form: yew_form::Form::::new(CreateUserModel::default()), } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { - CommonComponentParts::::update(self, msg) + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { + CommonComponentParts::::update(self, ctx, msg) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { - let link = &self.common; + fn view(&self, ctx: &Context) -> Html { + let link = &ctx.link(); type Field = yew_form::Field; html! {
    diff --git a/app/src/components/delete_group.rs b/app/src/components/delete_group.rs index 0934976..1fe3ce9 100644 --- a/app/src/components/delete_group.rs +++ b/app/src/components/delete_group.rs @@ -39,16 +39,21 @@ pub enum Msg { } impl CommonComponent for DeleteGroup { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg( + &mut self, + ctx: &Context, + msg: ::Message, + ) -> Result { match msg { Msg::ClickedDeleteGroup => { self.modal.as_ref().expect("modal not initialized").show(); } Msg::ConfirmDeleteGroup => { - self.update(Msg::DismissModal); + self.update(ctx, Msg::DismissModal); self.common.call_graphql::( + ctx, delete_group_query::Variables { - group_id: self.common.group.id, + group_id: ctx.props().group.id, }, Msg::DeleteGroupResponse, "Error trying to delete group", @@ -58,12 +63,8 @@ impl CommonComponent for DeleteGroup { self.modal.as_ref().expect("modal not initialized").hide(); } Msg::DeleteGroupResponse(response) => { - self.common.cancel_task(); response?; - self.common - .props - .on_group_deleted - .emit(self.common.group.id); + ctx.props().on_group_deleted.emit(ctx.props().group.id); } } Ok(true) @@ -78,15 +79,15 @@ impl Component for DeleteGroup { type Message = Msg; type Properties = DeleteGroupProps; - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(_: &Context) -> Self { Self { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), node_ref: NodeRef::default(), modal: None, } } - fn rendered(&mut self, first_render: bool) { + fn rendered(&mut self, _: &Context, first_render: bool) { if first_render { self.modal = Some(Modal::new( self.node_ref @@ -96,20 +97,17 @@ impl Component for DeleteGroup { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { CommonComponentParts::::update_and_report_error( self, + ctx, msg, - self.common.on_error.clone(), + ctx.props().on_error.clone(), ) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { - let link = &self.common; + fn view(&self, ctx: &Context) -> Html { + let link = &ctx.link(); html! { <> - {self.show_modal()} + {self.show_modal(ctx)} } } } impl DeleteGroup { - fn show_modal(&self) -> Html { - let link = &self.common; + fn show_modal(&self, ctx: &Context) -> Html { + let link = &ctx.link(); html! {
    diff --git a/app/src/components/delete_user.rs b/app/src/components/delete_user.rs index a7711ce..56d3f07 100644 --- a/app/src/components/delete_user.rs +++ b/app/src/components/delete_user.rs @@ -36,16 +36,21 @@ pub enum Msg { } impl CommonComponent for DeleteUser { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg( + &mut self, + ctx: &Context, + msg: ::Message, + ) -> Result { match msg { Msg::ClickedDeleteUser => { self.modal.as_ref().expect("modal not initialized").show(); } Msg::ConfirmDeleteUser => { - self.update(Msg::DismissModal); + self.update(ctx, Msg::DismissModal); self.common.call_graphql::( + ctx, delete_user_query::Variables { - user: self.common.username.clone(), + user: ctx.props().username.clone(), }, Msg::DeleteUserResponse, "Error trying to delete user", @@ -55,12 +60,10 @@ impl CommonComponent for DeleteUser { self.modal.as_ref().expect("modal not initialized").hide(); } Msg::DeleteUserResponse(response) => { - self.common.cancel_task(); response?; - self.common - .props + ctx.props() .on_user_deleted - .emit(self.common.username.clone()); + .emit(ctx.props().username.clone()); } } Ok(true) @@ -75,15 +78,15 @@ impl Component for DeleteUser { type Message = Msg; type Properties = DeleteUserProps; - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(_: &Context) -> Self { Self { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), node_ref: NodeRef::default(), modal: None, } } - fn rendered(&mut self, first_render: bool) { + fn rendered(&mut self, _: &Context, first_render: bool) { if first_render { self.modal = Some(Modal::new( self.node_ref @@ -93,20 +96,17 @@ impl Component for DeleteUser { } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { CommonComponentParts::::update_and_report_error( self, + ctx, msg, - self.common.on_error.clone(), + ctx.props().on_error.clone(), ) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { - let link = &self.common; + fn view(&self, ctx: &Context) -> Html { + let link = &ctx.link(); html! { <> - {self.show_modal()} + {self.show_modal(ctx)} } } } impl DeleteUser { - fn show_modal(&self) -> Html { - let link = &self.common; + fn show_modal(&self, ctx: &Context) -> Html { + let link = &ctx.link(); html! {
    diff --git a/app/src/components/group_details.rs b/app/src/components/group_details.rs index c6699e1..ae32436 100644 --- a/app/src/components/group_details.rs +++ b/app/src/components/group_details.rs @@ -46,10 +46,11 @@ pub struct Props { } impl GroupDetails { - fn get_group_details(&mut self) { + fn get_group_details(&mut self, ctx: &Context) { self.common.call_graphql::( + ctx, get_group_details::Variables { - id: self.common.group_id, + id: ctx.props().group_id, }, Msg::GroupDetailsResponse, "Error trying to fetch group details", @@ -107,14 +108,15 @@ impl GroupDetails { } } - fn view_user_list(&self, g: &Group) -> Html { + fn view_user_list(&self, ctx: &Context, g: &Group) -> Html { + let link = ctx.link(); let make_user_row = |user: &User| { let user_id = user.id.clone(); let display_name = user.display_name.clone(); html! { - + {user_id.clone()} @@ -123,8 +125,8 @@ impl GroupDetails { + on_user_removed_from_group={link.callback(Msg::OnUserRemovedFromGroup)} + on_error={link.callback(Msg::OnError)}/> } @@ -159,7 +161,8 @@ impl GroupDetails { } } - fn view_add_user_button(&self, g: &Group) -> Html { + fn view_add_user_button(&self, ctx: &Context, g: &Group) -> Html { + let link = ctx.link(); let users: Vec<_> = g .users .iter() @@ -172,14 +175,14 @@ impl GroupDetails { + on_error={link.callback(Msg::OnError)} + on_user_added_to_group={link.callback(Msg::OnUserAddedToGroup)}/> } } } impl CommonComponent for GroupDetails { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg(&mut self, _: &Context, msg: ::Message) -> Result { match msg { Msg::GroupDetailsResponse(response) => match response { Ok(group) => self.group = Some(group.group), @@ -215,24 +218,20 @@ impl Component for GroupDetails { type Message = Msg; type Properties = Props; - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(ctx: &Context) -> Self { let mut table = Self { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), group: None, }; - table.get_group_details(); + table.get_group_details(ctx); table } - fn update(&mut self, msg: Self::Message) -> ShouldRender { - CommonComponentParts::::update(self, msg) + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { + CommonComponentParts::::update(self, ctx, msg) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { + fn view(&self, ctx: &Context) -> Html { match (&self.group, &self.common.error) { (None, None) => html! {{"Loading..."}}, (None, Some(e)) => html! {
    {"Error: "}{e.to_string()}
    }, @@ -240,8 +239,8 @@ impl Component for GroupDetails { html! {
    {self.view_details(u)} - {self.view_user_list(u)} - {self.view_add_user_button(u)} + {self.view_user_list(ctx, u)} + {self.view_add_user_button(ctx, u)} {self.view_messages(error)}
    } diff --git a/app/src/components/group_table.rs b/app/src/components/group_table.rs index 7eb47cc..890f0c2 100644 --- a/app/src/components/group_table.rs +++ b/app/src/components/group_table.rs @@ -34,7 +34,7 @@ pub enum Msg { } impl CommonComponent for GroupTable { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg(&mut self, _: &Context, msg: ::Message) -> Result { match msg { Msg::ListGroupsResponse(groups) => { self.groups = Some(groups?.groups.into_iter().collect()); @@ -58,12 +58,13 @@ impl Component for GroupTable { type Message = Msg; type Properties = (); - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(ctx: &Context) -> Self { let mut table = GroupTable { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), groups: None, }; table.common.call_graphql::( + ctx, get_group_list::Variables {}, Msg::ListGroupsResponse, "Error trying to fetch groups", @@ -71,18 +72,14 @@ impl Component for GroupTable { table } - fn update(&mut self, msg: Self::Message) -> ShouldRender { - CommonComponentParts::::update(self, msg) + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { + CommonComponentParts::::update(self, ctx, msg) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { + fn view(&self, ctx: &Context) -> Html { html! {
    - {self.view_groups()} + {self.view_groups(ctx)} {self.view_errors()}
    } @@ -90,7 +87,7 @@ impl Component for GroupTable { } impl GroupTable { - fn view_groups(&self) -> Html { + fn view_groups(&self, ctx: &Context) -> Html { let make_table = |groups: &Vec| { html! {
    @@ -103,7 +100,7 @@ impl GroupTable { - {groups.iter().map(|u| self.view_group(u)).collect::>()} + {groups.iter().map(|u| self.view_group(ctx, u)).collect::>()}
    @@ -115,11 +112,12 @@ impl GroupTable { } } - fn view_group(&self, group: &Group) -> Html { + fn view_group(&self, ctx: &Context, group: &Group) -> Html { + let link = ctx.link(); html! { - + {&group.display_name} @@ -129,8 +127,8 @@ impl GroupTable { + on_group_deleted={link.callback(Msg::OnGroupDeleted)} + on_error={link.callback(Msg::OnError)}/> } diff --git a/app/src/components/login.rs b/app/src/components/login.rs index 932eaa9..91bf41f 100644 --- a/app/src/components/login.rs +++ b/app/src/components/login.rs @@ -1,12 +1,12 @@ use crate::{ - components::router::{AppRoute, NavButton}, + components::router::{AppRoute, Link}, infra::{ api::HostService, common_component::{CommonComponent, CommonComponentParts}, }, }; -use anyhow::{anyhow, bail, Context, Result}; -use gloo_console::{debug, error}; +use anyhow::{anyhow, bail, Result}; +use gloo_console::error; use lldap_auth::*; use validator_derive::Validate; use yew::prelude::*; @@ -48,7 +48,12 @@ pub enum Msg { } impl CommonComponent for LoginForm { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg( + &mut self, + ctx: &Context, + msg: ::Message, + ) -> Result { + use anyhow::Context; match msg { Msg::Update => Ok(true), Msg::Submit => { @@ -65,9 +70,9 @@ impl CommonComponent for LoginForm { login_start_request: message, }; self.common - .call_backend(HostService::login_start, req, move |r| { + .call_backend(ctx, HostService::login_start(req), move |r| { Msg::AuthenticationStartResponse((state, r)) - })?; + }); Ok(true) } Msg::AuthenticationStartResponse((login_start, res)) => { @@ -80,7 +85,6 @@ impl CommonComponent for LoginForm { // simple one to the user. error!(&format!("Invalid username or password: {}", e)); self.common.error = Some(anyhow!("Invalid username or password")); - self.common.cancel_task(); return Ok(true); } Ok(l) => l, @@ -90,24 +94,22 @@ impl CommonComponent for LoginForm { credential_finalization: login_finish.message, }; self.common.call_backend( - HostService::login_finish, - req, + ctx, + HostService::login_finish(req), Msg::AuthenticationFinishResponse, - )?; + ); Ok(false) } Msg::AuthenticationFinishResponse(user_info) => { - self.common.cancel_task(); - self.common + ctx.props() .on_logged_in .emit(user_info.context("Could not log in")?); Ok(true) } Msg::AuthenticationRefreshResponse(user_info) => { self.refreshing = false; - self.common.cancel_task(); if let Ok(user_info) = user_info { - self.common.on_logged_in.emit(user_info); + ctx.props().on_logged_in.emit(user_info); } Ok(true) } @@ -123,34 +125,28 @@ impl Component for LoginForm { type Message = Msg; type Properties = Props; - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(ctx: &Context) -> Self { let mut app = LoginForm { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), form: Form::::new(FormModel::default()), refreshing: true, }; - if let Err(e) = - app.common - .call_backend(HostService::refresh, (), Msg::AuthenticationRefreshResponse) - { - debug!(&format!("Could not refresh auth: {}", e)); - app.refreshing = false; - } + app.common.call_backend( + ctx, + HostService::refresh(), + Msg::AuthenticationRefreshResponse, + ); app } - fn update(&mut self, msg: Self::Message) -> ShouldRender { - CommonComponentParts::::update(self, msg) + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { + CommonComponentParts::::update(self, ctx, msg) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { + fn view(&self, ctx: &Context) -> Html { type Field = yew_form::Field; - let password_reset_enabled = self.common.password_reset_enabled; - let link = &self.common; + let password_reset_enabled = ctx.props().password_reset_enabled; + let link = &ctx.link(); if self.refreshing { html! {
    @@ -204,12 +200,12 @@ impl Component for LoginForm { { if password_reset_enabled { html! { - + to={AppRoute::StartResetPassword}> {"Forgot your password?"} - + } } else { html!{} diff --git a/app/src/components/logout.rs b/app/src/components/logout.rs index 85d510c..ef96b1e 100644 --- a/app/src/components/logout.rs +++ b/app/src/components/logout.rs @@ -21,16 +21,20 @@ pub enum Msg { } impl CommonComponent for LogoutButton { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg( + &mut self, + ctx: &Context, + msg: ::Message, + ) -> Result { match msg { Msg::LogoutRequested => { self.common - .call_backend(HostService::logout, (), Msg::LogoutCompleted)?; + .call_backend(ctx, HostService::logout(), Msg::LogoutCompleted); } Msg::LogoutCompleted(res) => { res?; delete_cookie("user_id")?; - self.common.on_logged_out.emit(()); + ctx.props().on_logged_out.emit(()); } } Ok(false) @@ -45,22 +49,18 @@ impl Component for LogoutButton { type Message = Msg; type Properties = Props; - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(_: &Context) -> Self { LogoutButton { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { - CommonComponentParts::::update(self, msg) + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { + CommonComponentParts::::update(self, ctx, msg) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { - let link = &self.common; + fn view(&self, ctx: &Context) -> Html { + let link = &ctx.link(); html! { - + to={AppRoute::Login}> {"Back"} - +
    } }} diff --git a/app/src/components/reset_password_step2.rs b/app/src/components/reset_password_step2.rs index 9f82547..5a75cc2 100644 --- a/app/src/components/reset_password_step2.rs +++ b/app/src/components/reset_password_step2.rs @@ -1,11 +1,11 @@ use crate::{ - components::router::{AppRoute, NavButton}, + components::router::{AppRoute, Link}, infra::{ api::HostService, common_component::{CommonComponent, CommonComponentParts}, }, }; -use anyhow::{bail, Context, Result}; +use anyhow::{bail, Result}; use lldap_auth::{ opaque::client::registration as opaque_registration, password_reset::ServerPasswordResetResponse, registration, @@ -14,10 +14,7 @@ use validator_derive::Validate; use yew::prelude::*; use yew_form::Form; use yew_form_derive::Model; -use yew_router::{ - agent::{RouteAgentDispatcher, RouteRequest}, - route::Route, -}; +use yew_router::{prelude::History, scope_ext::RouterScopeExt}; /// The fields of the form, with the constraints. #[derive(Model, Validate, PartialEq, Eq, Clone, Default)] @@ -33,7 +30,6 @@ pub struct ResetPasswordStep2Form { form: Form, username: Option, opaque_data: Option, - route_dispatcher: RouteAgentDispatcher, } #[derive(Clone, PartialEq, Eq, Properties)] @@ -50,11 +46,15 @@ pub enum Msg { } impl CommonComponent for ResetPasswordStep2Form { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg( + &mut self, + ctx: &Context, + msg: ::Message, + ) -> Result { + use anyhow::Context; match msg { Msg::ValidateTokenResponse(response) => { self.username = Some(response?.user_id); - self.common.cancel_task(); Ok(true) } Msg::FormUpdate => Ok(true), @@ -73,10 +73,10 @@ impl CommonComponent for ResetPasswordStep2Form { }; self.opaque_data = Some(registration_start_request.state); self.common.call_backend( - HostService::register_start, - req, + ctx, + HostService::register_start(req), Msg::RegistrationStartResponse, - )?; + ); Ok(true) } Msg::RegistrationStartResponse(res) => { @@ -94,17 +94,15 @@ impl CommonComponent for ResetPasswordStep2Form { registration_upload: registration_finish.message, }; self.common.call_backend( - HostService::register_finish, - req, + ctx, + HostService::register_finish(req), Msg::RegistrationFinishResponse, - )?; + ); Ok(false) } Msg::RegistrationFinishResponse(response) => { - self.common.cancel_task(); if response.is_ok() { - self.route_dispatcher - .send(RouteRequest::ChangeRoute(Route::from(AppRoute::Login))); + ctx.link().history().unwrap().push(AppRoute::Login); } response?; Ok(true) @@ -121,36 +119,28 @@ impl Component for ResetPasswordStep2Form { type Message = Msg; type Properties = Props; - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(ctx: &Context) -> Self { let mut component = ResetPasswordStep2Form { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), form: yew_form::Form::::new(FormModel::default()), opaque_data: None, - route_dispatcher: RouteAgentDispatcher::new(), username: None, }; - let token = component.common.token.clone(); - component - .common - .call_backend( - HostService::reset_password_step2, - &token, - Msg::ValidateTokenResponse, - ) - .unwrap(); + let token = ctx.props().token.clone(); + component.common.call_backend( + ctx, + HostService::reset_password_step2(token), + Msg::ValidateTokenResponse, + ); component } - fn update(&mut self, msg: Self::Message) -> ShouldRender { - CommonComponentParts::::update(self, msg) + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { + CommonComponentParts::::update(self, ctx, msg) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { - let link = &self.common; + fn view(&self, ctx: &Context) -> Html { + let link = &ctx.link(); match (&self.username, &self.common.error) { (None, None) => { return html! { @@ -163,12 +153,12 @@ impl Component for ResetPasswordStep2Form {
    {e.to_string() }
    - + to={AppRoute::Login}> {"Back"} - + } } diff --git a/app/src/components/router.rs b/app/src/components/router.rs index 25dd2f2..3b03b61 100644 --- a/app/src/components/router.rs +++ b/app/src/components/router.rs @@ -1,34 +1,30 @@ -use yew_router::{ - components::{RouterAnchor, RouterButton}, - Switch, -}; +use yew_router::Routable; -#[derive(Switch, Debug, Clone)] +#[derive(Routable, Debug, Clone, PartialEq)] pub enum AppRoute { - #[to = "/login"] + #[at("/login")] Login, - #[to = "/reset-password/step1"] + #[at("/reset-password/step1")] StartResetPassword, - #[to = "/reset-password/step2/{token}"] - FinishResetPassword(String), - #[to = "/users/create"] + #[at("/reset-password/step2/:token")] + FinishResetPassword { token: String }, + #[at("/users/create")] CreateUser, - #[to = "/users"] + #[at("/users")] ListUsers, - #[to = "/user/{user_id}/password"] - ChangePassword(String), - #[to = "/user/{user_id}"] - UserDetails(String), - #[to = "/groups/create"] + #[at("/user/:user_id/password")] + ChangePassword { user_id: String }, + #[at("/user/:user_id")] + UserDetails { user_id: String }, + #[at("/groups/create")] CreateGroup, - #[to = "/groups"] + #[at("/groups")] ListGroups, - #[to = "/group/{group_id}"] - GroupDetails(i64), - #[to = "/"] + #[at("/group/:group_id")] + GroupDetails { group_id: i64 }, + #[at("/")] Index, } -pub type Link = RouterAnchor; - -pub type NavButton = RouterButton; +pub type Link = yew_router::components::Link; +pub type Redirect = yew_router::components::Redirect; diff --git a/app/src/components/select.rs b/app/src/components/select.rs index b057638..0349dbf 100644 --- a/app/src/components/select.rs +++ b/app/src/components/select.rs @@ -1,9 +1,6 @@ -use yew::{html::ChangeData, prelude::*}; -use yewtil::NeqAssign; +use yew::prelude::*; pub struct Select { - link: ComponentLink, - props: SelectProps, node_ref: NodeRef, } @@ -14,72 +11,60 @@ pub struct SelectProps { } pub enum SelectMsg { - OnSelectChange(ChangeData), + OnSelectChange, } impl Select { - fn get_nth_child_props(&self, nth: i32) -> Option { + fn get_nth_child_props(&self, ctx: &Context, nth: i32) -> Option { if nth == -1 { return None; } - self.props + ctx.props() .children .iter() .nth(nth as usize) - .map(|child| child.props) + .map(|child| (*child.props).clone()) } - fn send_selection_update(&self) { + fn send_selection_update(&self, ctx: &Context) { let select_node = self.node_ref.cast::().unwrap(); - self.props + ctx.props() .on_selection_change - .emit(self.get_nth_child_props(select_node.selected_index())) + .emit(self.get_nth_child_props(ctx, select_node.selected_index())) } } impl Component for Select { type Message = SelectMsg; type Properties = SelectProps; - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(_: &Context) -> Self { Self { - link, - props, node_ref: NodeRef::default(), } } - fn rendered(&mut self, _first_render: bool) { - self.send_selection_update(); + fn rendered(&mut self, ctx: &Context, _first_render: bool) { + self.send_selection_update(ctx); } - fn update(&mut self, msg: Self::Message) -> ShouldRender { - let SelectMsg::OnSelectChange(data) = msg; - match data { - ChangeData::Select(_) => self.send_selection_update(), - _ => unreachable!(), - } + fn update(&mut self, ctx: &Context, _: Self::Message) -> bool { + self.send_selection_update(ctx); false } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.props.children.neq_assign(props.children) - } - - fn view(&self) -> Html { + fn view(&self, ctx: &Context) -> Html { html! { } } } -pub struct SelectOption { - props: SelectOptionProps, -} +pub struct SelectOption; #[derive(yew::Properties, Clone, PartialEq, Eq, Debug)] pub struct SelectOptionProps { @@ -91,22 +76,18 @@ impl Component for SelectOption { type Message = (); type Properties = SelectOptionProps; - fn create(props: Self::Properties, _: ComponentLink) -> Self { - Self { props } + fn create(_: &Context) -> Self { + Self } - fn update(&mut self, _: Self::Message) -> ShouldRender { + fn update(&mut self, _: &Context, _: Self::Message) -> bool { false } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.props.neq_assign(props) - } - - fn view(&self) -> Html { + fn view(&self, ctx: &Context) -> Html { html! { - } } diff --git a/app/src/components/user_details.rs b/app/src/components/user_details.rs index 3b0cd29..f11ac4c 100644 --- a/app/src/components/user_details.rs +++ b/app/src/components/user_details.rs @@ -2,7 +2,7 @@ use crate::{ components::{ add_user_to_group::AddUserToGroupComponent, remove_user_from_group::RemoveUserFromGroupComponent, - router::{AppRoute, Link, NavButton}, + router::{AppRoute, Link}, user_details_form::UserDetailsForm, }, infra::common_component::{CommonComponent, CommonComponentParts}, @@ -47,7 +47,7 @@ pub struct Props { } impl CommonComponent for UserDetails { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg(&mut self, _: &Context, msg: ::Message) -> Result { match msg { Msg::UserDetailsResponse(response) => match response { Ok(user) => self.user = Some(user.user), @@ -77,10 +77,11 @@ impl CommonComponent for UserDetails { } impl UserDetails { - fn get_user_details(&mut self) { + fn get_user_details(&mut self, ctx: &Context) { self.common.call_graphql::( + ctx, get_user_details::Variables { - id: self.common.username.clone(), + id: ctx.props().username.clone(), }, Msg::UserDetailsResponse, "Error trying to fetch user details", @@ -99,16 +100,16 @@ impl UserDetails { } } - fn view_group_memberships(&self, u: &User) -> Html { - let link = &self.common; + fn view_group_memberships(&self, ctx: &Context, u: &User) -> Html { + let link = &ctx.link(); let make_group_row = |group: &Group| { let display_name = group.display_name.clone(); html! { - {if self.common.is_admin { html! { + {if ctx.props().is_admin { html! { <> - + {&group.display_name} @@ -134,7 +135,7 @@ impl UserDetails { {"Group"} - { if self.common.is_admin { html!{ }} else { html!{} }} + { if ctx.props().is_admin { html!{ }} else { html!{} }} @@ -154,9 +155,9 @@ impl UserDetails { } } - fn view_add_group_button(&self, u: &User) -> Html { - let link = &self.common; - if self.common.is_admin { + fn view_add_group_button(&self, ctx: &Context, u: &User) -> Html { + let link = &ctx.link(); + if ctx.props().is_admin { html! { ) -> Self { + fn create(ctx: &Context) -> Self { let mut table = Self { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), user: None, }; - table.get_user_details(); + table.get_user_details(ctx); table } - fn update(&mut self, msg: Self::Message) -> ShouldRender { - CommonComponentParts::::update(self, msg) + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { + CommonComponentParts::::update(self, ctx, msg) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { + fn view(&self, ctx: &Context) -> Html { match (&self.user, &self.common.error) { (None, None) => html! {{"Loading..."}}, (None, Some(e)) => html! {
    {"Error: "}{e.to_string()}
    }, @@ -200,19 +197,19 @@ impl Component for UserDetails { <>

    {u.id.to_string()}

    - {"Modify password"} - +
    {"User details"}
    - {self.view_group_memberships(u)} - {self.view_add_group_button(u)} + {self.view_group_memberships(ctx, u)} + {self.view_add_group_button(ctx, u)} {self.view_messages(error)} } diff --git a/app/src/components/user_details_form.rs b/app/src/components/user_details_form.rs index a320e77..3ad9530 100644 --- a/app/src/components/user_details_form.rs +++ b/app/src/components/user_details_form.rs @@ -5,15 +5,19 @@ use crate::{ infra::common_component::{CommonComponent, CommonComponentParts}, }; use anyhow::{bail, Error, Result}; +use gloo_file::{ + callbacks::{read_as_bytes, FileReader}, + File, +}; use graphql_client::GraphQLQuery; use validator_derive::Validate; -use wasm_bindgen::JsCast; +use web_sys::{FileList, HtmlInputElement, InputEvent}; use yew::prelude::*; use yew_form_derive::Model; -#[derive(PartialEq, Eq, Clone, Default)] +#[derive(Default)] struct JsFile { - file: Option, + file: Option, contents: Option>, } @@ -21,7 +25,7 @@ impl ToString for JsFile { fn to_string(&self) -> String { self.file .as_ref() - .map(web_sys::File::name) + .map(File::name) .unwrap_or_else(String::new) } } @@ -64,17 +68,21 @@ pub struct UserDetailsForm { common: CommonComponentParts, form: yew_form::Form, avatar: JsFile, + reader: Option, /// True if we just successfully updated the user, to display a success message. just_updated: bool, + user: User, } pub enum Msg { /// A form field changed. Update, + /// A new file was selected. + FileSelected(File), /// The "Submit" button was clicked. SubmitClicked, /// A picked file finished loading. - FileLoaded(yew::services::reader::FileData), + FileLoaded(String, Result>), /// We got the response from the server about our update message. UserUpdated(Result), } @@ -86,50 +94,47 @@ pub struct Props { } impl CommonComponent for UserDetailsForm { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg( + &mut self, + ctx: &Context, + msg: ::Message, + ) -> Result { match msg { - Msg::Update => { - let window = web_sys::window().expect("no global `window` exists"); - let document = window.document().expect("should have a document on window"); - let input = document - .get_element_by_id("avatarInput") - .expect("Form field avatarInput should be present") - .dyn_into::() - .expect("Should be an HtmlInputElement"); - if let Some(files) = input.files() { - if files.length() > 0 { - let new_avatar = JsFile { - file: files.item(0), - contents: None, - }; - if self.avatar.file.as_ref().map(|f| f.name()) - != new_avatar.file.as_ref().map(|f| f.name()) - { - if let Some(ref file) = new_avatar.file { - self.mut_common().read_file(file.clone(), Msg::FileLoaded)?; - } - self.avatar = new_avatar; - } - } + Msg::Update => Ok(true), + Msg::FileSelected(new_avatar) => { + if self.avatar.file.as_ref().map(|f| f.name()) != Some(new_avatar.name()) { + let file_name = new_avatar.name(); + let link = ctx.link().clone(); + self.reader = Some(read_as_bytes(&new_avatar, move |res| { + link.send_message(Msg::FileLoaded( + file_name, + res.map_err(|e| anyhow::anyhow!("{:#}", e)), + )) + })); + self.avatar = JsFile { + file: Some(new_avatar), + contents: None, + }; } Ok(true) } - Msg::SubmitClicked => self.submit_user_update_form(), + Msg::SubmitClicked => self.submit_user_update_form(ctx), Msg::UserUpdated(response) => self.user_update_finished(response), - Msg::FileLoaded(data) => { - self.common.cancel_task(); + Msg::FileLoaded(file_name, data) => { if let Some(file) = &self.avatar.file { - if file.name() == data.name { - if !is_valid_jpeg(data.content.as_slice()) { + if file.name() == file_name { + let data = data?; + if !is_valid_jpeg(data.as_slice()) { // Clear the selection. self.avatar = JsFile::default(); bail!("Chosen image is not a valid JPEG"); } else { - self.avatar.contents = Some(data.content); + self.avatar.contents = Some(data); return Ok(true); } } } + self.reader = None; Ok(false) } } @@ -144,38 +149,36 @@ impl Component for UserDetailsForm { type Message = Msg; type Properties = Props; - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(ctx: &Context) -> Self { let model = UserModel { - email: props.user.email.clone(), - display_name: props.user.display_name.clone(), - first_name: props.user.first_name.clone(), - last_name: props.user.last_name.clone(), + email: ctx.props().user.email.clone(), + display_name: ctx.props().user.display_name.clone(), + first_name: ctx.props().user.first_name.clone(), + last_name: ctx.props().user.last_name.clone(), }; Self { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), form: yew_form::Form::new(model), avatar: JsFile::default(), just_updated: false, + reader: None, + user: ctx.props().user.clone(), } } - fn update(&mut self, msg: Self::Message) -> ShouldRender { + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { self.just_updated = false; - CommonComponentParts::::update(self, msg) + CommonComponentParts::::update(self, ctx, msg) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { + fn view(&self, ctx: &Context) -> Html { type Field = yew_form::Field; - let link = &self.common; + let link = &ctx.link(); let avatar_base64 = maybe_to_base64(&self.avatar).unwrap_or_default(); let avatar_string = avatar_base64 .as_deref() - .or(self.common.user.avatar.as_deref()) + .or(self.user.avatar.as_deref()) .unwrap_or(""); html! {
    @@ -186,7 +189,7 @@ impl Component for UserDetailsForm { {"User ID: "}
    - {&self.common.user.id} + {&self.user.id}
    @@ -195,7 +198,7 @@ impl Component for UserDetailsForm { {"Creation date: "}
    - {&self.common.user.creation_date.naive_local().date()} + {&self.user.creation_date.naive_local().date()}
    @@ -204,7 +207,7 @@ impl Component for UserDetailsForm { {"UUID: "}
    - {&self.common.user.uuid} + {&self.user.uuid}
    @@ -294,7 +297,10 @@ impl Component for UserDetailsForm { id="avatarInput" type="file" accept="image/jpeg" - oninput={link.callback(|_| Msg::Update)} /> + oninput={link.callback(|e: InputEvent| { + let input: HtmlInputElement = e.target_unchecked_into(); + Self::upload_files(input.files()) + })} />
    Result { + fn submit_user_update_form(&mut self, ctx: &Context) -> Result { if !self.form.validate() { bail!("Invalid inputs"); } @@ -346,9 +352,9 @@ impl UserDetailsForm { { bail!("Image file hasn't finished loading, try again"); } - let base_user = &self.common.user; + let base_user = &self.user; let mut user_input = update_user::UpdateUserInput { - id: self.common.user.id.clone(), + id: self.user.id.clone(), email: None, displayName: None, firstName: None, @@ -377,6 +383,7 @@ impl UserDetailsForm { } let req = update_user::Variables { user: user_input }; self.common.call_graphql::( + ctx, req, Msg::UserUpdated, "Error trying to update user", @@ -385,23 +392,30 @@ impl UserDetailsForm { } fn user_update_finished(&mut self, r: Result) -> Result { - self.common.cancel_task(); - match r { - Err(e) => return Err(e), - Ok(_) => { - let model = self.form.model(); - self.common.user.email = model.email; - self.common.user.display_name = model.display_name; - self.common.user.first_name = model.first_name; - self.common.user.last_name = model.last_name; - if let Some(avatar) = maybe_to_base64(&self.avatar)? { - self.common.user.avatar = Some(avatar); - } - self.just_updated = true; - } - }; + r?; + let model = self.form.model(); + self.user.email = model.email; + self.user.display_name = model.display_name; + self.user.first_name = model.first_name; + self.user.last_name = model.last_name; + if let Some(avatar) = maybe_to_base64(&self.avatar)? { + self.user.avatar = Some(avatar); + } + self.just_updated = true; Ok(true) } + + fn upload_files(files: Option) -> Msg { + if let Some(files) = files { + if files.length() > 0 { + Msg::FileSelected(File::from(files.item(0).unwrap())) + } else { + Msg::Update + } + } else { + Msg::Update + } + } } fn is_valid_jpeg(bytes: &[u8]) -> bool { diff --git a/app/src/components/user_table.rs b/app/src/components/user_table.rs index 7ed78c5..b25a87a 100644 --- a/app/src/components/user_table.rs +++ b/app/src/components/user_table.rs @@ -34,7 +34,7 @@ pub enum Msg { } impl CommonComponent for UserTable { - fn handle_msg(&mut self, msg: ::Message) -> Result { + fn handle_msg(&mut self, _: &Context, msg: ::Message) -> Result { match msg { Msg::ListUsersResponse(users) => { self.users = Some(users?.users.into_iter().collect()); @@ -55,8 +55,9 @@ impl CommonComponent for UserTable { } impl UserTable { - fn get_users(&mut self, req: Option) { + fn get_users(&mut self, ctx: &Context, req: Option) { self.common.call_graphql::( + ctx, list_users_query::Variables { filters: req }, Msg::ListUsersResponse, "Error trying to fetch users", @@ -68,27 +69,23 @@ impl Component for UserTable { type Message = Msg; type Properties = (); - fn create(props: Self::Properties, link: ComponentLink) -> Self { + fn create(ctx: &Context) -> Self { let mut table = UserTable { - common: CommonComponentParts::::create(props, link), + common: CommonComponentParts::::create(), users: None, }; - table.get_users(None); + table.get_users(ctx, None); table } - fn update(&mut self, msg: Self::Message) -> ShouldRender { - CommonComponentParts::::update(self, msg) + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { + CommonComponentParts::::update(self, ctx, msg) } - fn change(&mut self, props: Self::Properties) -> ShouldRender { - self.common.change(props) - } - - fn view(&self) -> Html { + fn view(&self, ctx: &Context) -> Html { html! {
    - {self.view_users()} + {self.view_users(ctx)} {self.view_errors()}
    } @@ -96,7 +93,7 @@ impl Component for UserTable { } impl UserTable { - fn view_users(&self) -> Html { + fn view_users(&self, ctx: &Context) -> Html { let make_table = |users: &Vec| { html! {
    @@ -113,7 +110,7 @@ impl UserTable { - {users.iter().map(|u| self.view_user(u)).collect::>()} + {users.iter().map(|u| self.view_user(ctx, u)).collect::>()}
    @@ -125,11 +122,11 @@ impl UserTable { } } - fn view_user(&self, user: &User) -> Html { - let link = &self.common; + fn view_user(&self, ctx: &Context, user: &User) -> Html { + let link = &ctx.link(); html! { - {&user.id} + {&user.id} {&user.email} {&user.display_name} {&user.first_name} diff --git a/app/src/infra/api.rs b/app/src/infra/api.rs index 49e1b0e..cce5a50 100644 --- a/app/src/infra/api.rs +++ b/app/src/infra/api.rs @@ -1,138 +1,75 @@ use super::cookies::set_cookie; use anyhow::{anyhow, Context, Result}; +use gloo_net::http::{Method, Request}; use graphql_client::GraphQLQuery; use lldap_auth::{login, registration, JWTClaims}; -use yew::{ - callback::Callback, - format::Json, - services::fetch::{Credentials, FetchOptions, FetchService, FetchTask, Request, Response}, -}; +use serde::{de::DeserializeOwned, Serialize}; +use web_sys::RequestCredentials; #[derive(Default)] pub struct HostService {} -fn get_default_options() -> FetchOptions { - FetchOptions { - credentials: Some(Credentials::SameOrigin), - ..FetchOptions::default() - } -} - fn get_claims_from_jwt(jwt: &str) -> Result { use jwt::*; let token = Token::::parse_unverified(jwt)?; Ok(token.claims().clone()) } -fn create_handler( - callback: Callback>, - handler: F, -) -> Callback>> -where - F: Fn(http::StatusCode, Resp) -> Result + 'static, - CallbackResult: 'static, -{ - Callback::once(move |response: Response>| { - let (meta, maybe_data) = response.into_parts(); - let message = maybe_data - .context("Could not reach server") - .and_then(|data| handler(meta.status, data)); - callback.emit(message) - }) -} +const NO_BODY: Option<()> = None; -struct RequestBody(T); - -impl<'a, R> From<&'a R> for RequestBody> -where - R: serde::ser::Serialize, -{ - fn from(request: &'a R) -> Self { - Self(Json(request)) +async fn call_server( + url: &str, + body: Option, + error_message: &'static str, +) -> Result { + let mut request = Request::new(url) + .header("Content-Type", "application/json") + .credentials(RequestCredentials::SameOrigin); + if let Some(b) = body { + request = request + .body(serde_json::to_string(&b)?) + .method(Method::POST); + } + let response = request.send().await?; + if response.ok() { + Ok(response.text().await?) + } else { + Err(anyhow!( + "{}[{} {}]: {}", + error_message, + response.status(), + response.status_text(), + response.text().await? + )) } } -impl From for RequestBody { - fn from(request: yew::format::Nothing) -> Self { - Self(request) - } +async fn call_server_json_with_error_message( + url: &str, + request: Option, + error_message: &'static str, +) -> Result +where + CallbackResult: DeserializeOwned + 'static, +{ + let data = call_server(url, request, error_message).await?; + serde_json::from_str(&data).context("Could not parse response") } -fn call_server( +async fn call_server_empty_response_with_error_message( url: &str, - request: RB, - callback: Callback>, + request: Option, error_message: &'static str, - parse_response: F, -) -> Result -where - F: Fn(String) -> Result + 'static, - CallbackResult: 'static, - RB: Into>, - Req: Into, -{ - let request = { - // If the request type is empty (if the size is 0), it's a get. - if std::mem::size_of::() == 0 { - Request::get(url) - } else { - Request::post(url) - } - } - .header("Content-Type", "application/json") - .body(request.into().0)?; - let handler = create_handler(callback, move |status: http::StatusCode, data: String| { - if status.is_success() { - parse_response(data) - } else { - Err(anyhow!("{}[{}]: {}", error_message, status, data)) - } - }); - FetchService::fetch_with_options(request, get_default_options(), handler) -} - -fn call_server_json_with_error_message( - url: &str, - request: RB, - callback: Callback>, - error_message: &'static str, -) -> Result -where - CallbackResult: serde::de::DeserializeOwned + 'static, - RB: Into>, - Req: Into, -{ - call_server(url, request, callback, error_message, |data: String| { - serde_json::from_str(&data).context("Could not parse response") - }) -} - -fn call_server_empty_response_with_error_message( - url: &str, - request: RB, - callback: Callback>, - error_message: &'static str, -) -> Result -where - RB: Into>, - Req: Into, -{ - call_server( - url, - request, - callback, - error_message, - |_data: String| Ok(()), - ) +) -> Result<()> { + call_server(url, request, error_message).await.map(|_| ()) } impl HostService { - pub fn graphql_query( + pub async fn graphql_query( variables: QueryType::Variables, - callback: Callback>, error_message: &'static str, - ) -> Result + ) -> Result where QueryType: GraphQLQuery + 'static, { @@ -149,37 +86,25 @@ impl HostService { ) }) }; - let parse_graphql_response = move |data: String| { - serde_json::from_str(&data) - .context("Could not parse response") - .and_then(unwrap_graphql_response) - }; let request_body = QueryType::build_query(variables); - call_server( - "/api/graphql", - &request_body, - callback, - error_message, - parse_graphql_response, - ) + let response = call_server("/api/graphql", Some(request_body), error_message).await?; + serde_json::from_str(&response) + .context("Could not parse response") + .and_then(unwrap_graphql_response) } - pub fn login_start( + pub async fn login_start( request: login::ClientLoginStartRequest, - callback: Callback>>, - ) -> Result { + ) -> Result> { call_server_json_with_error_message( "/auth/opaque/login/start", - &request, - callback, + Some(request), "Could not start authentication: ", ) + .await } - pub fn login_finish( - request: login::ClientLoginFinishRequest, - callback: Callback>, - ) -> Result { + pub async fn login_finish(request: login::ClientLoginFinishRequest) -> Result<(String, bool)> { let set_cookies = |jwt_claims: JWTClaims| { let is_admin = jwt_claims.groups.contains("lldap_admin"); set_cookie("user_id", &jwt_claims.user, &jwt_claims.exp) @@ -187,49 +112,44 @@ impl HostService { .map(|_| (jwt_claims.user.clone(), is_admin)) .context("Error clearing cookie") }; - let parse_token = move |data: String| { - serde_json::from_str::(&data) - .context("Could not parse response") - .and_then(|r| { - get_claims_from_jwt(r.token.as_str()) - .context("Could not parse response") - .and_then(set_cookies) - }) - }; - call_server( + let response = call_server( "/auth/opaque/login/finish", - &request, - callback, + Some(request), "Could not finish authentication", - parse_token, ) + .await?; + serde_json::from_str::(&response) + .context("Could not parse response") + .and_then(|r| { + get_claims_from_jwt(r.token.as_str()) + .context("Could not parse response") + .and_then(set_cookies) + }) } - pub fn register_start( + pub async fn register_start( request: registration::ClientRegistrationStartRequest, - callback: Callback>>, - ) -> Result { + ) -> Result> { call_server_json_with_error_message( "/auth/opaque/register/start", - &request, - callback, + Some(request), "Could not start registration: ", ) + .await } - pub fn register_finish( + pub async fn register_finish( request: registration::ClientRegistrationFinishRequest, - callback: Callback>, - ) -> Result { + ) -> Result<()> { call_server_empty_response_with_error_message( "/auth/opaque/register/finish", - &request, - callback, + Some(request), "Could not finish registration", ) + .await } - pub fn refresh(_request: (), callback: Callback>) -> Result { + pub async fn refresh() -> Result<(String, bool)> { let set_cookies = |jwt_claims: JWTClaims| { let is_admin = jwt_claims.groups.contains("lldap_admin"); set_cookie("user_id", &jwt_claims.user, &jwt_claims.exp) @@ -237,68 +157,51 @@ impl HostService { .map(|_| (jwt_claims.user.clone(), is_admin)) .context("Error clearing cookie") }; - let parse_token = move |data: String| { - serde_json::from_str::(&data) - .context("Could not parse response") - .and_then(|r| { - get_claims_from_jwt(r.token.as_str()) - .context("Could not parse response") - .and_then(set_cookies) - }) - }; - call_server( - "/auth/refresh", - yew::format::Nothing, - callback, - "Could not start authentication: ", - parse_token, - ) + let response = + call_server("/auth/refresh", NO_BODY, "Could not start authentication: ").await?; + serde_json::from_str::(&response) + .context("Could not parse response") + .and_then(|r| { + get_claims_from_jwt(r.token.as_str()) + .context("Could not parse response") + .and_then(set_cookies) + }) } // 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, - callback, - "Could not logout", - ) + pub async fn logout() -> Result<()> { + call_server_empty_response_with_error_message("/auth/logout", NO_BODY, "Could not logout") + .await } - pub fn reset_password_step1( - username: &str, - callback: Callback>, - ) -> Result { + pub async fn reset_password_step1(username: String) -> Result<()> { call_server_empty_response_with_error_message( - &format!("/auth/reset/step1/{}", url_escape::encode_query(username)), - yew::format::Nothing, - callback, + &format!("/auth/reset/step1/{}", url_escape::encode_query(&username)), + NO_BODY, "Could not initiate password reset", ) + .await } - pub fn reset_password_step2( - token: &str, - callback: Callback>, - ) -> Result { + pub async fn reset_password_step2( + token: String, + ) -> Result { call_server_json_with_error_message( &format!("/auth/reset/step2/{}", token), - yew::format::Nothing, - callback, + NO_BODY, "Could not validate token", ) + .await } - pub fn probe_password_reset(callback: Callback>) -> Result { - let request = Request::get("/auth/reset/step1/lldap_unlikely_very_long_user_name") - .header("Content-Type", "application/json") - .body(yew::format::Nothing)?; - FetchService::fetch_with_options( - request, - get_default_options(), - create_handler(callback, move |status: http::StatusCode, _data: String| { - Ok(status != http::StatusCode::NOT_FOUND) - }), + pub async fn probe_password_reset() -> Result { + Ok( + gloo_net::http::Request::get("/auth/reset/step1/lldap_unlikely_very_long_user_name") + .header("Content-Type", "application/json") + .send() + .await? + .status() + != http::StatusCode::NOT_FOUND, ) } } diff --git a/app/src/infra/common_component.rs b/app/src/infra/common_component.rs index 2bb045c..412d2ce 100644 --- a/app/src/infra/common_component.rs +++ b/app/src/infra/common_component.rs @@ -21,88 +21,62 @@ //! [`CommonComponentParts::update`]. This will in turn call [`CommonComponent::handle_msg`] and //! take care of error and task handling. +use std::{ + future::Future, + marker::PhantomData, + sync::{Arc, Mutex}, +}; + use crate::infra::api::HostService; use anyhow::{Error, Result}; -use gloo_console::{error, log}; +use gloo_console::error; use graphql_client::GraphQLQuery; -use yew::{ - prelude::*, - services::{ - fetch::FetchTask, - reader::{FileData, ReaderService, ReaderTask}, - }, -}; -use yewtil::NeqAssign; +use yew::prelude::*; /// Trait required for common components. pub trait CommonComponent>: Component { /// Handle the incoming message. If an error is returned here, any running task will be /// cancelled, the error will be written to the [`CommonComponentParts::error`] and the /// component will be refreshed. - fn handle_msg(&mut self, msg: ::Message) -> Result; + fn handle_msg( + &mut self, + ctx: &Context, + msg: ::Message, + ) -> Result; /// Get a mutable reference to the inner component parts, necessary for the CRTP. fn mut_common(&mut self) -> &mut CommonComponentParts; } -enum AnyTask { - None, - FetchTask(FetchTask), - ReaderTask(ReaderTask), -} - -impl AnyTask { - fn is_some(&self) -> bool { - !matches!(self, AnyTask::None) - } -} - -impl From> for AnyTask { - fn from(task: Option) -> Self { - match task { - Some(t) => AnyTask::FetchTask(t), - None => AnyTask::None, - } - } -} - /// Structure that contains the common parts needed by most components. /// The fields of [`props`] are directly accessible through a `Deref` implementation. pub struct CommonComponentParts> { - link: ComponentLink, - pub props: ::Properties, pub error: Option, - task: AnyTask, + is_task_running: Arc>, + _phantom: PhantomData, } impl> CommonComponentParts { + pub fn create() -> Self { + CommonComponentParts { + error: None, + is_task_running: Arc::new(Mutex::new(false)), + _phantom: PhantomData::, + } + } /// Whether there is a currently running task in the background. pub fn is_task_running(&self) -> bool { - self.task.is_some() - } - - /// Cancel any background task. - pub fn cancel_task(&mut self) { - self.task = AnyTask::None; - } - - pub fn create(props: ::Properties, link: ComponentLink) -> Self { - Self { - link, - props, - error: None, - task: AnyTask::None, - } + *self.is_task_running.lock().unwrap() } /// This should be called from the [`yew::prelude::Component::update`]: it will in turn call /// [`CommonComponent::handle_msg`] and handle any resulting error. - pub fn update(com: &mut C, msg: ::Message) -> ShouldRender { + pub fn update(com: &mut C, ctx: &Context, msg: ::Message) -> bool { com.mut_common().error = None; - match com.handle_msg(msg) { + match com.handle_msg(ctx, msg) { Err(e) => { error!(&e.to_string()); com.mut_common().error = Some(e); - com.mut_common().cancel_task(); + assert!(!*com.mut_common().is_task_running.lock().unwrap()); true } Ok(b) => b, @@ -112,10 +86,11 @@ impl> CommonComponentParts { /// Same as above, but the resulting error is instead passed to the reporting function. pub fn update_and_report_error( com: &mut C, + ctx: &Context, msg: ::Message, report_fn: Callback, - ) -> ShouldRender { - let should_render = Self::update(com, msg); + ) -> bool { + let should_render = Self::update(com, ctx, msg); com.mut_common() .error .take() @@ -126,38 +101,24 @@ impl> CommonComponentParts { .unwrap_or(should_render) } - /// This can be called from [`yew::prelude::Component::update`]: it will check if the - /// properties have changed and return whether the component should update. - pub fn change(&mut self, props: ::Properties) -> ShouldRender - where - ::Properties: std::cmp::PartialEq, - { - self.props.neq_assign(props) - } - - /// Create a callback from the link. - pub fn callback(&self, function: F) -> Callback - where - M: Into, - F: Fn(IN) -> M + 'static, - { - self.link.callback(function) - } - /// Call `method` from the backend with the given `request`, and pass the `callback` for the /// result. Returns whether _starting the call_ failed. - pub fn call_backend( - &mut self, - method: M, - req: Req, - callback: Cb, - ) -> Result<()> + pub fn call_backend(&mut self, ctx: &Context, fut: Fut, callback: Cb) where - M: Fn(Req, Callback) -> Result, + Fut: Future + 'static, Cb: FnOnce(Resp) -> ::Message + 'static, { - self.task = AnyTask::FetchTask(method(req, self.link.callback_once(callback))?); - Ok(()) + { + let mut running = self.is_task_running.lock().unwrap(); + assert!(!*running); + *running = true; + } + let is_task_running = self.is_task_running.clone(); + ctx.link().send_future(async move { + let res = fut.await; + *is_task_running.lock().unwrap() = false; + callback(res) + }); } /// Call the backend with a GraphQL query. @@ -165,6 +126,7 @@ impl> CommonComponentParts { /// `EnumCallback` should usually be left as `_`. pub fn call_graphql( &mut self, + ctx: &Context, variables: QueryType::Variables, enum_callback: EnumCallback, error_message: &'static str, @@ -172,19 +134,20 @@ impl> CommonComponentParts { QueryType: GraphQLQuery + 'static, EnumCallback: Fn(Result) -> ::Message + 'static, { - self.task = HostService::graphql_query::( - variables, - self.link.callback(enum_callback), - error_message, - ) - .map_err::<(), _>(|e| { - log!(&e.to_string()); - self.error = Some(e); - }) - .ok() - .into(); + { + let mut running = self.is_task_running.lock().unwrap(); + assert!(!*running); + *running = true; + } + let is_task_running = self.is_task_running.clone(); + ctx.link().send_future(async move { + let res = HostService::graphql_query::(variables, error_message).await; + *is_task_running.lock().unwrap() = false; + enum_callback(res) + }); } + /* pub(crate) fn read_file(&mut self, file: web_sys::File, callback: Cb) -> Result<()> where Cb: FnOnce(FileData) -> ::Message + 'static, @@ -195,18 +158,5 @@ impl> CommonComponentParts { )?); Ok(()) } -} - -impl> std::ops::Deref for CommonComponentParts { - type Target = ::Properties; - - fn deref(&self) -> &::Target { - &self.props - } -} - -impl> std::ops::DerefMut for CommonComponentParts { - fn deref_mut(&mut self) -> &mut ::Target { - &mut self.props - } + */ } diff --git a/app/src/lib.rs b/app/src/lib.rs index c079976..c0e9c13 100644 --- a/app/src/lib.rs +++ b/app/src/lib.rs @@ -1,6 +1,7 @@ #![recursion_limit = "256"] #![forbid(non_ascii_idents)] #![allow(clippy::uninlined_format_args)] +#![allow(clippy::let_unit_value)] pub mod components; pub mod infra; @@ -9,7 +10,7 @@ use wasm_bindgen::prelude::{wasm_bindgen, JsValue}; #[wasm_bindgen] pub fn run_app() -> Result<(), JsValue> { - yew::start_app::(); + yew::start_app::(); Ok(()) }