starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-05-18 05:37:18 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Track HTTP setting sources in timeline

Browse Source
This commit is contained in:
Gregory Schier
2026-05-17 10:07:12 -07:00
parent 0c97036864
commit 0a6aed6cc6
13 changed files with 1109 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates-tauri/yaak-app-client/src/ws_ext.rs
+10 -8
View File
@@ -248,16 +248,18 @@ pub async fn cmd_ws_connect<R: Runtime>(
}
}
let mut cookie_jar =
match (resolved_settings.send_cookies || resolved_settings.store_cookies, cookie_jar_id) {
(true, Some(id)) => Some(app_handle.db().get_cookie_jar(id)?),
_ => None,
};
let mut cookie_jar = match (
resolved_settings.send_cookies.value || resolved_settings.store_cookies.value,
cookie_jar_id,
) {
(true, Some(id)) => Some(app_handle.db().get_cookie_jar(id)?),
_ => None,
};
let cookie_store =
cookie_jar.as_ref().map(|jar| CookieStore::from_cookies(jar.cookies.clone()));
// Add cookies to WS HTTP Upgrade
if let (true, Some(store)) = (resolved_settings.send_cookies, cookie_store.as_ref()) {
if let (true, Some(store)) = (resolved_settings.send_cookies.value, cookie_store.as_ref()) {
// Convert WS URL -> HTTP URL because our cookie store matches based on
// Path/HttpOnly/Secure attributes even though WS upgrades are HTTP requests
let http_url = convert_ws_url_to_http(&url);
@@ -295,7 +297,7 @@ pub async fn cmd_ws_connect<R: Runtime>(
url.as_str(),
headers,
receive_tx,
resolved_settings.validate_certificates,
resolved_settings.validate_certificates.value,
client_cert,
)
.await
@@ -335,7 +337,7 @@ pub async fn cmd_ws_connect<R: Runtime>(
.collect::<Vec<HttpResponseHeader>>();
if let (true, Some(cookie_jar), Some(store)) =
(resolved_settings.store_cookies, cookie_jar.as_mut(), cookie_store.as_ref())
(resolved_settings.store_cookies.value, cookie_jar.as_mut(), cookie_store.as_ref())
{
let set_cookie_headers = response
.headers()