From dcec519565aab6dc13274ef9b0aba66312e8b720 Mon Sep 17 00:00:00 2001 From: Sharang Parnerkar <30073382+mighty840@users.noreply.github.com> Date: Wed, 17 Jun 2026 20:31:21 +0200 Subject: [PATCH] fix(dashboard): attach Keycloak token on agent API calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Symptom: "unable to load repositories" — agent returns "Missing authorization header" 401 on every protected endpoint because the dashboard's server functions were calling reqwest::get without an Authorization header. The Keycloak OIDC flow (auth_login / auth_callback) was already wired up and storing the access_token in tower-sessions, but the access_token was never threaded into outbound calls. Fix - New `infrastructure::agent_client` module exposes: - `agent_request(method, path) -> RequestBuilder` - `agent_get(path) -> RequestBuilder` (sugar for GET) Both pull the session's access_token (via FullstackContext extract) and attach `Authorization: Bearer `. When Keycloak is not configured the helper short-circuits — matching the dashboard's require_auth middleware which short-circuits in the same state. - Migrated every #[server] function in: - chat, dast, findings, graph, issues, notifications, pentest, repositories, sbom, scans, stats - 57 call sites total, all replaced. - Left as-is: - `infrastructure::server::webhook_proxy` — forwards to the agent's separate webhook server (port 3002), which is HMAC-authenticated, not JWT-authenticated. - `infrastructure::auth::auth_callback` — performs the KC token exchange itself; bearer auth would be circular. Test plan - cargo fmt --all clean - cargo clippy -p compliance-dashboard --features server -- -D warnings clean - cargo check -p compliance-dashboard --features server clean - cargo check -p compliance-dashboard (web target) implicit via build - Manual: after deploy, dashboard's repositories page loads without 401; calls now carry Authorization: Bearer header to the agent. Co-Authored-By: Claude Opus 4.7 --- .../src/infrastructure/agent_client.rs | 61 ++++ .../src/infrastructure/chat.rs | 61 ++-- .../src/infrastructure/dast.rs | 56 ++- .../src/infrastructure/findings.rs | 86 ++--- .../src/infrastructure/graph.rs | 78 ++--- .../src/infrastructure/issues.rs | 8 +- .../src/infrastructure/mod.rs | 2 + .../src/infrastructure/notifications.rs | 41 +-- .../src/infrastructure/pentest.rs | 329 ++++++++---------- .../src/infrastructure/repositories.rs | 109 +++--- .../src/infrastructure/sbom.rs | 55 ++- .../src/infrastructure/scans.rs | 11 +- .../src/infrastructure/stats.rs | 8 +- 13 files changed, 412 insertions(+), 493 deletions(-) create mode 100644 compliance-dashboard/src/infrastructure/agent_client.rs diff --git a/compliance-dashboard/src/infrastructure/agent_client.rs b/compliance-dashboard/src/infrastructure/agent_client.rs new file mode 100644 index 0000000..f2354b0 --- /dev/null +++ b/compliance-dashboard/src/infrastructure/agent_client.rs @@ -0,0 +1,61 @@ +//! Authenticated HTTP client for talking to the compliance-agent. +//! +//! Every dashboard server function that hits `comp-dev.meghsakha.com/api/v1/*` +//! must go through here so the Keycloak access token from the user's +//! session is attached as `Authorization: Bearer `. Without it +//! the agent's M7.1 `require_jwt_auth` middleware rejects with 401 +//! "Missing authorization header". +//! +//! When Keycloak is not configured (dev convenience), the helper +//! returns an unauthenticated builder — matching the agent's +//! pass-through behavior in the same state. + +use dioxus::prelude::ServerFnError; +use dioxus_fullstack::FullstackContext; +use reqwest::Method; + +use super::auth::LOGGED_IN_USER_SESS_KEY; +use super::server_state::ServerState; +use super::user_state::UserStateInner; + +/// Build a `RequestBuilder` for `` with the +/// session's access token attached. `path` should include a leading +/// `/`, e.g. `"/api/v1/repositories"`. +pub async fn agent_request( + method: Method, + path: &str, +) -> Result { + let state: ServerState = FullstackContext::extract().await?; + let url = format!("{}{}", state.agent_api_url, path); + let mut req = reqwest::Client::new().request(method, &url); + req = attach_token(req, &state).await?; + Ok(req) +} + +/// Same as [`agent_request`] but for `GET`. Convenience for the common case. +pub async fn agent_get(path: &str) -> Result { + agent_request(Method::GET, path).await +} + +/// Attach the session's bearer token if Keycloak is configured AND the +/// session has a logged-in user. Otherwise leave the request as-is. +/// +/// The Keycloak-disabled path mirrors the dashboard's `require_auth` +/// middleware, which short-circuits when `state.keycloak.is_none()`. +async fn attach_token( + req: reqwest::RequestBuilder, + state: &ServerState, +) -> Result { + if state.keycloak.is_none() { + return Ok(req); + } + let session: tower_sessions::Session = FullstackContext::extract().await?; + let user: Option = session + .get(LOGGED_IN_USER_SESS_KEY) + .await + .map_err(|e| ServerFnError::new(format!("session read failed: {e}")))?; + Ok(match user { + Some(u) => req.bearer_auth(u.access_token), + None => req, + }) +} diff --git a/compliance-dashboard/src/infrastructure/chat.rs b/compliance-dashboard/src/infrastructure/chat.rs index 6dee347..54b9b58 100644 --- a/compliance-dashboard/src/infrastructure/chat.rs +++ b/compliance-dashboard/src/infrastructure/chat.rs @@ -61,23 +61,21 @@ pub async fn send_chat_message( message: String, history: Vec, ) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - - let url = format!("{}/api/v1/chat/{repo_id}", state.agent_api_url); - let client = reqwest::Client::builder() - .timeout(std::time::Duration::from_secs(120)) - .build() - .map_err(|e| ServerFnError::new(e.to_string()))?; - let resp = client - .post(&url) - .json(&serde_json::json!({ - "message": message, - "history": history, - })) - .send() - .await - .map_err(|e| ServerFnError::new(format!("Request failed: {e}")))?; + // Chat uses a longer timeout because the LLM round-trip can be slow; + // agent_request doesn't expose a per-call timeout so we layer one on. + let resp = super::agent_client::agent_request( + reqwest::Method::POST, + &format!("/api/v1/chat/{repo_id}"), + ) + .await? + .timeout(std::time::Duration::from_secs(120)) + .json(&serde_json::json!({ + "message": message, + "history": history, + })) + .send() + .await + .map_err(|e| ServerFnError::new(format!("Request failed: {e}")))?; let text = resp .text() @@ -91,19 +89,14 @@ pub async fn send_chat_message( #[server] pub async fn trigger_embedding_build(repo_id: String) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - - let url = format!( - "{}/api/v1/chat/{repo_id}/build-embeddings", - state.agent_api_url - ); - let client = reqwest::Client::new(); - client - .post(&url) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + super::agent_client::agent_request( + reqwest::Method::POST, + &format!("/api/v1/chat/{repo_id}/build-embeddings"), + ) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; Ok(()) } @@ -111,11 +104,9 @@ pub async fn trigger_embedding_build(repo_id: String) -> Result<(), ServerFnErro pub async fn fetch_embedding_status( repo_id: String, ) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - - let url = format!("{}/api/v1/chat/{repo_id}/status", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get(&format!("/api/v1/chat/{repo_id}/status")) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: EmbeddingStatusResponse = resp diff --git a/compliance-dashboard/src/infrastructure/dast.rs b/compliance-dashboard/src/infrastructure/dast.rs index 9b6fe50..8b51002 100644 --- a/compliance-dashboard/src/infrastructure/dast.rs +++ b/compliance-dashboard/src/infrastructure/dast.rs @@ -26,10 +26,9 @@ pub struct DastFindingDetailResponse { #[server] pub async fn fetch_dast_targets() -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/dast/targets", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get("/api/v1/dast/targets") + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: DastTargetsResponse = resp @@ -41,10 +40,9 @@ pub async fn fetch_dast_targets() -> Result #[server] pub async fn fetch_dast_scan_runs() -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/dast/scan-runs", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get("/api/v1/dast/scan-runs") + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: DastScanRunsResponse = resp @@ -56,10 +54,9 @@ pub async fn fetch_dast_scan_runs() -> Result Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/dast/findings", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get("/api/v1/dast/findings") + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: DastFindingsResponse = resp @@ -73,10 +70,9 @@ pub async fn fetch_dast_findings() -> Result Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/dast/findings/{id}", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get(&format!("/api/v1/dast/findings/{id}")) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: DastFindingDetailResponse = resp @@ -88,12 +84,8 @@ pub async fn fetch_dast_finding_detail( #[server] pub async fn add_dast_target(name: String, base_url: String) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/dast/targets", state.agent_api_url); - let client = reqwest::Client::new(); - client - .post(&url) + super::agent_client::agent_request(reqwest::Method::POST, "/api/v1/dast/targets") + .await? .json(&serde_json::json!({ "name": name, "base_url": base_url, @@ -106,17 +98,13 @@ pub async fn add_dast_target(name: String, base_url: String) -> Result<(), Serve #[server] pub async fn trigger_dast_scan(target_id: String) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/dast/targets/{target_id}/scan", - state.agent_api_url - ); - let client = reqwest::Client::new(); - client - .post(&url) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + super::agent_client::agent_request( + reqwest::Method::POST, + &format!("/api/v1/dast/targets/{target_id}/scan"), + ) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; Ok(()) } diff --git a/compliance-dashboard/src/infrastructure/findings.rs b/compliance-dashboard/src/infrastructure/findings.rs index 41ce95b..06ca180 100644 --- a/compliance-dashboard/src/infrastructure/findings.rs +++ b/compliance-dashboard/src/infrastructure/findings.rs @@ -24,39 +24,35 @@ pub struct FindingsQuery { #[server] pub async fn fetch_findings(query: FindingsQuery) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - - let mut url = format!( - "{}/api/v1/findings?page={}&limit=20", - state.agent_api_url, query.page - ); + let mut path = format!("/api/v1/findings?page={}&limit=20", query.page); if !query.severity.is_empty() { - url.push_str(&format!("&severity={}", query.severity)); + path.push_str(&format!("&severity={}", query.severity)); } if !query.scan_type.is_empty() { - url.push_str(&format!("&scan_type={}", query.scan_type)); + path.push_str(&format!("&scan_type={}", query.scan_type)); } if !query.status.is_empty() { - url.push_str(&format!("&status={}", query.status)); + path.push_str(&format!("&status={}", query.status)); } if !query.repo_id.is_empty() { - url.push_str(&format!("&repo_id={}", query.repo_id)); + path.push_str(&format!("&repo_id={}", query.repo_id)); } if !query.q.is_empty() { - url.push_str(&format!( + path.push_str(&format!( "&q={}", url::form_urlencoded::byte_serialize(query.q.as_bytes()).collect::() )); } if !query.sort_by.is_empty() { - url.push_str(&format!("&sort_by={}", query.sort_by)); + path.push_str(&format!("&sort_by={}", query.sort_by)); } if !query.sort_order.is_empty() { - url.push_str(&format!("&sort_order={}", query.sort_order)); + path.push_str(&format!("&sort_order={}", query.sort_order)); } - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get(&path) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: FindingsListResponse = resp @@ -68,11 +64,9 @@ pub async fn fetch_findings(query: FindingsQuery) -> Result Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/findings/{id}", state.agent_api_url); - - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get(&format!("/api/v1/findings/{id}")) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: serde_json::Value = resp @@ -86,18 +80,15 @@ pub async fn fetch_finding_detail(id: String) -> Result #[server] pub async fn update_finding_status(id: String, status: String) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/findings/{id}/status", state.agent_api_url); - - let client = reqwest::Client::new(); - client - .patch(&url) - .json(&serde_json::json!({ "status": status })) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; - + super::agent_client::agent_request( + reqwest::Method::PATCH, + &format!("/api/v1/findings/{id}/status"), + ) + .await? + .json(&serde_json::json!({ "status": status })) + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; Ok(()) } @@ -106,34 +97,25 @@ pub async fn bulk_update_finding_status( ids: Vec, status: String, ) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/findings/bulk-status", state.agent_api_url); - - let client = reqwest::Client::new(); - client - .patch(&url) + super::agent_client::agent_request(reqwest::Method::PATCH, "/api/v1/findings/bulk-status") + .await? .json(&serde_json::json!({ "ids": ids, "status": status })) .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; - Ok(()) } #[server] pub async fn update_finding_feedback(id: String, feedback: String) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/findings/{id}/feedback", state.agent_api_url); - - let client = reqwest::Client::new(); - client - .patch(&url) - .json(&serde_json::json!({ "feedback": feedback })) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; - + super::agent_client::agent_request( + reqwest::Method::PATCH, + &format!("/api/v1/findings/{id}/feedback"), + ) + .await? + .json(&serde_json::json!({ "feedback": feedback })) + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; Ok(()) } diff --git a/compliance-dashboard/src/infrastructure/graph.rs b/compliance-dashboard/src/infrastructure/graph.rs index 68a0d06..566f4f3 100644 --- a/compliance-dashboard/src/infrastructure/graph.rs +++ b/compliance-dashboard/src/infrastructure/graph.rs @@ -50,10 +50,9 @@ pub struct SearchResponse { #[server] pub async fn fetch_graph(repo_id: String) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/graph/{repo_id}", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get(&format!("/api/v1/graph/{repo_id}")) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: GraphDataResponse = resp @@ -68,15 +67,12 @@ pub async fn fetch_impact( repo_id: String, finding_id: String, ) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/graph/{repo_id}/impact/{finding_id}", - state.agent_api_url - ); - let resp = reqwest::get(&url) - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = + super::agent_client::agent_get(&format!("/api/v1/graph/{repo_id}/impact/{finding_id}")) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; let body: ImpactResponse = resp .json() .await @@ -86,10 +82,9 @@ pub async fn fetch_impact( #[server] pub async fn fetch_communities(repo_id: String) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/graph/{repo_id}/communities", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get(&format!("/api/v1/graph/{repo_id}/communities")) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: CommunitiesResponse = resp @@ -104,15 +99,13 @@ pub async fn fetch_file_content( repo_id: String, file_path: String, ) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/graph/{repo_id}/file-content?path={file_path}", - state.agent_api_url - ); - let resp = reqwest::get(&url) - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = super::agent_client::agent_get(&format!( + "/api/v1/graph/{repo_id}/file-content?path={file_path}" + )) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; let body: FileContentResponse = resp .json() .await @@ -122,15 +115,13 @@ pub async fn fetch_file_content( #[server] pub async fn search_nodes(repo_id: String, query: String) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/graph/{repo_id}/search?q={query}&limit=50", - state.agent_api_url - ); - let resp = reqwest::get(&url) - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = super::agent_client::agent_get(&format!( + "/api/v1/graph/{repo_id}/search?q={query}&limit=50" + )) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; let body: SearchResponse = resp .json() .await @@ -140,14 +131,13 @@ pub async fn search_nodes(repo_id: String, query: String) -> Result Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/graph/{repo_id}/build", state.agent_api_url); - let client = reqwest::Client::new(); - client - .post(&url) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + super::agent_client::agent_request( + reqwest::Method::POST, + &format!("/api/v1/graph/{repo_id}/build"), + ) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; Ok(()) } diff --git a/compliance-dashboard/src/infrastructure/issues.rs b/compliance-dashboard/src/infrastructure/issues.rs index e1bc580..0b3dd6a 100644 --- a/compliance-dashboard/src/infrastructure/issues.rs +++ b/compliance-dashboard/src/infrastructure/issues.rs @@ -12,11 +12,9 @@ pub struct IssuesListResponse { #[server] pub async fn fetch_issues(page: u64) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/issues?page={page}&limit=20", state.agent_api_url); - - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get(&format!("/api/v1/issues?page={page}&limit=20")) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: IssuesListResponse = resp diff --git a/compliance-dashboard/src/infrastructure/mod.rs b/compliance-dashboard/src/infrastructure/mod.rs index cfd2057..4660eef 100644 --- a/compliance-dashboard/src/infrastructure/mod.rs +++ b/compliance-dashboard/src/infrastructure/mod.rs @@ -18,6 +18,8 @@ pub mod stats; // Server-only modules #[cfg(feature = "server")] +mod agent_client; +#[cfg(feature = "server")] mod auth; #[cfg(feature = "server")] mod auth_middleware; diff --git a/compliance-dashboard/src/infrastructure/notifications.rs b/compliance-dashboard/src/infrastructure/notifications.rs index 9e280f2..9764f88 100644 --- a/compliance-dashboard/src/infrastructure/notifications.rs +++ b/compliance-dashboard/src/infrastructure/notifications.rs @@ -32,11 +32,9 @@ pub struct NotificationCountResponse { #[server] pub async fn fetch_notification_count() -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - - let url = format!("{}/api/v1/notifications/count", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get("/api/v1/notifications/count") + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: NotificationCountResponse = resp @@ -48,11 +46,9 @@ pub async fn fetch_notification_count() -> Result { #[server] pub async fn fetch_notifications() -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - - let url = format!("{}/api/v1/notifications?limit=20", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get("/api/v1/notifications?limit=20") + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: NotificationListResponse = resp @@ -64,12 +60,8 @@ pub async fn fetch_notifications() -> Result Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - - let url = format!("{}/api/v1/notifications/read-all", state.agent_api_url); - reqwest::Client::new() - .post(&url) + super::agent_client::agent_request(reqwest::Method::POST, "/api/v1/notifications/read-all") + .await? .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; @@ -78,14 +70,13 @@ pub async fn mark_all_notifications_read() -> Result<(), ServerFnError> { #[server] pub async fn dismiss_notification(id: String) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - - let url = format!("{}/api/v1/notifications/{id}/dismiss", state.agent_api_url); - reqwest::Client::new() - .patch(&url) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + super::agent_client::agent_request( + reqwest::Method::PATCH, + &format!("/api/v1/notifications/{id}/dismiss"), + ) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; Ok(()) } diff --git a/compliance-dashboard/src/infrastructure/pentest.rs b/compliance-dashboard/src/infrastructure/pentest.rs index ddae313..a9b38f1 100644 --- a/compliance-dashboard/src/infrastructure/pentest.rs +++ b/compliance-dashboard/src/infrastructure/pentest.rs @@ -32,12 +32,10 @@ pub struct AttackChainResponse { #[server] pub async fn fetch_pentest_sessions() -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - // Fetch sessions - let url = format!("{}/api/v1/pentest/sessions", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get("/api/v1/pentest/sessions") + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let mut body: PentestSessionsResponse = resp @@ -46,31 +44,32 @@ pub async fn fetch_pentest_sessions() -> Result().await { - let targets = tbody.get("data").and_then(|v| v.as_array()); - if let Some(targets) = targets { - // Build target_id -> name lookup - let target_map: std::collections::HashMap = targets - .iter() - .filter_map(|t| { - let id = t.get("_id")?.get("$oid")?.as_str()?.to_string(); - let name = t.get("name")?.as_str()?.to_string(); - Some((id, name)) - }) - .collect(); + if let Ok(tresp_builder) = super::agent_client::agent_get("/api/v1/dast/targets").await { + if let Ok(tresp) = tresp_builder.send().await { + if let Ok(tbody) = tresp.json::().await { + let targets = tbody.get("data").and_then(|v| v.as_array()); + if let Some(targets) = targets { + // Build target_id -> name lookup + let target_map: std::collections::HashMap = targets + .iter() + .filter_map(|t| { + let id = t.get("_id")?.get("$oid")?.as_str()?.to_string(); + let name = t.get("name")?.as_str()?.to_string(); + Some((id, name)) + }) + .collect(); - // Enrich sessions with target_name - for session in body.data.iter_mut() { - if let Some(tid) = session.get("target_id").and_then(|v| v.as_str()) { - if let Some(name) = target_map.get(tid) { - session.as_object_mut().map(|obj| { - obj.insert( - "target_name".to_string(), - serde_json::Value::String(name.clone()), - ) - }); + // Enrich sessions with target_name + for session in body.data.iter_mut() { + if let Some(tid) = session.get("target_id").and_then(|v| v.as_str()) { + if let Some(name) = target_map.get(tid) { + session.as_object_mut().map(|obj| { + obj.insert( + "target_name".to_string(), + serde_json::Value::String(name.clone()), + ) + }); + } } } } @@ -83,10 +82,9 @@ pub async fn fetch_pentest_sessions() -> Result Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/pentest/sessions/{id}", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get(&format!("/api/v1/pentest/sessions/{id}")) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let mut body: PentestSessionResponse = resp @@ -96,26 +94,27 @@ pub async fn fetch_pentest_session(id: String) -> Result().await { - if let Some(targets) = tbody.get("data").and_then(|v| v.as_array()) { - for t in targets { - let t_id = t - .get("_id") - .and_then(|v| v.get("$oid")) - .and_then(|v| v.as_str()) - .unwrap_or(""); - if t_id == tid { - if let Some(name) = t.get("name").and_then(|v| v.as_str()) { - body.data.as_object_mut().map(|obj| { - obj.insert( - "target_name".to_string(), - serde_json::Value::String(name.to_string()), - ) - }); + if let Ok(tresp_builder) = super::agent_client::agent_get("/api/v1/dast/targets").await { + if let Ok(tresp) = tresp_builder.send().await { + if let Ok(tbody) = tresp.json::().await { + if let Some(targets) = tbody.get("data").and_then(|v| v.as_array()) { + for t in targets { + let t_id = t + .get("_id") + .and_then(|v| v.get("$oid")) + .and_then(|v| v.as_str()) + .unwrap_or(""); + if t_id == tid { + if let Some(name) = t.get("name").and_then(|v| v.as_str()) { + body.data.as_object_mut().map(|obj| { + obj.insert( + "target_name".to_string(), + serde_json::Value::String(name.to_string()), + ) + }); + } + break; } - break; } } } @@ -130,15 +129,12 @@ pub async fn fetch_pentest_session(id: String) -> Result Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/pentest/sessions/{session_id}/messages", - state.agent_api_url - ); - let resp = reqwest::get(&url) - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = + super::agent_client::agent_get(&format!("/api/v1/pentest/sessions/{session_id}/messages")) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; let body: PentestMessagesResponse = resp .json() .await @@ -148,10 +144,9 @@ pub async fn fetch_pentest_messages( #[server] pub async fn fetch_pentest_stats() -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/pentest/stats", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get("/api/v1/pentest/stats") + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: PentestStatsResponse = resp @@ -163,15 +158,13 @@ pub async fn fetch_pentest_stats() -> Result Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/pentest/sessions/{session_id}/attack-chain", - state.agent_api_url - ); - let resp = reqwest::get(&url) - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = super::agent_client::agent_get(&format!( + "/api/v1/pentest/sessions/{session_id}/attack-chain" + )) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; let body: AttackChainResponse = resp .json() .await @@ -185,20 +178,17 @@ pub async fn create_pentest_session( strategy: String, message: String, ) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/pentest/sessions", state.agent_api_url); - let client = reqwest::Client::new(); - let resp = client - .post(&url) - .json(&serde_json::json!({ - "target_id": target_id, - "strategy": strategy, - "message": message, - })) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = + super::agent_client::agent_request(reqwest::Method::POST, "/api/v1/pentest/sessions") + .await? + .json(&serde_json::json!({ + "target_id": target_id, + "strategy": strategy, + "message": message, + })) + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; let body: PentestSessionResponse = resp .json() .await @@ -211,18 +201,15 @@ pub async fn create_pentest_session( pub async fn create_pentest_session_wizard( config_json: String, ) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/pentest/sessions", state.agent_api_url); let config: serde_json::Value = serde_json::from_str(&config_json).map_err(|e| ServerFnError::new(e.to_string()))?; - let client = reqwest::Client::new(); - let resp = client - .post(&url) - .json(&serde_json::json!({ "config": config })) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = + super::agent_client::agent_request(reqwest::Method::POST, "/api/v1/pentest/sessions") + .await? + .json(&serde_json::json!({ "config": config })) + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; if !resp.status().is_success() { let text = resp.text().await.unwrap_or_default(); return Err(ServerFnError::new(format!( @@ -239,8 +226,6 @@ pub async fn create_pentest_session_wizard( /// Look up a tracked repository by its git URL #[server] pub async fn lookup_repo_by_url(url: String) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; let encoded_url: String = url .bytes() .flat_map(|b| { @@ -251,13 +236,12 @@ pub async fn lookup_repo_by_url(url: String) -> Result Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/pentest/sessions/{session_id}/chat", - state.agent_api_url - ); - let client = reqwest::Client::new(); - let resp = client - .post(&url) - .json(&serde_json::json!({ - "message": message, - })) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = super::agent_client::agent_request( + reqwest::Method::POST, + &format!("/api/v1/pentest/sessions/{session_id}/chat"), + ) + .await? + .json(&serde_json::json!({ + "message": message, + })) + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; let body: PentestMessagesResponse = resp .json() .await @@ -294,35 +274,27 @@ pub async fn send_pentest_message( #[server] pub async fn stop_pentest_session(session_id: String) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/pentest/sessions/{session_id}/stop", - state.agent_api_url - ); - let client = reqwest::Client::new(); - client - .post(&url) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + super::agent_client::agent_request( + reqwest::Method::POST, + &format!("/api/v1/pentest/sessions/{session_id}/stop"), + ) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; Ok(()) } #[server] pub async fn pause_pentest_session(session_id: String) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/pentest/sessions/{session_id}/pause", - state.agent_api_url - ); - let client = reqwest::Client::new(); - let resp = client - .post(&url) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = super::agent_client::agent_request( + reqwest::Method::POST, + &format!("/api/v1/pentest/sessions/{session_id}/pause"), + ) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; if !resp.status().is_success() { let text = resp.text().await.unwrap_or_default(); return Err(ServerFnError::new(format!("Pause failed: {text}"))); @@ -332,18 +304,14 @@ pub async fn pause_pentest_session(session_id: String) -> Result<(), ServerFnErr #[server] pub async fn resume_pentest_session(session_id: String) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/pentest/sessions/{session_id}/resume", - state.agent_api_url - ); - let client = reqwest::Client::new(); - let resp = client - .post(&url) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = super::agent_client::agent_request( + reqwest::Method::POST, + &format!("/api/v1/pentest/sessions/{session_id}/resume"), + ) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; if !resp.status().is_success() { let text = resp.text().await.unwrap_or_default(); return Err(ServerFnError::new(format!("Resume failed: {text}"))); @@ -355,15 +323,12 @@ pub async fn resume_pentest_session(session_id: String) -> Result<(), ServerFnEr pub async fn fetch_pentest_findings( session_id: String, ) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/pentest/sessions/{session_id}/findings", - state.agent_api_url - ); - let resp = reqwest::get(&url) - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = + super::agent_client::agent_get(&format!("/api/v1/pentest/sessions/{session_id}/findings")) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; let body: DastFindingsResponse = resp .json() .await @@ -385,23 +350,19 @@ pub async fn export_pentest_report( requester_name: String, requester_email: String, ) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/pentest/sessions/{session_id}/export", - state.agent_api_url - ); - let client = reqwest::Client::new(); - let resp = client - .post(&url) - .json(&serde_json::json!({ - "password": password, - "requester_name": requester_name, - "requester_email": requester_email, - })) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = super::agent_client::agent_request( + reqwest::Method::POST, + &format!("/api/v1/pentest/sessions/{session_id}/export"), + ) + .await? + .json(&serde_json::json!({ + "password": password, + "requester_name": requester_name, + "requester_email": requester_email, + })) + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; if !resp.status().is_success() { let text = resp.text().await.unwrap_or_default(); return Err(ServerFnError::new(format!("Export failed: {text}"))); diff --git a/compliance-dashboard/src/infrastructure/repositories.rs b/compliance-dashboard/src/infrastructure/repositories.rs index c684522..666c7e4 100644 --- a/compliance-dashboard/src/infrastructure/repositories.rs +++ b/compliance-dashboard/src/infrastructure/repositories.rs @@ -12,14 +12,10 @@ pub struct RepositoryListResponse { #[server] pub async fn fetch_repositories(page: u64) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/repositories?page={page}&limit=20", - state.agent_api_url - ); - - let resp = reqwest::get(&url) + let path = format!("/api/v1/repositories?page={page}&limit=20"); + let resp = super::agent_client::agent_get(&path) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: RepositoryListResponse = resp @@ -41,10 +37,6 @@ pub async fn add_repository( tracker_repo: Option, tracker_token: Option, ) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/repositories", state.agent_api_url); - let mut body = serde_json::json!({ "name": name, "git_url": git_url, @@ -69,9 +61,8 @@ pub async fn add_repository( body["tracker_token"] = serde_json::Value::String(tk); } - let client = reqwest::Client::new(); - let resp = client - .post(&url) + let resp = super::agent_client::agent_request(reqwest::Method::POST, "/api/v1/repositories") + .await? .json(&body) .send() .await @@ -100,10 +91,6 @@ pub async fn update_repository( tracker_token: Option, scan_schedule: Option, ) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/repositories/{repo_id}", state.agent_api_url); - let mut body = serde_json::Map::new(); if let Some(v) = name.filter(|s| !s.is_empty()) { body.insert("name".into(), serde_json::Value::String(v)); @@ -133,13 +120,15 @@ pub async fn update_repository( body.insert("scan_schedule".into(), serde_json::Value::String(v)); } - let client = reqwest::Client::new(); - let resp = client - .patch(&url) - .json(&body) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = super::agent_client::agent_request( + reqwest::Method::PATCH, + &format!("/api/v1/repositories/{repo_id}"), + ) + .await? + .json(&body) + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; if !resp.status().is_success() { let text = resp.text().await.unwrap_or_default(); @@ -153,11 +142,9 @@ pub async fn update_repository( #[server] pub async fn fetch_ssh_public_key() -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/settings/ssh-public-key", state.agent_api_url); - - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get("/api/v1/settings/ssh-public-key") + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; @@ -179,16 +166,14 @@ pub async fn fetch_ssh_public_key() -> Result { #[server] pub async fn delete_repository(repo_id: String) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/repositories/{repo_id}", state.agent_api_url); - - let client = reqwest::Client::new(); - let resp = client - .delete(&url) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = super::agent_client::agent_request( + reqwest::Method::DELETE, + &format!("/api/v1/repositories/{repo_id}"), + ) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; if !resp.status().is_success() { let body = resp.text().await.unwrap_or_default(); @@ -202,16 +187,14 @@ pub async fn delete_repository(repo_id: String) -> Result<(), ServerFnError> { #[server] pub async fn trigger_repo_scan(repo_id: String) -> Result<(), ServerFnError> { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/repositories/{repo_id}/scan", state.agent_api_url); - - let client = reqwest::Client::new(); - client - .post(&url) - .send() - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + super::agent_client::agent_request( + reqwest::Method::POST, + &format!("/api/v1/repositories/{repo_id}/scan"), + ) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; Ok(()) } @@ -224,16 +207,12 @@ pub struct WebhookConfigResponse { #[server] pub async fn fetch_webhook_config(repo_id: String) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/repositories/{repo_id}/webhook-config", - state.agent_api_url - ); - - let resp = reqwest::get(&url) - .await - .map_err(|e| ServerFnError::new(e.to_string()))?; + let resp = + super::agent_client::agent_get(&format!("/api/v1/repositories/{repo_id}/webhook-config")) + .await? + .send() + .await + .map_err(|e| ServerFnError::new(e.to_string()))?; let body: WebhookConfigResponse = resp .json() .await @@ -244,11 +223,9 @@ pub async fn fetch_webhook_config(repo_id: String) -> Result Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/scan-runs?page=1&limit=1", state.agent_api_url); - - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get("/api/v1/scan-runs?page=1&limit=1") + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: serde_json::Value = resp diff --git a/compliance-dashboard/src/infrastructure/sbom.rs b/compliance-dashboard/src/infrastructure/sbom.rs index f0dc2b6..2ed8532 100644 --- a/compliance-dashboard/src/infrastructure/sbom.rs +++ b/compliance-dashboard/src/infrastructure/sbom.rs @@ -87,11 +87,9 @@ pub struct SbomFiltersResponse { #[server] pub async fn fetch_sbom_filters() -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - - let url = format!("{}/api/v1/sbom/filters", state.agent_api_url); - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get("/api/v1/sbom/filters") + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let text = resp @@ -112,9 +110,6 @@ pub async fn fetch_sbom_filtered( license: Option, page: u64, ) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let mut params = vec![format!("page={page}"), "limit=50".to_string()]; if let Some(r) = &repo_id { if !r.is_empty() { @@ -140,9 +135,10 @@ pub async fn fetch_sbom_filtered( } } - let url = format!("{}/api/v1/sbom?{}", state.agent_api_url, params.join("&")); - - let resp = reqwest::get(&url) + let path = format!("/api/v1/sbom?{}", params.join("&")); + let resp = super::agent_client::agent_get(&path) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let text = resp @@ -156,15 +152,10 @@ pub async fn fetch_sbom_filtered( #[server] pub async fn fetch_sbom_export(repo_id: String, format: String) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - - let url = format!( - "{}/api/v1/sbom/export?repo_id={}&format={}", - state.agent_api_url, repo_id, format - ); - - let resp = reqwest::get(&url) + let path = format!("/api/v1/sbom/export?repo_id={repo_id}&format={format}"); + let resp = super::agent_client::agent_get(&path) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let text = resp @@ -178,17 +169,16 @@ pub async fn fetch_sbom_export(repo_id: String, format: String) -> Result, ) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - - let mut url = format!("{}/api/v1/sbom/licenses", state.agent_api_url); + let mut path = "/api/v1/sbom/licenses".to_string(); if let Some(r) = &repo_id { if !r.is_empty() { - url = format!("{url}?repo_id={r}"); + path = format!("{path}?repo_id={r}"); } } - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get(&path) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let text = resp @@ -205,15 +195,10 @@ pub async fn fetch_sbom_diff( repo_a: String, repo_b: String, ) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - - let url = format!( - "{}/api/v1/sbom/diff?repo_a={}&repo_b={}", - state.agent_api_url, repo_a, repo_b - ); - - let resp = reqwest::get(&url) + let path = format!("/api/v1/sbom/diff?repo_a={repo_a}&repo_b={repo_b}"); + let resp = super::agent_client::agent_get(&path) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let text = resp diff --git a/compliance-dashboard/src/infrastructure/scans.rs b/compliance-dashboard/src/infrastructure/scans.rs index 0eb8dd9..97fe5c8 100644 --- a/compliance-dashboard/src/infrastructure/scans.rs +++ b/compliance-dashboard/src/infrastructure/scans.rs @@ -12,14 +12,9 @@ pub struct ScansListResponse { #[server] pub async fn fetch_scan_runs(page: u64) -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!( - "{}/api/v1/scan-runs?page={page}&limit=20", - state.agent_api_url - ); - - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get(&format!("/api/v1/scan-runs?page={page}&limit=20")) + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: ScansListResponse = resp diff --git a/compliance-dashboard/src/infrastructure/stats.rs b/compliance-dashboard/src/infrastructure/stats.rs index 743fe49..8cdc4b2 100644 --- a/compliance-dashboard/src/infrastructure/stats.rs +++ b/compliance-dashboard/src/infrastructure/stats.rs @@ -16,11 +16,9 @@ pub struct OverviewStats { #[server] pub async fn fetch_overview_stats() -> Result { - let state: super::server_state::ServerState = - dioxus_fullstack::FullstackContext::extract().await?; - let url = format!("{}/api/v1/stats/overview", state.agent_api_url); - - let resp = reqwest::get(&url) + let resp = super::agent_client::agent_get("/api/v1/stats/overview") + .await? + .send() .await .map_err(|e| ServerFnError::new(e.to_string()))?; let body: serde_json::Value = resp