Handle sessions in one place

This includes logging in and logging out.

`logged_out` is removed because "disabled" is not working with `a` anyway.
Can be added to the auth::Model if needed.

Signed-off-by: Igor Pashev <pashev.igor@gmail.com>

iml-gui/crate/src/auth.rs

@@ -14,7 +14,7 @@ use web_sys::HtmlDocument;
 #[derive(Default)]
 pub struct Model {
     session: Option<Session>,
-    pub state: State,
+    state: State,
     request_controller: Option<fetch::RequestController>,
     cancel: Option<oneshot::Sender<()>>,
 }
@@ -42,9 +42,9 @@ impl Default for State {
 pub enum Msg {
     Fetch,
     Fetched(fetch::FetchObject<Session>),
-    SetSession(Session),
+    Logout,
+    LoggedIn,
     Loop,
-    Stop,
     Noop,
 }
 
@@ -58,13 +58,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg, GMsg>)
 
             orders.skip().perform_cmd(request.fetch_json(Msg::Fetched));
         }
-        Msg::SetSession(session) => {
-            if session.needs_login() {
-                orders.send_g_msg(GMsg::RouteChange(Route::Login.into()));
-            }
-
-            model.session = Some(session);
-        }
         Msg::Fetched(data) => {
             match data.response() {
                 Err(fail_reason) => {
@@ -95,6 +88,19 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg, GMsg>)
                 }
             };
         }
+        Msg::LoggedIn => {
+            orders.skip();
+            orders.send_msg(Msg::Fetch);
+            orders.send_g_msg(GMsg::RouteChange(Route::Dashboard.into()));
+        }
+
+        Msg::Logout => {
+            orders.perform_g_cmd(
+                fetch_session()
+                    .method(fetch::Method::Delete)
+                    .fetch(|_| GMsg::AuthProxy(Box::new(Msg::LoggedIn))),
+            );
+        }
         Msg::Loop => {
             orders.skip();
 
@@ -108,14 +114,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg, GMsg>)
 
             orders.perform_cmd(fut);
         }
-        Msg::Stop => {
-            model.state = State::Stopped;
-            model.cancel = None;
-
-            if let Some(c) = model.request_controller.take() {
-                c.abort();
-            }
-        }
         Msg::Noop => {}
     };
 }

iml-gui/crate/src/components/tree.rs

@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 use crate::{
-    components::{attrs, alert_indicator, font_awesome, paging, Placement, tooltip},
+    components::{alert_indicator, attrs, font_awesome, paging, tooltip, Placement},
     generated::css_classes::C,
     route::RouteId,
     GMsg, Route,

iml-gui/crate/src/generated/css_classes.rs

@@ -1,9 +1,7 @@
-
 // DO NOT EDIT THIS FILE - IT'S GENERATED, CHANGES WILL BE LOST!
 
 #[allow(non_snake_case, dead_code)]
 pub struct CssClasses<'a> {
-
     /**
         width: 100%;
         max-width: 569px;    @media (min-width: 569px)
@@ -93733,7 +93731,6 @@ pub struct CssClasses<'a> {
 }
 
 pub static C: CssClasses = CssClasses {
-
     /**
         width: 100%;
         max-width: 569px;    @media (min-width: 569px)

iml-gui/crate/src/lib.rs

@@ -37,7 +37,7 @@ use futures::channel::oneshot;
 use generated::css_classes::C;
 use iml_wire_types::{
     warp_drive::{self, ArcRecord},
-    Conf, GroupType, Session,
+    Conf, GroupType,
 };
 use lazy_static::lazy_static;
 use page::{Page, RecordChange};
@@ -157,7 +157,6 @@ pub struct Model {
     conf: Conf,
     loading: Loading,
     locks: warp_drive::Locks,
-    logging_out: bool,
     manage_menu_state: WatchState,
     menu_visibility: Visibility,
     notification: notification::Model,
@@ -225,7 +224,6 @@ fn after_mount(url: Url, orders: &mut impl Orders<Msg, GMsg>) -> AfterMount<Mode
             conf: Some(conf_tx),
         },
         locks: im::hashmap!(),
-        logging_out: false,
         manage_menu_state: WatchState::default(),
         menu_visibility: Visible,
         notification: notification::Model::default(),
@@ -302,13 +300,9 @@ pub enum Msg {
     EventSourceMessage(MessageEvent),
     FetchConf,
     FetchedConf(fetch::ResponseDataResult<Conf>),
-    GetSession,
-    GotSession(fetch::ResponseDataResult<Session>),
     HideMenu,
     LoadPage,
     Locks(warp_drive::Locks),
-    LoggedOut(fetch::FetchObject<()>),
-    Logout,
     ManageMenuState,
     Notification(notification::Msg),
     RecordChange(Box<warp_drive::RecordChange>),
@@ -332,10 +326,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg, GMsg>)
         Msg::RouteChanged(url) => {
             model.route = Route::from(url);
 
-            if model.route == Route::Login {
-                orders.send_msg(Msg::Logout);
-            }
-
             if model.route == Route::Dashboard {
                 model.breadcrumbs.clear();
             }
@@ -409,23 +399,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg, GMsg>)
         Msg::EventSourceError(_) => {
             log("EventSource error.");
         }
-        Msg::GetSession => {
-            orders
-                .skip()
-                .perform_cmd(auth::fetch_session().fetch_json_data(Msg::GotSession));
-        }
-        Msg::GotSession(data_result) => match data_result {
-            Ok(resp) => {
-                orders.send_g_msg(GMsg::AuthProxy(Box::new(auth::Msg::SetSession(resp))));
-
-                model.logging_out = false;
-            }
-            Err(fail_reason) => {
-                error!("Error fetching login session {:?}", fail_reason.message());
-
-                orders.skip();
-            }
-        },
         Msg::Records(records) => {
             model.records = (&*records).into();
 
@@ -582,20 +555,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg, GMsg>)
                 &mut orders.proxy(Msg::StatusSection),
             );
         }
-        Msg::Logout => {
-            model.logging_out = true;
-
-            orders.proxy(Msg::Auth).send_msg(Box::new(auth::Msg::Stop));
-
-            orders.perform_cmd(
-                auth::fetch_session()
-                    .method(fetch::Method::Delete)
-                    .fetch(Msg::LoggedOut),
-            );
-        }
-        Msg::LoggedOut(_) => {
-            orders.send_msg(Msg::GetSession);
-        }
         Msg::WindowClick => {
             if model.manage_menu_state.should_update() {
                 model.manage_menu_state.update();

iml-gui/crate/src/page/login.rs

@@ -6,10 +6,10 @@ use crate::{
     auth,
     components::{ddn_logo, ddn_logo_lettering, whamcloud_logo},
     generated::css_classes::C,
-    FailReasonExt, GMsg, MergeAttrs, Route,
+    GMsg, MergeAttrs,
 };
 use core::fmt;
-use iml_wire_types::{Branding, Session};
+use iml_wire_types::Branding;
 use seed::{browser::service::fetch, prelude::*, *};
 
 #[derive(Clone, Default, serde::Serialize)]
@@ -45,8 +45,6 @@ pub enum Msg {
     PasswordChange(String),
     SubmitResp(fetch::FetchObject<Errors>),
     Submit,
-    GetSession,
-    GotSession(fetch::ResponseDataResult<Session>),
 }
 
 impl fmt::Debug for Msg {
@@ -80,7 +78,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg, GMsg>)
                 Err(e) => error!("Response error {:?}", e),
                 Ok(x) => {
                     if x.status.code < 400 {
-                        orders.skip().send_msg(Msg::GetSession);
+                        orders.skip().send_g_msg(GMsg::AuthProxy(Box::new(auth::Msg::LoggedIn)));
                     } else {
                         model.logging_in = false;
 
@@ -92,27 +90,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg, GMsg>)
                 }
             };
         }
-        Msg::GetSession => {
-            orders
-                .skip()
-                .perform_cmd(auth::fetch_session().fetch_json_data(Msg::GotSession));
-        }
-        Msg::GotSession(data_result) => {
-            match data_result {
-                Ok(resp) => {
-                    orders
-                        .send_g_msg(GMsg::AuthProxy(Box::new(auth::Msg::SetSession(resp))))
-                        .send_g_msg(GMsg::RouteChange(Route::Dashboard.into()));
-
-                    model.logging_in = false;
-                }
-                Err(fail_reason) => {
-                    error!("Error fetching login session {:?}", fail_reason.message());
-
-                    orders.skip();
-                }
-            };
-        }
     }
 }
 

iml-gui/crate/src/page/partial/footer.rs

@@ -24,20 +24,17 @@ pub fn view(conf: &Conf) -> impl View<Msg> {
         }
     };
 
-    let footer_text =  match conf.branding {
+    let footer_text = match conf.branding {
         Branding::Whamcloud => div![
             footer_string,
             year.to_string(),
             " DDN. All rights reserved.".to_string(),
         ],
-        _ => div![footer_string]
+        _ => div![footer_string],
     };
 
     footer![
         class![C.h_5, C.flex, C.justify_center],
-        div![
-            class![C.px_5, C.text_sm, C.items_center,],
-            footer_text
-        ]
+        div![class![C.px_5, C.text_sm, C.items_center,], footer_text]
     ]
 }

iml-gui/crate/src/page/partial/header.rs

@@ -245,7 +245,7 @@ fn nav(model: &Model) -> Node<Msg> {
                     C.lg__h_16,
                 ],
                 main_menu_items(model),
-                auth_view(&model.auth, model.logging_out),
+                auth_view(&model.auth),
             ]
         } else {
             empty![]
@@ -255,14 +255,12 @@ fn nav(model: &Model) -> Node<Msg> {
 
 /// Show the logged in user if available.
 /// Also show the Login / Logout link
-pub fn auth_view(auth: &auth::Model, logging_out: bool) -> Node<Msg> {
+pub fn auth_view(auth: &auth::Model) -> Node<Msg> {
     let x = match auth.get_session() {
         Some(session) => session,
         None => return empty![],
     };
 
-    let disabled = attrs! { At::Disabled => logging_out.as_at_value() };
-
     let cls = class![
         C.block,
         C.border_b_2,
@@ -283,14 +281,14 @@ pub fn auth_view(auth: &auth::Model, logging_out: bool) -> Node<Msg> {
         C.text_gray_300
     ];
 
-    let mut auth_link = a![&cls, &disabled, if !x.has_user() { "Login" } else { "Logout" }];
+    let mut auth_link = a![&cls, if !x.has_user() { "Login" } else { "Logout" }];
 
     let auth_link = if !x.has_user() {
         auth_link.merge_attrs(attrs! {
             At::Href => Route::Login.to_href(),
         })
     } else {
-        auth_link.add_listener(simple_ev(Ev::Click, Msg::Logout));
+        auth_link.add_listener(simple_ev(Ev::Click, Msg::Auth(Box::new(auth::Msg::Logout))));
 
         auth_link
     };
@@ -301,7 +299,6 @@ pub fn auth_view(auth: &auth::Model, logging_out: bool) -> Node<Msg> {
             Some(user) => {
                 a![
                     &cls,
-                    &disabled,
                     attrs! {
                         At::Href => Route::User(user.id.into()).to_href()
                     },