generated from nhcarrigan/template
feat: add auth status display and account management to settings sidebar
Implements issue #153. Adds Account section to ConfigSidebar with: - Claude auth status (logged in/out, email, org, plan, API source) - API key override indicator reading from local Hikari config - Login/logout action buttons - Refresh button for manual status updates Adds Rust commands: get_auth_status, auth_login, auth_logout
This commit is contained in:
@@ -1360,6 +1360,136 @@ pub async fn get_claude_version() -> Result<String, String> {
|
||||
}
|
||||
}
|
||||
|
||||
// ==================== Auth Commands ====================
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct ClaudeAuthStatus {
|
||||
pub is_logged_in: bool,
|
||||
pub email: Option<String>,
|
||||
pub org_name: Option<String>,
|
||||
pub api_key_source: Option<String>,
|
||||
pub api_provider: Option<String>,
|
||||
pub subscription_type: Option<String>,
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn get_auth_status() -> Result<ClaudeAuthStatus, String> {
|
||||
tracing::debug!("Getting Claude auth status");
|
||||
|
||||
let output = create_claude_command()
|
||||
.args(["auth", "status"])
|
||||
.output()
|
||||
.map_err(|e| format!("Failed to run claude auth status: {}", e))?;
|
||||
|
||||
let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string();
|
||||
let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
|
||||
let raw = if stdout.is_empty() { &stderr } else { &stdout };
|
||||
|
||||
if let Ok(json) = serde_json::from_str::<serde_json::Value>(raw) {
|
||||
let is_logged_in = json
|
||||
.get("loggedIn")
|
||||
.and_then(|v| v.as_bool())
|
||||
.unwrap_or(false);
|
||||
|
||||
let email = json
|
||||
.get("email")
|
||||
.and_then(|v| v.as_str())
|
||||
.map(String::from);
|
||||
|
||||
let org_name = json
|
||||
.get("orgName")
|
||||
.and_then(|v| v.as_str())
|
||||
.map(String::from);
|
||||
|
||||
let api_key_source = json
|
||||
.get("apiKeySource")
|
||||
.and_then(|v| v.as_str())
|
||||
.map(String::from);
|
||||
|
||||
let api_provider = json
|
||||
.get("apiProvider")
|
||||
.and_then(|v| v.as_str())
|
||||
.map(String::from);
|
||||
|
||||
let subscription_type = json
|
||||
.get("subscriptionType")
|
||||
.and_then(|v| v.as_str())
|
||||
.map(String::from);
|
||||
|
||||
tracing::info!("Claude auth status: logged_in={}", is_logged_in);
|
||||
Ok(ClaudeAuthStatus {
|
||||
is_logged_in,
|
||||
email,
|
||||
org_name,
|
||||
api_key_source,
|
||||
api_provider,
|
||||
subscription_type,
|
||||
})
|
||||
} else {
|
||||
// Non-JSON output: fall back to heuristic
|
||||
let lower = raw.to_lowercase();
|
||||
let is_logged_in = output.status.success()
|
||||
&& !lower.contains("not logged in")
|
||||
&& !lower.contains("not authenticated")
|
||||
&& !lower.contains("no account");
|
||||
tracing::info!("Claude auth status (non-JSON): logged_in={}", is_logged_in);
|
||||
Ok(ClaudeAuthStatus {
|
||||
is_logged_in,
|
||||
email: None,
|
||||
org_name: None,
|
||||
api_key_source: None,
|
||||
api_provider: None,
|
||||
subscription_type: None,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn auth_login() -> Result<String, String> {
|
||||
tracing::info!("Running claude auth login");
|
||||
|
||||
let output = create_claude_command()
|
||||
.args(["auth", "login"])
|
||||
.output()
|
||||
.map_err(|e| format!("Failed to run claude auth login: {}", e))?;
|
||||
|
||||
let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string();
|
||||
let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
|
||||
|
||||
if output.status.success() {
|
||||
let message = if stdout.is_empty() { "Login successful".to_string() } else { stdout };
|
||||
tracing::info!("Claude auth login succeeded");
|
||||
Ok(message)
|
||||
} else {
|
||||
let error = if stderr.is_empty() { stdout } else { stderr };
|
||||
tracing::error!("Claude auth login failed: {}", error);
|
||||
Err(format!("Login failed: {}", error))
|
||||
}
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn auth_logout() -> Result<String, String> {
|
||||
tracing::info!("Running claude auth logout");
|
||||
|
||||
let output = create_claude_command()
|
||||
.args(["auth", "logout"])
|
||||
.output()
|
||||
.map_err(|e| format!("Failed to run claude auth logout: {}", e))?;
|
||||
|
||||
let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string();
|
||||
let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
|
||||
|
||||
if output.status.success() {
|
||||
let message = if stdout.is_empty() { "Logged out successfully".to_string() } else { stdout };
|
||||
tracing::info!("Claude auth logout succeeded");
|
||||
Ok(message)
|
||||
} else {
|
||||
let error = if stderr.is_empty() { stdout } else { stderr };
|
||||
tracing::error!("Claude auth logout failed: {}", error);
|
||||
Err(format!("Logout failed: {}", error))
|
||||
}
|
||||
}
|
||||
|
||||
// ==================== Plugin Management Commands ====================
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
|
||||
@@ -195,6 +195,9 @@ pub fn run() {
|
||||
close_application,
|
||||
list_memory_files,
|
||||
get_claude_version,
|
||||
get_auth_status,
|
||||
auth_login,
|
||||
auth_logout,
|
||||
list_plugins,
|
||||
install_plugin,
|
||||
uninstall_plugin,
|
||||
|
||||
Reference in New Issue
Block a user