Skip to content

Authenticate Code Everywhere HTTP client #11

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
cbusillo merged 1 commit into from
May 1, 2026
Merged

Authenticate Code Everywhere HTTP client #11

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
101 changes: 83 additions & 18 deletions code-rs/tui/src/remote_inbox/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ fn spawn_code_everywhere_http_client(
}
}
_ = poll.tick() => {
match http.claim_commands(&session).await {
match http.claim_commands(&session, &config).await {
Ok(commands) => {
for command in commands {
let queue_new_session = matches!(command, CodeEverywhereCommand::NewSession { .. });
Expand All @@ -689,7 +689,10 @@ fn spawn_code_everywhere_http_client(
} else {
None
};
if let Err(err) = http.publish_command_outcome(&session, outcome).await {
if let Err(err) = http
.publish_command_outcome(&session, &config, outcome)
.await
{
tracing::warn!("failed to publish Code Everywhere command outcome: {err}");
hello_published = false;
} else if let Some(command_id) = new_session_command_id {
Expand Down Expand Up @@ -738,10 +741,11 @@ fn spawn_code_everywhere_http_client(
}
}
if session_presence_check.is_none() {
let check_config = config.clone();
let check_http = http.clone();
let check_session = session.clone();
session_presence_check = Some(tokio::spawn(async move {
check_http.session_is_present(&check_session).await
check_http.session_is_present(&check_session, &check_config).await
}));
}
}
Expand Down Expand Up @@ -835,31 +839,46 @@ impl CodeEverywhereHttpClient {
return Ok(());
}

self.publish_events(events).await
self.publish_events(config, events).await
}

async fn publish_command_outcome(
&self,
session: &RemoteInboxSession,
config: &RemoteInboxConfig,
outcome: CodeEverywhereCommandOutcome,
) -> Result<(), reqwest::Error> {
self.publish_events(code_everywhere_command_events(session, outcome)).await
self.publish_events(config, code_everywhere_command_events(session, outcome))
.await
}

async fn publish_events(&self, events: Vec<Value>) -> Result<(), reqwest::Error> {
self.client
.post(local_http_url(&self.base_url, "events"))
.json(&json!({ "events": events }))
.send()
.await?
.error_for_status()?;
async fn publish_events(
&self,
config: &RemoteInboxConfig,
events: Vec<Value>,
) -> Result<(), reqwest::Error> {
self.apply_auth(
self.client
.post(local_http_url(&self.base_url, "events"))
.json(&json!({ "events": events })),
config,
)
.send()
.await?
.error_for_status()?;
Ok(())
}

async fn session_is_present(&self, session: &RemoteInboxSession) -> Result<bool, reqwest::Error> {
async fn session_is_present(
&self,
session: &RemoteInboxSession,
config: &RemoteInboxConfig,
) -> Result<bool, reqwest::Error> {
let snapshot = self
.client
.get(local_http_url(&self.base_url, "snapshot"))
.apply_auth(
self.client.get(local_http_url(&self.base_url, "snapshot")),
config,
)
.send()
.await?
.error_for_status()?
Expand All @@ -874,11 +893,15 @@ impl CodeEverywhereHttpClient {
async fn claim_commands(
&self,
session: &RemoteInboxSession,
config: &RemoteInboxConfig,
) -> Result<Vec<CodeEverywhereCommand>, reqwest::Error> {
let response = self
.client
.post(local_http_url(&self.base_url, "commands/claim"))
.json(&json!({ "sessionId": session.session_id }))
.apply_auth(
self.client
.post(local_http_url(&self.base_url, "commands/claim"))
.json(&json!({ "sessionId": session.session_id })),
config,
)
.send()
.await?
.error_for_status()?
Expand All @@ -891,6 +914,27 @@ impl CodeEverywhereHttpClient {
.filter_map(|record| parse_code_everywhere_command(record, session))
.collect())
}

fn apply_auth(
&self,
request: reqwest::RequestBuilder,
config: &RemoteInboxConfig,
) -> reqwest::RequestBuilder {
if let Some(header) = code_everywhere_auth_header_value(config) {
request.header(reqwest::header::AUTHORIZATION, header)
} else {
request
}
}
}

fn code_everywhere_auth_header_value(config: &RemoteInboxConfig) -> Option<String> {
let token = config.token.as_ref()?.trim();
if token.is_empty() {
None
} else {
Some(format!("Bearer {token}"))
}
}

#[derive(Debug, Deserialize)]
Expand Down Expand Up @@ -2744,6 +2788,27 @@ mod tests {
);
}

#[test]
fn code_everywhere_http_auth_header_uses_remote_inbox_token() {
let config = RemoteInboxConfig {
enabled: true,
bridge_url: None,
code_everywhere_url: Some("http://127.0.0.1:4789".to_string()),
token: Some(" apple-proof-token ".to_string()),
host_id: None,
host_label: None,
};

assert_eq!(
code_everywhere_auth_header_value(&config).as_deref(),
Some("Bearer apple-proof-token")
);

let mut blank_config = config;
blank_config.token = Some(" ".to_string());
assert_eq!(code_everywhere_auth_header_value(&blank_config), None);
}

#[test]
fn code_everywhere_maps_remote_inbox_events() {
let session = test_session();
Expand Down