alemi/upub
alemi/upub
1
0
Fork 1
Code Issues 4 Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix(web): always use cookie from root

Browse source
This commit is contained in:
əlemi 2024-07-15 22:52:12 +02:00
parent 9d2996dece
commit 87144b25eb
Signed by: alemi
GPG key ID: A4895B84D311642C
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Cargo.lock generated
View file

@ -1899,15 +1899,6 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "jsonvec"
version = "0.1.0"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.71",
]
[[package]] [[package]]
name = "lazy_static" name = "lazy_static"
version = "1.5.0" version = "1.5.0"
@ -4791,7 +4782,6 @@ dependencies = [
"hmac", "hmac",
"httpsign", "httpsign",
"jrd", "jrd",
"jsonvec",
"nodeinfo", "nodeinfo",
"openssl", "openssl",
"reqwest", "reqwest",
@ -4887,6 +4877,7 @@ dependencies = [
"apb", "apb",
"chrono", "chrono",
"console_error_panic_hook", "console_error_panic_hook",
"cookie",
"dashmap", "dashmap",
"futures", "futures",
"jrd", "jrd",

1
web/Cargo.toml
View file

@ -13,6 +13,7 @@ repository = "https://git.alemi.dev/upub.git"
[dependencies] [dependencies]
lazy_static = "1.4" lazy_static = "1.4"
cookie = "0.18"
tracing = "0.1" tracing = "0.1"
tracing-subscriber = "0.3" tracing-subscriber = "0.3"
tracing-subscriber-wasm = "0.1" tracing-subscriber-wasm = "0.1"

18
web/src/app.rs
View file

@ -3,7 +3,7 @@ use leptos_router::*;
use crate::prelude::*; use crate::prelude::*;
use crate::CONTACT; use crate::CONTACT;
use leptos_use::{signal_debounced, storage::use_local_storage, use_cookie, use_element_size, use_window_scroll, utils::{FromToStringCodec, JsonCodec}, UseElementSizeReturn}; use leptos_use::{signal_debounced, storage::use_local_storage, use_cookie_with_options, use_element_size, use_window_scroll, UseCookieOptions, utils::{FromToStringCodec, JsonCodec}, UseElementSizeReturn};
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
pub struct Feeds { pub struct Feeds {
@ -44,8 +44,20 @@ impl Feeds {
#[component] #[component]
pub fn App() -> impl IntoView { pub fn App() -> impl IntoView {
let (token, set_token) = use_cookie::<String, FromToStringCodec>("token"); let (token, set_token) = use_cookie_with_options::<String, FromToStringCodec>(
let (userid, set_userid) = use_cookie::<String, FromToStringCodec>("user_id"); "token",
UseCookieOptions::default()
.same_site(cookie::SameSite::Strict)
// .secure(true)
.path("/")
);
let (userid, set_userid) = use_cookie_with_options::<String, FromToStringCodec>(
"user_id",
UseCookieOptions::default()
.same_site(cookie::SameSite::Strict)
// .secure(true)
.path("/")
);
let (config, set_config, _) = use_local_storage::<crate::Config, JsonCodec>("config"); let (config, set_config, _) = use_local_storage::<crate::Config, JsonCodec>("config");
let auth = Auth { token, userid }; let auth = Auth { token, userid };