From 1456cfe9072750ec887af21a94819d810ad7d6b3 Mon Sep 17 00:00:00 2001
From: Guocork <g1024536444@gmail.com>
Date: Wed, 18 Dec 2024 17:32:40 +0800
Subject: [PATCH 1/5] add logout icon

---
 resources/icons/logout.svg |  1 +
 src/home/spaces_dock.rs    | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 resources/icons/logout.svg

diff --git a/resources/icons/logout.svg b/resources/icons/logout.svg
new file mode 100644
index 0000000..4147993
--- /dev/null
+++ b/resources/icons/logout.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1734513699776" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1451" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M835.669333 554.666667h-473.173333A42.453333 42.453333 0 0 1 320 512a42.666667 42.666667 0 0 1 42.474667-42.666667h473.173333l-161.813333-161.834666a42.666667 42.666667 0 0 1 60.330666-60.330667l234.666667 234.666667a42.666667 42.666667 0 0 1 0 60.330666l-234.666667 234.666667a42.666667 42.666667 0 0 1-60.330666-60.330667L835.669333 554.666667zM554.666667 42.666667a42.666667 42.666667 0 1 1 0 85.333333H149.525333C137.578667 128 128 137.578667 128 149.482667v725.034666C128 886.4 137.6 896 149.525333 896H554.666667a42.666667 42.666667 0 1 1 0 85.333333H149.525333A106.816 106.816 0 0 1 42.666667 874.517333V149.482667A106.773333 106.773333 0 0 1 149.525333 42.666667H554.666667z" fill="" p-id="1452"></path></svg>
\ No newline at end of file
diff --git a/src/home/spaces_dock.rs b/src/home/spaces_dock.rs
index 7b19486..64e2e28 100644
--- a/src/home/spaces_dock.rs
+++ b/src/home/spaces_dock.rs
@@ -17,6 +17,7 @@ live_design! {
 
     ICON_HOME = dep("crate://self/resources/icons/home.svg")
     ICON_SETTINGS = dep("crate://self/resources/icons/settings.svg")
+    ICON_LOGOUT = dep("crate://self/resources/icons/logout.svg")
 
     Filler = <View> {
         height: Fill, width: Fill
@@ -102,6 +103,30 @@ live_design! {
         }
     }
 
+    Logout = <View> {
+        width: Fit, height: Fit
+        padding: {top: 8, left: 8, right: 12, bottom: 8}
+        align: {x: 0.5, y: 0.5}
+        <Button> {
+            draw_bg: {
+                fn pixel(self) -> vec4 {
+                    let sdf = Sdf2d::viewport(self.pos * self.rect_size);
+                    return sdf.result
+                }
+            }
+
+            draw_icon: {
+                svg_file: (ICON_LOGOUT),
+                fn get_color(self) -> vec4 {
+                    return (COLOR_DANGER_RED);
+                    // return #x566287; // grayed-out #1C274C until enabled
+                }
+            }
+
+            icon_walk: {width: 25, height: Fit}
+        }
+    }
+
     Settings = <View> {
         width: Fit, height: Fit
         // FIXME: the extra padding on the right is because the icon is not correctly centered
@@ -146,6 +171,8 @@ live_design! {
 
             <Filler> {}
 
+            <Logout> {}
+
             <Settings> {}
         }
 

From 5f14259aec22ba03c8b530f6dac38ef000b28752 Mon Sep 17 00:00:00 2001
From: Guocork <g1024536444@gmail.com>
Date: Thu, 19 Dec 2024 11:42:36 +0800
Subject: [PATCH 2/5] Switch the UI to the login page.

---
 src/app.rs                |  6 ++++++
 src/home/spaces_dock.rs   | 25 ++++++++++++++++---------
 src/login/login_screen.rs |  4 ++++
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index f18a4ff..62cc718 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -187,6 +187,12 @@ impl MatchEvent for App {
                 self.ui.redraw(cx);
             }
 
+            if let Some(LoginAction::Logout) = action.downcast_ref() {
+                self.app_state.logged_in = false;
+                self.update_login_visibility();
+                self.ui.redraw(cx);
+            }
+
             match action.as_widget_action().cast() {
                 // A room has been selected, update the app state and navigate to the main content view.
                 RoomListAction::Selected {
diff --git a/src/home/spaces_dock.rs b/src/home/spaces_dock.rs
index 64e2e28..f834b6d 100644
--- a/src/home/spaces_dock.rs
+++ b/src/home/spaces_dock.rs
@@ -1,6 +1,7 @@
 use makepad_widgets::*;
 use matrix_sdk::encryption::VerificationState;
 
+use crate::login::login_screen::LoginAction;
 use crate::shared::adaptive_view::DisplayContext;
 use crate::sliding_sync::get_client;
 use crate::verification::VerificationStateAction;
@@ -107,7 +108,7 @@ live_design! {
         width: Fit, height: Fit
         padding: {top: 8, left: 8, right: 12, bottom: 8}
         align: {x: 0.5, y: 0.5}
-        <Button> {
+        logout_button = <Button> {
             draw_bg: {
                 fn pixel(self) -> vec4 {
                     let sdf = Sdf2d::viewport(self.pos * self.rect_size);
@@ -280,7 +281,7 @@ impl Widget for Profile {
             }
         }
 
-        self.match_event(cx, event);
+        self.widget_match_event(cx, event, scope);
         self.view.handle_event(cx, event, scope)
     }
 
@@ -289,14 +290,20 @@ impl Widget for Profile {
     }
 }
 
-impl MatchEvent for Profile {
-    fn handle_action(&mut self, cx: &mut Cx, action:&Action) {
-        if let Some(VerificationStateAction::Update(state)) = action.downcast_ref() {
-            if self.verification_state != *state {
-                self.verification_state = *state;
+impl WidgetMatchEvent for Profile {
+    fn handle_actions(&mut self, cx: &mut Cx, actions: &Actions, _scope: &mut Scope) {
+        if self.button(id!(logout_button)).clicked(actions) {
+            cx.action(LoginAction::Logout);
+        }
 
-                self.set_verification_icon_visibility();
-                self.redraw(cx);
+        for action in actions {
+            if let Some(VerificationStateAction::Update(state)) = action.downcast_ref() {
+                if self.verification_state != *state {
+                    self.verification_state = *state;
+    
+                    self.set_verification_icon_visibility();
+                    self.redraw(cx);
+                }
             }
         }
     }
diff --git a/src/login/login_screen.rs b/src/login/login_screen.rs
index 11086ea..ef44585 100644
--- a/src/login/login_screen.rs
+++ b/src/login/login_screen.rs
@@ -454,6 +454,9 @@ impl MatchEvent for LoginScreen {
                     status_label.set_text("");
                     self.redraw(cx);
                 }
+                Some(LoginAction::Logout) => {
+                    status_label.set_text("");
+                }
                 _ => {
 
                 }
@@ -519,4 +522,5 @@ pub enum LoginAction {
     /// inform the login screen which SSO identity providers it should display to the user.
     IdentityProvider(Vec<IdentityProvider>),
     None,
+    Logout,
 }

From c6c9598ec6891b02c6fcf929b6e6eac31c45dd81 Mon Sep 17 00:00:00 2001
From: Guocork <g1024536444@gmail.com>
Date: Thu, 19 Dec 2024 11:53:22 +0800
Subject: [PATCH 3/5] Bind the event to the logout icon

---
 src/home/spaces_dock.rs | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/home/spaces_dock.rs b/src/home/spaces_dock.rs
index f834b6d..7cc37cc 100644
--- a/src/home/spaces_dock.rs
+++ b/src/home/spaces_dock.rs
@@ -104,7 +104,7 @@ live_design! {
         }
     }
 
-    Logout = <View> {
+    Logout = {{Logout}} {
         width: Fit, height: Fit
         padding: {top: 8, left: 8, right: 12, bottom: 8}
         align: {x: 0.5, y: 0.5}
@@ -292,9 +292,6 @@ impl Widget for Profile {
 
 impl WidgetMatchEvent for Profile {
     fn handle_actions(&mut self, cx: &mut Cx, actions: &Actions, _scope: &mut Scope) {
-        if self.button(id!(logout_button)).clicked(actions) {
-            cx.action(LoginAction::Logout);
-        }
 
         for action in actions {
             if let Some(VerificationStateAction::Update(state)) = action.downcast_ref() {
@@ -320,3 +317,27 @@ impl LiveHook for Profile {
         }
     }
 }
+
+#[derive(Live, LiveHook, Widget)]
+pub struct Logout {
+    #[deref] view: View
+}
+
+impl Widget for Logout {
+    fn handle_event(&mut self, cx: &mut Cx, event: &Event, scope: &mut Scope) {
+        self.widget_match_event(cx, event, scope);
+        self.view.handle_event(cx, event, scope)
+    }
+
+    fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
+        self.view.draw_walk(cx, scope, walk)
+    }
+}
+
+impl WidgetMatchEvent for Logout {
+    fn handle_actions(&mut self, cx: &mut Cx, actions:&Actions, _scope: &mut Scope) {
+        if self.button(id!(logout_button)).clicked(actions) {
+            cx.action(LoginAction::Logout);
+        }
+    }
+}
\ No newline at end of file

From 49358dee9a9782a736398a2f2d55886ea01001a5 Mon Sep 17 00:00:00 2001
From: Guocork <g1024536444@gmail.com>
Date: Fri, 20 Dec 2024 17:19:31 +0800
Subject: [PATCH 4/5] integrate matrix api

---
 src/app.rs              |  1 +
 src/home/spaces_dock.rs |  7 +++----
 src/persistent_state.rs | 19 +++++++++++++++++++
 src/sliding_sync.rs     | 31 +++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index 62cc718..34ea785 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -190,6 +190,7 @@ impl MatchEvent for App {
             if let Some(LoginAction::Logout) = action.downcast_ref() {
                 self.app_state.logged_in = false;
                 self.update_login_visibility();
+                // self.handle_startup(cx);
                 self.ui.redraw(cx);
             }
 
diff --git a/src/home/spaces_dock.rs b/src/home/spaces_dock.rs
index 7cc37cc..6d7e902 100644
--- a/src/home/spaces_dock.rs
+++ b/src/home/spaces_dock.rs
@@ -1,9 +1,8 @@
 use makepad_widgets::*;
 use matrix_sdk::encryption::VerificationState;
 
-use crate::login::login_screen::LoginAction;
 use crate::shared::adaptive_view::DisplayContext;
-use crate::sliding_sync::get_client;
+use crate::sliding_sync::{get_client, submit_async_request, MatrixRequest};
 use crate::verification::VerificationStateAction;
 
 live_design! {
@@ -335,9 +334,9 @@ impl Widget for Logout {
 }
 
 impl WidgetMatchEvent for Logout {
-    fn handle_actions(&mut self, cx: &mut Cx, actions:&Actions, _scope: &mut Scope) {
+    fn handle_actions(&mut self, _cx: &mut Cx, actions:&Actions, _scope: &mut Scope) {
         if self.button(id!(logout_button)).clicked(actions) {
-            cx.action(LoginAction::Logout);
+            submit_async_request(MatrixRequest::Logout);
         }
     }
 }
\ No newline at end of file
diff --git a/src/persistent_state.rs b/src/persistent_state.rs
index 480f8bb..3f7afd1 100644
--- a/src/persistent_state.rs
+++ b/src/persistent_state.rs
@@ -81,6 +81,25 @@ async fn save_latest_user_id(user_id: &UserId) -> anyhow::Result<()> {
 }
 
 
+pub async fn delete_session(user_id: Option<OwnedUserId>) -> anyhow::Result<()> {
+    let Some(user_id) = user_id.or_else(most_recent_user_id) else {
+        log!("Could not find previous latest User ID");
+        bail!("Could not find previous latest User ID");
+    };
+    let session_file = session_file_path(&user_id);
+    if !session_file.exists() {
+        log!("Could not find previous session file for user {user_id}");
+        bail!("Could not find previous session file");
+    }
+    if let Err(err) = fs::remove_file(&session_file).await {
+        log!("Failed to delete session file {}: {}", session_file.display(), err);
+        bail!("Failed to delete session file");
+    } else {
+        log!("Successfully deleted session file: {}", session_file.display());
+    }
+    Ok(())
+}
+
 /// Restores the given user's previous session from the filesystem.
 ///
 /// If no User ID is specified, the ID of the most recently-logged in user
diff --git a/src/sliding_sync.rs b/src/sliding_sync.rs
index 434acdf..7de8a23 100644
--- a/src/sliding_sync.rs
+++ b/src/sliding_sync.rs
@@ -193,6 +193,30 @@ async fn login(
     }
 }
 
+/// Log out the current user.
+async fn logout() {
+    if let Ok((client, _sync_token)) = persistent_state::restore_session(None).await {
+        match persistent_state::delete_session(None).await {
+            Ok(_) => {
+                match client.matrix_auth().logout().await {
+                    Ok(_) => {
+                        Cx::post_action(LoginAction::Logout);
+                    },
+                    Err(_err) => {
+                        log!("http error")
+                    }
+                }
+            },
+            Err(_) => {
+                log!("log out failed, fail to delete session_token, please trt again.")
+            }
+        }
+    } else {
+        let status_err = "Failed to restore previous user session. Please try later.";
+        log!("{status_err}");
+    }
+}
+
 async fn populate_login_types(
     homeserver_url: &str,
     login_types: &mut Vec<LoginType>,
@@ -258,6 +282,10 @@ pub type OnMediaFetchedFn = fn(
 pub enum MatrixRequest {
     /// Request from the login screen to log in with the given credentials.
     Login(LoginRequest),
+
+    /// Request to logout.
+    Logout,
+
     /// Request to paginate the older (or newer) events of a room's timeline.
     PaginateRoomTimeline {
         room_id: OwnedRoomId,
@@ -404,6 +432,9 @@ async fn async_worker(
                     )));
                 }
             }
+            MatrixRequest::Logout => {
+                logout().await
+            }
             MatrixRequest::PaginateRoomTimeline { room_id, num_events, direction } => {
                 let (timeline, sender) = {
                     let mut all_room_info = ALL_ROOM_INFO.lock().unwrap();

From 5eb0d86b941a8be1d49097ef1192efa5fa27dad6 Mon Sep 17 00:00:00 2001
From: Guocork <g1024536444@gmail.com>
Date: Tue, 24 Dec 2024 15:55:55 +0800
Subject: [PATCH 5/5] remove some code

---
 src/app.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app.rs b/src/app.rs
index 34ea785..62cc718 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -190,7 +190,6 @@ impl MatchEvent for App {
             if let Some(LoginAction::Logout) = action.downcast_ref() {
                 self.app_state.logged_in = false;
                 self.update_login_visibility();
-                // self.handle_startup(cx);
                 self.ui.redraw(cx);
             }