adam/leptos-use
1
0
Fork 0
mirror of https://github.com/adoyle0/leptos-use.git synced 2025-01-23 09:09:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix document.set_cookie usage

Browse source
This commit is contained in:
Stephen Brian King 2024-03-22 23:23:38 -06:00
parent e9add5ada4
commit e2c84523f2
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/use_cookie.rs
View file

@ -318,8 +318,22 @@ where
} }
} else { } else {
let cookie_name = cookie_name.clone(); let cookie_name = cookie_name.clone();
let ssr_cookies_header_getter = Rc::clone(&ssr_cookies_header_getter);
jar.update_value(|jar| { jar.update_value(|jar| {
update_client_cookie_jar(
&cookie_name,
&None,
jar,
max_age,
expires,
&domain,
&path,
same_site,
secure,
http_only,
ssr_cookies_header_getter,
);
jar.force_remove(cookie_name); jar.force_remove(cookie_name);
}); });
@ -692,7 +706,7 @@ fn write_client_cookie(
let document = document(); let document = document();
let document: &web_sys::HtmlDocument = document.unchecked_ref(); let document: &web_sys::HtmlDocument = document.unchecked_ref();
document.set_cookie(&cookie_jar_to_string(jar)).ok(); document.set_cookie(&cookie_jar_to_string(jar, name)).ok();
} }
#[cfg(not(feature = "ssr"))] #[cfg(not(feature = "ssr"))]
@ -718,17 +732,24 @@ fn update_client_cookie_jar(
jar.add_original(cookie); jar.add_original(cookie);
} else { } else {
jar.force_remove(name); let max_age = Some(0);
let expires = Some(0);
let value = "";
let cookie = build_cookie_from_options(
name, max_age, expires, http_only, secure, path, same_site, domain, value,
);
jar.add(cookie);
} }
} }
} }
#[cfg(not(feature = "ssr"))] #[cfg(not(feature = "ssr"))]
fn cookie_jar_to_string(jar: &CookieJar) -> String { fn cookie_jar_to_string(jar: &CookieJar, name: &str) -> String {
jar.iter() match jar.get(name) {
.map(|c| c.encoded().to_string()) Some(c) => c.encoded().to_string(),
.collect::<Vec<_>>() None => "".to_string(),
.join("; ") }
} }
fn build_cookie_from_options( fn build_cookie_from_options(