nutomic/ibis
1
0
Fork 0
mirror of https://github.com/Nutomic/ibis.git synced 2024-11-25 17:11:08 +00:00
Code Projects Releases Packages Activity

Make auth token available during hydrate

Browse source
This commit is contained in:
Felix Ableitner 2024-11-14 11:07:23 +01:00
parent 18d46d22bf
commit 226c3facaa
3 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/backend/mod.rs
View file

@ -8,6 +8,7 @@ use crate::{
}, },
common::{ common::{
utils::http_protocol_str, utils::http_protocol_str,
Auth,
DbArticle, DbArticle,
DbInstance, DbInstance,
DbPerson, DbPerson,
@ -21,16 +22,19 @@ use activitypub_federation::{
fetch::object_id::ObjectId, fetch::object_id::ObjectId,
http_signatures::generate_actor_keypair, http_signatures::generate_actor_keypair,
}; };
use api::api_routes; use api::{api_routes, user::AUTH_COOKIE};
use assets::file_and_error_handler; use assets::file_and_error_handler;
use axum::{ use axum::{
body::Body, body::Body,
extract::State,
http::{HeaderValue, Request}, http::{HeaderValue, Request},
middleware::Next, middleware::Next,
response::Response, response::{IntoResponse, Response},
routing::get,
Router, Router,
ServiceExt, ServiceExt,
}; };
use axum_extra::extract::CookieJar;
use axum_macros::debug_middleware; use axum_macros::debug_middleware;
use chrono::Utc; use chrono::Utc;
use diesel::{ use diesel::{
@ -42,7 +46,7 @@ use federation::objects::{
articles_collection::local_articles_url, articles_collection::local_articles_url,
instance_collection::linked_instances_url, instance_collection::linked_instances_url,
}; };
use leptos::get_configuration; use leptos::*;
use leptos_axum::{generate_route_list, LeptosRoutes}; use leptos_axum::{generate_route_list, LeptosRoutes};
use log::info; use log::info;
use std::net::SocketAddr; use std::net::SocketAddr;
@ -97,7 +101,8 @@ pub async fn start(config: IbisConfig, override_hostname: Option<SocketAddr>) ->
let config = data.clone(); let config = data.clone();
let app = Router::new() let app = Router::new()
.leptos_routes(&leptos_options, routes, App) //.leptos_routes(&leptos_options, routes, App)
.leptos_routes_with_handler(routes, get(leptos_routes_handler))
.fallback(file_and_error_handler) .fallback(file_and_error_handler)
.with_state(leptos_options) .with_state(leptos_options)
.nest(FEDERATION_ROUTES_PREFIX, federation_routes()) .nest(FEDERATION_ROUTES_PREFIX, federation_routes())
@ -118,6 +123,24 @@ pub async fn start(config: IbisConfig, override_hostname: Option<SocketAddr>) ->
Ok(()) Ok(())
} }
/// Make auth token available in hydrate mode
async fn leptos_routes_handler(
jar: CookieJar,
State(option): State<LeptosOptions>,
req: Request<Body>,
) -> Response {
let handler = leptos_axum::render_app_async_with_context(
option.clone(),
move || {
let cookie = jar.get(AUTH_COOKIE).map(|c| c.value().to_string());
provide_context(Auth(cookie));
},
move || view! { <App/> },
);
handler(req).await.into_response()
}
const MAIN_PAGE_DEFAULT_TEXT: &str = "Welcome to Ibis, the federated Wikipedia alternative! const MAIN_PAGE_DEFAULT_TEXT: &str = "Welcome to Ibis, the federated Wikipedia alternative!
This main page can only be edited by the admin. Use it as an introduction for new users, \ This main page can only be edited by the admin. Use it as an introduction for new users, \

3
src/common/mod.rs
View file

@ -21,6 +21,9 @@ use {
pub const MAIN_PAGE_NAME: &str = "Main_Page"; pub const MAIN_PAGE_NAME: &str = "Main_Page";
#[derive(Clone)]
pub struct Auth(pub Option<String>);
/// Should be an enum Title/Id but fails due to https://github.com/nox/serde_urlencoded/issues/66 /// Should be an enum Title/Id but fails due to https://github.com/nox/serde_urlencoded/issues/66
#[derive(Deserialize, Serialize, Clone, Debug, Default)] #[derive(Deserialize, Serialize, Clone, Debug, Default)]
pub struct GetArticleForm { pub struct GetArticleForm {

12
src/frontend/api.rs
View file

@ -267,6 +267,18 @@ where
{ {
req = req.fetch_credentials_include(); req = req.fetch_credentials_include();
} }
#[cfg(feature = "ssr")]
{
use crate::common::Auth;
use leptos::use_context;
use reqwest::header::HeaderName;
let auth = use_context::<Auth>();
if let Some(Auth(Some(auth))) = auth {
req = req.header(HeaderName::from_static("auth"), auth);
}
}
let res = req.send().await?; let res = req.send().await?;
let status = res.status(); let status = res.status();
let text = res.text().await?; let text = res.text().await?;