Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
74 changes: 69 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ rusqlite = { version = "0.31", features = ["bundled"] }
libc = "0.2"
jsonc-parser = { version = "0.32", features = ["cst"] }
dirs = "5.0"
ureq = { version = "2.12", default-features = false, features = ["native-tls"] }
native-tls = "0.2"
ureq = { version = "3.3", default-features = false, features = ["native-tls"] }
url = "2.5"
glob = "0.3"
ignore = "0.4"
Expand Down
35 changes: 22 additions & 13 deletions src/api/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,30 +188,39 @@ impl ApiContext {
/// Create a GET request with common headers (User-Agent, X-Distinct-ID)
/// Use this for all HTTP GET requests to ensure consistent headers.
/// The returned (Agent, Request) pair uses the system's native certificate store.
pub fn http_get(url: &str, timeout_secs: Option<u64>) -> (ureq::Agent, ureq::Request) {
pub fn http_get(
url: &str,
timeout_secs: Option<u64>,
) -> (
ureq::Agent,
ureq::RequestBuilder<ureq::typestate::WithoutBody>,
) {
let agent = http::build_agent(timeout_secs);
let request = agent
.get(url)
.set(
.header(
"User-Agent",
&format!("git-ai/{}", env!("CARGO_PKG_VERSION")),
)
.set("X-Distinct-ID", &config::get_or_create_distinct_id());
.header("X-Distinct-ID", &config::get_or_create_distinct_id());
(agent, request)
}

/// Create a POST request with common headers (User-Agent, X-Distinct-ID)
/// Use this for all HTTP POST requests to ensure consistent headers.
/// The returned (Agent, Request) pair uses the system's native certificate store.
pub fn http_post(url: &str, timeout_secs: Option<u64>) -> (ureq::Agent, ureq::Request) {
pub fn http_post(
url: &str,
timeout_secs: Option<u64>,
) -> (ureq::Agent, ureq::RequestBuilder<ureq::typestate::WithBody>) {
let agent = http::build_agent(timeout_secs);
let request = agent
.post(url)
.set(
.header(
"User-Agent",
&format!("git-ai/{}", env!("CARGO_PKG_VERSION")),
)
.set("X-Distinct-ID", &config::get_or_create_distinct_id());
.header("X-Distinct-ID", &config::get_or_create_distinct_id());
(agent, request)
}

Expand Down Expand Up @@ -313,16 +322,16 @@ impl ApiContext {
let body_json = serde_json::to_string(body).map_err(GitAiError::JsonError)?;

let (_agent, mut request) = Self::http_post(&url, self.timeout_secs);
request = request.set("Content-Type", "application/json");
request = request.header("Content-Type", "application/json");

if let Some(api_key) = &self.api_key {
request = request.set("X-API-Key", api_key);
request = request.header("X-API-Key", api_key);
if let Some(identity) = &self.author_identity {
request = request.set("X-Author-Identity", identity);
request = request.header("X-Author-Identity", identity);
}
}
if let Some(token) = &self.auth_token {
request = request.set("Authorization", &format!("Bearer {}", token));
request = request.header("Authorization", &format!("Bearer {}", token));
}

http::send_with_body(request, &body_json)
Expand All @@ -336,13 +345,13 @@ impl ApiContext {
let (_agent, mut request) = Self::http_get(&url, self.timeout_secs);

if let Some(api_key) = &self.api_key {
request = request.set("X-API-Key", api_key);
request = request.header("X-API-Key", api_key);
if let Some(identity) = &self.author_identity {
request = request.set("X-Author-Identity", identity);
request = request.header("X-Author-Identity", identity);
}
}
if let Some(token) = &self.auth_token {
request = request.set("Authorization", &format!("Bearer {}", token));
request = request.header("Authorization", &format!("Bearer {}", token));
}

http::send(request).map_err(|e| GitAiError::Generic(format!("HTTP request failed: {}", e)))
Expand Down
6 changes: 3 additions & 3 deletions src/auth/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl OAuthClient {
let url = format!("{}/worker/oauth/token", self.base_url);

let (_agent, request) = ApiContext::http_post(&url, Some(30));
let request = request.set("Content-Type", "application/json");
let request = request.header("Content-Type", "application/json");
let response = http::send_with_body(request, &body.to_string())
.map_err(|e| format!("Failed to connect to server: {}", e))?;

Expand Down Expand Up @@ -98,7 +98,7 @@ impl OAuthClient {
let url = format!("{}/worker/oauth/device/code", self.base_url);

let (_agent, request) = ApiContext::http_post(&url, Some(30));
let request = request.set("Content-Type", "application/json");
let request = request.header("Content-Type", "application/json");
let response = http::send_with_body(request, "{}")
.map_err(|e| format!("Failed to connect to server: {}", e))?;

Expand Down Expand Up @@ -142,7 +142,7 @@ impl OAuthClient {
});

let (_agent, request) = ApiContext::http_post(&url, Some(30));
let request = request.set("Content-Type", "application/json");
let request = request.header("Content-Type", "application/json");
let response = http::send_with_body(request, &body.to_string())
.map_err(|e| format!("Failed to connect to server: {}", e))?;

Expand Down
15 changes: 9 additions & 6 deletions src/ci/gitlab.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,13 @@ fn gitlab_api_get(
auth_token: &str,
) -> Result<crate::http::Response, String> {
let agent = crate::http::build_agent(Some(30));
let request = agent.get(endpoint).set(auth_header_name, auth_token).set(
"User-Agent",
&format!("git-ai/{}", env!("CARGO_PKG_VERSION")),
);
let request = agent
.get(endpoint)
.header(auth_header_name, auth_token)
.header(
"User-Agent",
&format!("git-ai/{}", env!("CARGO_PKG_VERSION")),
);
crate::http::send(request)
}

Expand Down Expand Up @@ -300,8 +303,8 @@ pub fn get_gitlab_ci_context() -> Result<Option<CiContext>, GitAiError> {
let agent = crate::http::build_agent(Some(30));
let request = agent
.get(&source_project_endpoint)
.set(auth_header_name, &auth_token)
.set(
.header(auth_header_name, &auth_token)
.header(
"User-Agent",
&format!("git-ai/{}", env!("CARGO_PKG_VERSION")),
);
Expand Down
6 changes: 3 additions & 3 deletions src/commands/analyze/cube.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ impl CubeClient {
let request = self
.agent
.post(&self.url(path))
.set("x-api-key", &self.api_key)
.set("Content-Type", "application/json");
.header("x-api-key", &self.api_key)
.header("Content-Type", "application/json");
let body_str = serde_json::to_string(body).map_err(|e| CubeError::Json(e.to_string()))?;
let response = http::send_with_body(request, &body_str).map_err(CubeError::Transport)?;
Self::parse(response)
Expand All @@ -99,7 +99,7 @@ impl CubeClient {
let request = self
.agent
.get(&self.url(path))
.set("x-api-key", &self.api_key);
.header("x-api-key", &self.api_key);
let response = http::send(request).map_err(CubeError::Transport)?;
Self::parse(response)
}
Expand Down
6 changes: 3 additions & 3 deletions src/daemon/telemetry_worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ fn flush_sentry_and_posthog(
let agent = crate::http::build_agent(Some(30));
let request = agent
.post(&endpoint)
.set("Content-Type", "application/json");
.header("Content-Type", "application/json");
let _ = crate::http::send_with_body(
request,
&serde_json::to_string(&ph_event).unwrap_or_default(),
Expand Down Expand Up @@ -1499,8 +1499,8 @@ impl SentryClient {
let agent = crate::http::build_agent(Some(30));
let request = agent
.post(&self.endpoint)
.set("X-Sentry-Auth", &auth_header)
.set("Content-Type", "application/json");
.header("X-Sentry-Auth", &auth_header)
.header("Content-Type", "application/json");
let response = crate::http::send_with_body(request, &body)?;

let status = response.status_code;
Expand Down
Loading
Loading