Refresh login state on load

bitbrain-za · Nov 12, 2023 · 9743332 · 9743332
1 parent f2cc4d0
commit 9743332
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 12 deletions.
diff --git a/src/apps/login_app.rs b/src/apps/login_app.rs
@@ -187,9 +187,8 @@ impl LoginApp {
                             self.toasts
                                 .info(format!("Logged in: {}", &self.login.email))
                                 .set_duration(Some(Duration::from_secs(5)));
-                            let app = Arc::clone(&self.app_state);
-                            let mut app = app.lock().unwrap();
-                            app.logged_in = LoginState::LoggedIn(self.login.email.clone());
+
+                            AppState::set_logged_in(&self.app_state);
                         }
                         LoginResponse::Failure { status: _, message } => {
                             log::error!("Failed to login: {}", message);
@@ -224,9 +223,7 @@ impl LoginApp {
                     self.toasts
                         .info(format!("Logged out: {}", &self.login.email))
                         .set_duration(Some(Duration::from_secs(5)));
-                    let app = Arc::clone(&self.app_state);
-                    let mut app = app.lock().unwrap();
-                    app.logged_in = LoginState::LoggedOut;
+                    AppState::set_logged_out(&self.app_state);
                     self.logout_requestor = None;
                 }
                 _ => {}
@@ -438,6 +435,10 @@ impl super::App for LoginApp {
 
     fn set_app_state_ref(&mut self, app_state: Arc<Mutex<AppState>>) {
         self.app_state = app_state;
+        let app_state = Arc::clone(&self.app_state);
+        let mut req = Requestor::new_refresh(app_state);
+        req.send();
+        self.login_requestor = Some(req);
     }
 
     fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
@@ -464,7 +465,7 @@ impl super::View for LoginApp {
 
         match self.state {
             LoginAppState::Login => match logged_in {
-                LoginState::LoggedIn(_) => self.ui_logged_in(ui),
+                LoginState::LoggedIn => self.ui_logged_in(ui),
                 LoginState::LoggedOut => self.ui_logged_out(ui),
             },
             LoginAppState::RegisterNewUser => self.ui_register(ui),

diff --git a/src/helpers/app_state.rs b/src/helpers/app_state.rs
@@ -1,6 +1,8 @@
+use std::sync::{Arc, Mutex};
+
 #[derive(Clone)]
 pub enum LoginState {
-    LoggedIn(String),
+    LoggedIn,
     LoggedOut,
 }
 
@@ -17,3 +19,16 @@ impl Default for AppState {
         }
     }
 }
+
+impl AppState {
+    pub fn set_logged_in(app_state: &Arc<Mutex<AppState>>) {
+        let app = Arc::clone(app_state);
+        let mut app = app.lock().unwrap();
+        app.logged_in = LoginState::LoggedIn;
+    }
+    pub fn set_logged_out(app_state: &Arc<Mutex<AppState>>) {
+        let app = Arc::clone(app_state);
+        let mut app = app.lock().unwrap();
+        app.logged_in = LoginState::LoggedOut;
+    }
+}
diff --git a/src/helpers/fetchers.rs b/src/helpers/fetchers.rs
@@ -1,4 +1,4 @@
-use crate::helpers::{refresh, AppState, LoginState};
+use crate::helpers::{refresh, AppState};
 use gloo_net::http;
 use poll_promise::Promise;
 use std::sync::{Arc, Mutex};
@@ -15,6 +15,7 @@ pub enum RequestStatus {
 enum Method {
     Get,
     Post,
+    Refresh,
 }
 
 impl std::fmt::Display for RequestStatus {
@@ -52,6 +53,12 @@ impl Requestor {
         Self::new(app_state, url, with_credentials, None, None, Method::Get)
     }
 
+    pub fn new_refresh(app_state: Arc<Mutex<AppState>>) -> Self {
+        let mut s = Self::new(app_state, "", true, None, None, Method::Refresh);
+        s.refresh_login();
+        s
+    }
+
     pub fn new_post(
         app_state: Arc<Mutex<AppState>>,
         url: &str,
@@ -100,6 +107,8 @@ impl Requestor {
             refresh::RefreshStatus::InProgress => {}
             refresh::RefreshStatus::Success => {
                 log::debug!("Retrying Request");
+                AppState::set_logged_in(&self.app_state);
+                self.state_has_changed = true;
                 self.send();
                 return RequestStatus::InProgress;
             }
@@ -123,9 +132,7 @@ impl Requestor {
                             self.token_refresh_promise = refresh::submit_refresh();
                             RequestStatus::InProgress
                         } else {
-                            let app = Arc::clone(&self.app_state);
-                            let mut app = app.lock().unwrap();
-                            app.logged_in = LoginState::LoggedOut;
+                            AppState::set_logged_out(&self.app_state);
                             RequestStatus::Failed("Authentication failed".to_string())
                         }
                     }
@@ -155,9 +162,14 @@ impl Requestor {
         match self.method {
             Method::Get => self.get(),
             Method::Post => self.post(),
+            Method::Refresh => (),
         }
     }
 
+    fn refresh_login(&mut self) {
+        self.token_refresh_promise = refresh::submit_refresh();
+    }
+
     fn get(&mut self) {
         let url = self.url.clone();
         let with_credentials = self.with_credentials;