From 986e76df89028e37ea3f872f12508763b5723e32 Mon Sep 17 00:00:00 2001
From: HsiangNianian <i@jyunko.cn>
Date: Wed, 14 Jan 2026 14:54:57 +0800
Subject: refactor: improve code readability by formatting and restructuring
 function calls

---
 src-tauri/src/core/account_storage.rs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src-tauri/src/core/account_storage.rs')

diff --git a/src-tauri/src/core/account_storage.rs b/src-tauri/src/core/account_storage.rs
index b8e15e1..9512213 100644
--- a/src-tauri/src/core/account_storage.rs
+++ b/src-tauri/src/core/account_storage.rs
@@ -131,13 +131,17 @@ impl AccountStorage {
     pub fn get_active_account(&self) -> Option<(StoredAccount, Option<String>)> {
         let store = self.load();
         if let Some(active_id) = &store.active_account_id {
-            store.accounts.iter().find(|a| &a.id() == active_id).map(|a| {
-                let ms_token = match a {
-                    StoredAccount::Microsoft(m) => m.ms_refresh_token.clone(),
-                    _ => None,
-                };
-                (a.clone(), ms_token)
-            })
+            store
+                .accounts
+                .iter()
+                .find(|a| &a.id() == active_id)
+                .map(|a| {
+                    let ms_token = match a {
+                        StoredAccount::Microsoft(m) => m.ms_refresh_token.clone(),
+                        _ => None,
+                    };
+                    (a.clone(), ms_token)
+                })
         } else {
             None
         }
-- 
cgit v1.2.3-70-g09d2


From d915fc26829e7ed68413a3c7556befcd0163a181 Mon Sep 17 00:00:00 2001
From: HsiangNianian <i@jyunko.cn>
Date: Wed, 14 Jan 2026 14:55:27 +0800
Subject: refactor: simplify default implementations for AccountStore and
 MsRefreshTokenState

---
 src-tauri/src/core/account_storage.rs | 9 +--------
 src-tauri/src/core/auth.rs            | 6 +++---
 src-tauri/src/main.rs                 | 6 ++++++
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src-tauri/src/core/account_storage.rs')

diff --git a/src-tauri/src/core/account_storage.rs b/src-tauri/src/core/account_storage.rs
index 9512213..5ab86e4 100644
--- a/src-tauri/src/core/account_storage.rs
+++ b/src-tauri/src/core/account_storage.rs
@@ -5,19 +5,12 @@ use std::path::PathBuf;
 
 /// Stored account data for persistence
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Default)]
 pub struct AccountStore {
     pub accounts: Vec<StoredAccount>,
     pub active_account_id: Option<String>,
 }
 
-impl Default for AccountStore {
-    fn default() -> Self {
-        Self {
-            accounts: Vec::new(),
-            active_account_id: None,
-        }
-    }
-}
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(tag = "type")]
diff --git a/src-tauri/src/core/auth.rs b/src-tauri/src/core/auth.rs
index e53c00e..5f01a58 100644
--- a/src-tauri/src/core/auth.rs
+++ b/src-tauri/src/core/auth.rs
@@ -115,7 +115,7 @@ pub async fn refresh_microsoft_token(refresh_token: &str) -> Result<TokenRespons
     let resp = client
         .post(url)
         .header("Content-Type", "application/x-www-form-urlencoded")
-        .body(serde_urlencoded::to_string(&params).map_err(|e| e.to_string())?)
+        .body(serde_urlencoded::to_string(params).map_err(|e| e.to_string())?)
         .send()
         .await
         .map_err(|e| e.to_string())?;
@@ -225,7 +225,7 @@ pub async fn start_device_flow() -> Result<DeviceCodeResponse, String> {
     let resp = client
         .post(url)
         .header("Content-Type", "application/x-www-form-urlencoded")
-        .body(serde_urlencoded::to_string(&params).map_err(|e| e.to_string())?)
+        .body(serde_urlencoded::to_string(params).map_err(|e| e.to_string())?)
         .send()
         .await
         .map_err(|e| e.to_string())?;
@@ -261,7 +261,7 @@ pub async fn exchange_code_for_token(device_code: &str) -> Result<TokenResponse,
     let resp = client
         .post(url)
         .header("Content-Type", "application/x-www-form-urlencoded")
-        .body(serde_urlencoded::to_string(&params).map_err(|e| e.to_string())?)
+        .body(serde_urlencoded::to_string(params).map_err(|e| e.to_string())?)
         .send()
         .await
         .map_err(|e| e.to_string())?;
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 8233810..ae74a03 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -26,6 +26,12 @@ pub struct MsRefreshTokenState {
     pub token: Mutex<Option<String>>,
 }
 
+impl Default for MsRefreshTokenState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl MsRefreshTokenState {
     pub fn new() -> Self {
         Self {
-- 
cgit v1.2.3-70-g09d2


From 505e3485f3dfa31969651f7f281fde33e9843fe8 Mon Sep 17 00:00:00 2001
From: HsiangNianian <i@jyunko.cn>
Date: Wed, 14 Jan 2026 14:55:44 +0800
Subject: refactor: consolidate derive attributes for AccountStore struct

---
 src-tauri/src/core/account_storage.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src-tauri/src/core/account_storage.rs')

diff --git a/src-tauri/src/core/account_storage.rs b/src-tauri/src/core/account_storage.rs
index 5ab86e4..569df7b 100644
--- a/src-tauri/src/core/account_storage.rs
+++ b/src-tauri/src/core/account_storage.rs
@@ -4,14 +4,12 @@ use std::fs;
 use std::path::PathBuf;
 
 /// Stored account data for persistence
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[derive(Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct AccountStore {
     pub accounts: Vec<StoredAccount>,
     pub active_account_id: Option<String>,
 }
 
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(tag = "type")]
 pub enum StoredAccount {
-- 
cgit v1.2.3-70-g09d2