nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 05:52:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement almost all previous features

Browse Source
This commit is contained in:
Lennart
2025-06-08 19:38:33 +02:00
parent 95889e3df1
commit 00eb43f048
41 changed files with 906 additions and 916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/app.rs
View File

@@ -1,14 +1,20 @@
use axum::Router;
use axum::response::Redirect;
use axum::routing::get;
use axum::extract::Request;
use axum::response::{Redirect, Response};
use axum::routing::{any, get};
use rustical_caldav::caldav_router;
use rustical_carddav::carddav_router;
use rustical_frontend::nextcloud_login::NextcloudFlows;
use rustical_frontend::nextcloud_login::{NextcloudFlows, nextcloud_login_router};
use rustical_frontend::{FrontendConfig, frontend_router};
use rustical_oidc::OidcConfig;
use rustical_store::auth::AuthenticationProvider;
use rustical_store::{AddressbookStore, CalendarStore, SubscriptionStore};
use std::sync::Arc;
use std::time::Duration;
use tower_http::classify::ServerErrorsFailureClass;
use tower_http::trace::TraceLayer;
use tower_sessions::MemoryStore;
use tracing::Span;
use crate::config::NextcloudLoginConfig;
@@ -45,13 +51,14 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
)
.route(
"/.well-known/caldav",
get(async || Redirect::permanent("/caldav")),
any(async || Redirect::permanent("/caldav")),
)
.route(
"/.well-known/carddav",
get(async || Redirect::permanent("/caldav")),
any(async || Redirect::permanent("/caldav")),
);
let session_store = MemoryStore::default();
if frontend_config.enabled {
router = router
.nest(
@@ -62,21 +69,42 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
addr_store.clone(),
frontend_config,
oidc_config,
session_store.clone(),
),
)
.route("/", get(async || Redirect::to("/frontend")));
}
router
if nextcloud_login_config.enabled {
router = router.nest(
"/index.php/login/v2",
nextcloud_login_router(
nextcloud_flows_state,
auth_provider.clone(),
session_store.clone(),
),
);
}
router.layer(
TraceLayer::new_for_http()
.make_span_with(|request: &Request| {
tracing::debug_span!(
"http-request",
status_code = tracing::field::Empty,
otel.name =
tracing::field::display(format!("{} {}", request.method(), request.uri())),
)
})
.on_request(|_req: &Request, _span: &Span| {})
.on_response(|response: &Response, _latency: Duration, span: &Span| {
span.record("status_code", tracing::field::display(response.status()));
// if nextcloud_login_config.enabled {
// app = app.configure(|cfg| {
// configure_nextcloud_login(
// cfg,
// nextcloud_flows_state,
// auth_provider.clone(),
// frontend_config.secret_key,
// )
// });
// }
tracing::debug!("response generated")
})
.on_failure(
|_error: ServerErrorsFailureClass, _latency: Duration, _span: &Span| {
tracing::error!("something went wrong")
},
),
)
}