fix(auth): centralize base_dir resolution and fix arg parsing

Resolves code review feedback:
- Extracted 'base_config_dir()' to a single location to prevent buggy fallback deduplication across 'auth_commands.rs' and 'credential_store.rs'.
- Fixed 'main.rs' argument filtering logic which incorrectly skipped the values of the '--api-version' flag.

Author: Joevenner

src/auth_commands.rs

@@ -91,8 +91,8 @@ const READONLY_SCOPES: &[&str] = &[
     "https://www.googleapis.com/auth/tasks.readonly",
 ];
 
-pub fn config_dir() -> PathBuf {
-    let base_dir = if let Ok(dir) = std::env::var("GOOGLE_WORKSPACE_CLI_CONFIG_DIR") {
+pub fn base_config_dir() -> PathBuf {
+    if let Ok(dir) = std::env::var("GOOGLE_WORKSPACE_CLI_CONFIG_DIR") {
         PathBuf::from(dir)
     } else {
         // Use ~/.config/gws on all platforms for a consistent, user-friendly path.
@@ -115,7 +115,11 @@ pub fn config_dir() -> PathBuf {
                 primary
             }
         }
-    };
+    }
+}
+
+pub fn config_dir() -> PathBuf {
+    let base_dir = base_config_dir();
 
     // Determine the active profile
     let mut profile = std::env::var("GOOGLE_WORKSPACE_CLI_PROFILE").ok().filter(|s| !s.is_empty());
@@ -199,21 +203,7 @@ fn handle_switch(args: &[String]) -> Result<(), GwsError> {
     let profile_name = &args[0];
 
     // Read the base directory without applying the current active profile
-    let base_dir = if let Ok(dir) = std::env::var("GOOGLE_WORKSPACE_CLI_CONFIG_DIR") {
-        PathBuf::from(dir)
-    } else {
-        let primary = dirs::home_dir()
-            .unwrap_or_else(|| PathBuf::from("."))
-            .join(".config")
-            .join("gws");
-        if primary.exists() {
-            primary
-        } else {
-            dirs::config_dir()
-                .unwrap_or_else(|| PathBuf::from("."))
-                .join("gws")
-        }
-    };
+    let base_dir = base_config_dir();
 
     if !base_dir.exists() {
         std::fs::create_dir_all(&base_dir).map_err(|e| {
@@ -1217,21 +1207,7 @@ async fn handle_status() -> Result<(), GwsError> {
     );
 
     // Determine the active profile
-    let base_dir = if let Ok(dir) = std::env::var("GOOGLE_WORKSPACE_CLI_CONFIG_DIR") {
-        PathBuf::from(dir)
-    } else {
-        let primary = dirs::home_dir()
-            .unwrap_or_else(|| PathBuf::from("."))
-            .join(".config")
-            .join("gws");
-        if primary.exists() {
-            primary
-        } else {
-            dirs::config_dir()
-                .unwrap_or_else(|| PathBuf::from("."))
-                .join("gws")
-        }
-    };
+    let base_dir = base_config_dir();
 
     let profile = std::env::var("GOOGLE_WORKSPACE_CLI_PROFILE")
         .ok()

src/credential_store.rs

@@ -52,14 +52,7 @@ fn get_or_create_key() -> anyhow::Result<[u8; 32]> {
         .filter(|s| !s.is_empty())
         .or_else(|| {
             // Attempt to read from the base config dir's active_profile
-            let base_dir = if let Ok(dir) = std::env::var("GOOGLE_WORKSPACE_CLI_CONFIG_DIR") {
-                PathBuf::from(dir)
-            } else {
-                dirs::home_dir()
-                    .unwrap_or_else(|| PathBuf::from("."))
-                    .join(".config")
-                    .join("gws")
-            };
+            let base_dir = crate::auth_commands::base_config_dir();
             std::fs::read_to_string(base_dir.join("active_profile"))
                 .ok()
                 .map(|s| s.trim().to_string())

src/main.rs

@@ -64,42 +64,39 @@ async fn run() -> Result<(), GwsError> {
         ));
     }
 
-    // Find the first non-flag arg (skip --api-version, --profile and their values)
-    let mut first_arg: Option<String> = None;
     let mut filtered_args = vec![args[0].clone()];
-    {
-        let mut skip_next = false;
-        for a in args.iter().skip(1) {
-            if skip_next {
-                skip_next = false;
-                continue;
-            }
-            if a == "--api-version" {
-                filtered_args.push(a.clone());
-                skip_next = true;
-                continue;
-            }
-            if a.starts_with("--api-version=") {
-                filtered_args.push(a.clone());
-                continue;
-            }
-            if a == "--profile" {
-                skip_next = true;
-                continue;
-            }
-            if a.starts_with("--profile=") {
-                continue;
-            }
-            filtered_args.push(a.clone());
-
-            if first_arg.is_none()
-                && !a.starts_with("--")
-                && a.as_str() != "--help"
-                && a.as_str() != "--version"
-            {
-                first_arg = Some(a.clone());
+    let mut first_arg: Option<String> = None;
+    let mut i = 1;
+    while i < args.len() {
+        let a = &args[i];
+        
+        if a == "--profile" {
+            i += 2; // Skip --profile and its value
+            continue;
+        }
+        if a.starts_with("--profile=") {
+            i += 1;
+            continue;
+        }
+
+        filtered_args.push(a.clone());
+        
+        if a == "--api-version" {
+            if i + 1 < args.len() {
+                filtered_args.push(args[i+1].clone());
             }
+            i += 2; // Skip both the flag and the value
+            continue;
+        }
+        if a.starts_with("--api-version=") {
+            i += 1;
+            continue;
+        }
+        
+        if first_arg.is_none() && !a.starts_with("--") && a != "--help" && a != "--version" {
+            first_arg = Some(a.clone());
         }
+        i += 1;
     }
 
     // Extract profile early to set environment variable