去除工作区相关,因为无法获取到用户工作区

Author: Mrz-sakura

changelog.md

@@ -1,4 +1,6 @@
 ## 更新日志
+- v1.4.1
+  1. 去除工作区相关,因为无法获取到用户工作区
 - v1.4.0
   1. 支持自己选择codex路径
   2. 优化opencode 授权

src-tauri/src/auth.rs

@@ -45,7 +45,6 @@ pub(crate) fn read_current_auth_status() -> Result<CurrentAuthStatus, String> {
         return Ok(CurrentAuthStatus {
             available: false,
             account_id: None,
-            workspace_name: None,
             email: None,
             plan_type: None,
             auth_mode: None,
@@ -80,9 +79,6 @@ pub(crate) fn read_current_auth_status() -> Result<CurrentAuthStatus, String> {
     let extracted = extract_auth(&value).ok();
     let principal_id = extracted.as_ref().map(|auth| auth.principal_id.clone());
     let account_id = extracted.as_ref().map(|auth| auth.account_id.clone());
-    let workspace_name = extracted
-        .as_ref()
-        .and_then(|auth| auth.workspace_name.clone());
     let email = extracted.as_ref().and_then(|auth| auth.email.clone());
     let plan_type = extracted.as_ref().and_then(|auth| auth.plan_type.clone());
 
@@ -98,7 +94,6 @@ pub(crate) fn read_current_auth_status() -> Result<CurrentAuthStatus, String> {
     Ok(CurrentAuthStatus {
         available: true,
         account_id,
-        workspace_name,
         email,
         plan_type,
         auth_mode,
@@ -226,7 +221,6 @@ pub(crate) fn extract_auth(auth_json: &Value) -> Result<ExtractedAuth, String> {
         .get("account_id")
         .and_then(Value::as_str)
         .map(ToString::to_string);
-    let mut organizations: Vec<Value> = Vec::new();
     let mut email = None;
     let mut plan_type = None;
     let mut principal_id = None;
@@ -240,11 +234,6 @@ pub(crate) fn extract_auth(auth_json: &Value) -> Result<ExtractedAuth, String> {
         let auth_claim = claims
             .get("https://api.openai.com/auth")
             .and_then(Value::as_object);
-        organizations = auth_claim
-            .and_then(|value| value.get("organizations"))
-            .and_then(Value::as_array)
-            .cloned()
-            .unwrap_or_default();
         if account_id.is_none() {
             account_id = auth_claim
                 .and_then(|value| value.get("chatgpt_account_id"))
@@ -279,76 +268,16 @@ pub(crate) fn extract_auth(auth_json: &Value) -> Result<ExtractedAuth, String> {
     let account_id =
         account_id.ok_or_else(|| "无法从 auth.json 识别 chatgpt_account_id".to_string())?;
     let principal_id = principal_id.unwrap_or_else(|| account_id.clone());
-    let workspace_name = resolve_workspace_name_from_organizations(&organizations, &account_id);
 
     Ok(ExtractedAuth {
         principal_id,
         account_id,
-        workspace_name,
         access_token,
         email,
         plan_type,
     })
 }
 
-fn resolve_workspace_name_from_organizations(
-    organizations: &[Value],
-    account_id: &str,
-) -> Option<String> {
-    #[derive(Clone)]
-    struct OrganizationCandidate {
-        id: Option<String>,
-        title: String,
-        is_default: bool,
-    }
-
-    let candidates: Vec<OrganizationCandidate> = organizations
-        .iter()
-        .filter_map(|item| {
-            let object = item.as_object()?;
-            let title = object
-                .get("title")
-                .and_then(Value::as_str)
-                .map(str::trim)
-                .filter(|value| !value.is_empty())?
-                .to_string();
-
-            Some(OrganizationCandidate {
-                id: object
-                    .get("id")
-                    .and_then(Value::as_str)
-                    .map(ToString::to_string),
-                title,
-                is_default: object
-                    .get("is_default")
-                    .and_then(Value::as_bool)
-                    .unwrap_or(false),
-            })
-        })
-        .collect();
-
-    if let Some(exact) = candidates
-        .iter()
-        .find(|candidate| candidate.id.as_deref() == Some(account_id))
-    {
-        return Some(exact.title.clone());
-    }
-
-    if candidates.len() == 1 {
-        return Some(candidates[0].title.clone());
-    }
-
-    let default_candidates: Vec<&OrganizationCandidate> = candidates
-        .iter()
-        .filter(|candidate| candidate.is_default)
-        .collect();
-    if default_candidates.len() == 1 {
-        return Some(default_candidates[0].title.clone());
-    }
-
-    None
-}
-
 pub(crate) fn current_auth_account_key() -> Option<String> {
     read_current_codex_auth()
         .ok()
@@ -589,61 +518,3 @@ fn extract_client_id_from_claims(claims: &Value) -> Option<String> {
         _ => None,
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::resolve_workspace_name_from_organizations;
-    use serde_json::json;
-    use serde_json::Value;
-
-    fn organizations(items: Value) -> Vec<Value> {
-        items.as_array().cloned().unwrap_or_default()
-    }
-
-    #[test]
-    fn workspace_name_prefers_exact_id_match() {
-        let organizations = organizations(json!([
-            { "id": "org-1", "title": "Default Workspace", "is_default": true },
-            { "id": "acct-2", "title": "Target Workspace", "is_default": false }
-        ]));
-
-        let resolved = resolve_workspace_name_from_organizations(&organizations, "acct-2");
-
-        assert_eq!(resolved.as_deref(), Some("Target Workspace"));
-    }
-
-    #[test]
-    fn workspace_name_uses_single_organization_title() {
-        let organizations = organizations(
-            json!([{ "id": "org-1", "title": "Only Workspace", "is_default": false }]),
-        );
-
-        let resolved = resolve_workspace_name_from_organizations(&organizations, "acct-unknown");
-
-        assert_eq!(resolved.as_deref(), Some("Only Workspace"));
-    }
-
-    #[test]
-    fn workspace_name_uses_unique_default_as_fallback() {
-        let organizations = organizations(json!([
-            { "id": "org-1", "title": "Default Workspace", "is_default": true },
-            { "id": "org-2", "title": "Secondary Workspace", "is_default": false }
-        ]));
-
-        let resolved = resolve_workspace_name_from_organizations(&organizations, "acct-unknown");
-
-        assert_eq!(resolved.as_deref(), Some("Default Workspace"));
-    }
-
-    #[test]
-    fn workspace_name_returns_none_when_ambiguous() {
-        let organizations = organizations(json!([
-            { "id": "org-1", "title": "Workspace A", "is_default": false },
-            { "id": "org-2", "title": "Workspace B", "is_default": false }
-        ]));
-
-        let resolved = resolve_workspace_name_from_organizations(&organizations, "acct-unknown");
-
-        assert_eq!(resolved, None);
-    }
-}

src-tauri/src/models.rs

@@ -61,7 +61,6 @@ pub(crate) struct AccountSummary {
     pub(crate) email: Option<String>,
     pub(crate) account_key: String,
     pub(crate) account_id: String,
-    pub(crate) workspace_name: Option<String>,
     pub(crate) plan_type: Option<String>,
     pub(crate) added_at: i64,
     pub(crate) updated_at: i64,
@@ -115,7 +114,6 @@ pub(crate) struct SwitchAccountResult {
 pub(crate) struct CurrentAuthStatus {
     pub(crate) available: bool,
     pub(crate) account_id: Option<String>,
-    pub(crate) workspace_name: Option<String>,
     pub(crate) email: Option<String>,
     pub(crate) plan_type: Option<String>,
     pub(crate) auth_mode: Option<String>,
@@ -128,7 +126,6 @@ pub(crate) struct CurrentAuthStatus {
 pub(crate) struct ExtractedAuth {
     pub(crate) principal_id: String,
     pub(crate) account_id: String,
-    pub(crate) workspace_name: Option<String>,
     pub(crate) access_token: String,
     pub(crate) email: Option<String>,
     pub(crate) plan_type: Option<String>,
@@ -392,12 +389,6 @@ impl StoredAccount {
             })
     }
 
-    pub(crate) fn workspace_name(&self) -> Option<String> {
-        extract_auth(&self.auth_json)
-            .ok()
-            .and_then(|auth| auth.workspace_name)
-    }
-
     pub(crate) fn variant_key(&self) -> String {
         account_variant_key(
             &self.principal_key(),
@@ -426,7 +417,6 @@ impl StoredAccount {
             email: self.email.clone(),
             account_key,
             account_id: self.account_id.clone(),
-            workspace_name: self.workspace_name(),
             plan_type: self.plan_type.clone(),
             added_at: self.added_at,
             updated_at: self.updated_at,