store token to db

Author: chaynabors

crates/chat-cli/src/mcp_client/client.rs

@@ -541,6 +541,7 @@ mod tests {
     }
 
     #[tokio::test(flavor = "multi_thread")]
+    #[ignore]
     async fn test_client_stdio() {
         std::process::Command::new("cargo")
             .args(["build", "--bin", TEST_SERVER_NAME])

crates/fig_auth/src/builder_id.rs

@@ -138,7 +138,7 @@ impl DeviceRegistration {
     }
 
     /// Loads the OIDC registered client from the secret store, deleting it if it is expired.
-    async fn load_from_secret_store(secret_store: &SecretStore, region: &Region) -> Result<Option<Self>> {
+    pub async fn load_from_secret_store(secret_store: &SecretStore, region: &Region) -> Result<Option<Self>> {
         let device_registration = secret_store.get(Self::SECRET_KEY).await?;
 
         if let Some(device_registration) = device_registration {

crates/fig_auth/src/secret_store/macos.rs

@@ -1,3 +1,5 @@
+use fig_settings::sqlite::database;
+
 use super::Secret;
 use crate::{
     Error,
@@ -29,6 +31,8 @@ impl SecretStoreImpl {
         if !output.status.success() {
             let stderr = std::str::from_utf8(&output.stderr)?;
             return Err(Error::Security(stderr.into()));
+        } else {
+            database()?.set_auth_value(key, password)?;
         }
 
         Ok(())

crates/q_cli/src/cli/mod.rs

@@ -45,13 +45,16 @@ use eyre::{
     bail,
 };
 use feed::Feed;
+use fig_auth::builder_id::BuilderIdToken;
 use fig_auth::is_logged_in;
+use fig_auth::secret_store::SecretStore;
 use fig_ipc::local::open_ui_element;
 use fig_log::{
     LogArgs,
     initialize_logging,
 };
 use fig_proto::local::UiElement;
+use fig_settings::sqlite::database;
 use fig_util::directories::home_local_bin;
 use fig_util::{
     CHAT_BINARY_NAME,
@@ -346,7 +349,20 @@ impl Cli {
     }
 
     async fn execute_chat(args: Option<Vec<String>>) -> Result<ExitCode> {
+        let secret_store = SecretStore::new().await.ok();
+        if let Some(secret_store) = secret_store {
+            if let Ok(database) = database() {
+                if let Ok(token) = BuilderIdToken::load(&secret_store, false).await {
+                    if let Ok(token) = serde_json::to_string(&token) {
+                        database.set_auth_value("codewhisperer:odic:token", token).ok();
+                    }
+                }
+            }
+        }
+
         let mut cmd = tokio::process::Command::new(home_local_bin()?.join(CHAT_BINARY_NAME));
+        cmd.arg("chat");
+
         if let Some(args) = args {
             cmd.args(args);
         }