Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
gpui_web: Support configurable fetch credentials (#61460)
Gaauwe Rombouts75b1c8b71af9
diff --git a/crates/gpui_web/Cargo.toml b/crates/gpui_web/Cargo.tomlindex 643310f3ac1..45420bf880f 100644--- a/crates/gpui_web/Cargo.toml+++ b/crates/gpui_web/Cargo.toml@@ -66,6 +66,7 @@ web-sys = { version = "0.3", features = ["VisualViewport","Headers","Request",+ "RequestCredentials","RequestInit","RequestRedirect","Response",diff --git a/crates/gpui_web/src/gpui_web.rs b/crates/gpui_web/src/gpui_web.rsindex 9cd773823bd..dd9c3948163 100644--- a/crates/gpui_web/src/gpui_web.rs+++ b/crates/gpui_web/src/gpui_web.rs@@ -11,7 +11,7 @@ mod window;pub use dispatcher::WebDispatcher;pub use display::WebDisplay;-pub use http_client::FetchHttpClient;+pub use http_client::{FetchCredentials, FetchHttpClient};pub use keyboard::WebKeyboardLayout;pub use logging::init_logging;pub use platform::WebPlatform;diff --git a/crates/gpui_web/src/http_client.rs b/crates/gpui_web/src/http_client.rsindex 14d58cf4576..2ea7a388d6b 100644--- a/crates/gpui_web/src/http_client.rs+++ b/crates/gpui_web/src/http_client.rs@@ -15,11 +15,34 @@ extern "C" {pub struct FetchHttpClient {user_agent: Option<http_client::http::header::HeaderValue>,+ credentials: FetchCredentials,+}++/// Controls whether browser Fetch requests include credentials.+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]+pub enum FetchCredentials {+ /// Never send credentials in the request or include credentials in the response.+ Omit,+ /// Only send and include credentials for same-origin requests. This is the default.+ #[default]+ SameOrigin,+ /// Always include credentials, even for cross-origin requests.+ Include,}impl Default for FetchHttpClient {fn default() -> Self {- Self { user_agent: None }+ Self {+ user_agent: None,+ credentials: FetchCredentials::default(),+ }+ }+}++impl FetchHttpClient {+ pub fn with_credentials(mut self, credentials: FetchCredentials) -> Self {+ self.credentials = credentials;+ self}}@@ -40,6 +63,7 @@ impl FetchHttpClient {user_agent: Some(http_client::http::header::HeaderValue::from_str(user_agent,)?),+ credentials: FetchCredentials::default(),})}}@@ -55,6 +79,7 @@ impl FetchHttpClient {user_agent: Some(http_client::http::header::HeaderValue::from_str(user_agent,)?),+ credentials: FetchCredentials::default(),})}}@@ -94,12 +119,18 @@ impl HttpClient for FetchHttpClient {) -> futures::future::BoxFuture<'static, anyhow::Result<http_client::http::Response<AsyncBody>>>{let (parts, body) = req.into_parts();+ let credentials = self.credentials;Box::pin(AssertSend(async move {let body_bytes = read_body_to_bytes(body).await?;let init = web_sys::RequestInit::new();init.set_method(parts.method.as_str());+ init.set_credentials(match credentials {+ FetchCredentials::Omit => web_sys::RequestCredentials::Omit,+ FetchCredentials::SameOrigin => web_sys::RequestCredentials::SameOrigin,+ FetchCredentials::Include => web_sys::RequestCredentials::Include,+ });if let Some(redirect_policy) = parts.extensions.get::<RedirectPolicy>() {match redirect_policy {