Skip to content

fix(mcp): bug where refreshed credentials gets deleted #2879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evanliu048 merged 1 commit into from
Sep 16, 2025
Merged

fix(mcp): bug where refreshed credentials gets deleted #2879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/chat-cli/src/mcp_client/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ impl McpClientService {
);

let new_transport =
get_http_transport(&os_clone, true, &url, Some(auth_client.auth_client.clone()), &*messenger_dup).await?;
get_http_transport(&os_clone, &url, Some(auth_client.auth_client.clone()), &*messenger_dup).await?;

match new_transport {
HttpTransport::WithAuth((new_transport, new_auth_client)) => {
Expand All @@ -363,7 +363,7 @@ impl McpClientService {
// case we would need to have user go through the auth flow
// again
let new_transport =
get_http_transport(&os_clone, true, &url, None, &*messenger_dup).await?;
get_http_transport(&os_clone, &url, None, &*messenger_dup).await?;

match new_transport {
HttpTransport::WithAuth((new_transport, new_auth_client)) => {
Expand Down Expand Up @@ -519,7 +519,7 @@ impl McpClientService {
Ok(Transport::Stdio((tokio_child_process, child_stderr)))
},
TransportType::Http => {
let http_transport = get_http_transport(os, false, url, None, messenger).await?;
let http_transport = get_http_transport(os, url, None, messenger).await?;

Ok(Transport::Http(http_transport))
},
Expand Down
5 changes: 0 additions & 5 deletions crates/chat-cli/src/mcp_client/oauth_util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ fn get_scopes() -> &'static [&'static str] {

pub async fn get_http_transport(
os: &Os,
delete_cache: bool,
url: &str,
auth_client: Option<AuthClient<Client>>,
messenger: &dyn Messenger,
Expand All @@ -179,10 +178,6 @@ pub async fn get_http_transport(
let cred_full_path = cred_dir.join(format!("{key}.token.json"));
let reg_full_path = cred_dir.join(format!("{key}.registration.json"));

if delete_cache && cred_full_path.is_file() {
tokio::fs::remove_file(&cred_full_path).await?;
}

let reqwest_client = reqwest::Client::default();
let probe_resp = reqwest_client.get(url.clone()).send().await?;
match probe_resp.status() {
Expand Down
Loading