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

Move well-known routes to main::app.rs

Browse Source
This commit is contained in:
Lennart
2025-01-26 14:08:16 +01:00
parent 79d0b4f967
commit 33b7f748b8
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/caldav/src/lib.rs
View File

@@ -24,10 +24,6 @@ mod subscription;
pub use error::Error; pub use error::Error;
pub fn configure_well_known(cfg: &mut web::ServiceConfig, caldav_root: String) {
cfg.service(web::redirect("/caldav", caldav_root).permanent());
}
pub fn configure_dav< pub fn configure_dav<
AP: AuthenticationProvider, AP: AuthenticationProvider,
AS: AddressbookStore, AS: AddressbookStore,

4
crates/carddav/src/lib.rs
View File

@@ -25,10 +25,6 @@ pub mod addressbook;
pub mod error; pub mod error;
pub mod principal; pub mod principal;
pub fn configure_well_known(cfg: &mut web::ServiceConfig, carddav_root: String) {
cfg.service(web::redirect("/carddav", carddav_root).permanent());
}
pub fn configure_dav<AP: AuthenticationProvider, A: AddressbookStore, S: SubscriptionStore>( pub fn configure_dav<AP: AuthenticationProvider, A: AddressbookStore, S: SubscriptionStore>(
cfg: &mut web::ServiceConfig, cfg: &mut web::ServiceConfig,
auth_provider: Arc<AP>, auth_provider: Arc<AP>,

6
src/app.rs
View File

@@ -46,10 +46,8 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
})) }))
.service( .service(
web::scope("/.well-known") web::scope("/.well-known")
.configure(|cfg| rustical_caldav::configure_well_known(cfg, "/caldav".to_string())) .service(web::redirect("/caldav", "/caldav"))
.configure(|cfg| { .service(web::redirect("/carddav", "/carddav")),
rustical_carddav::configure_well_known(cfg, "/carddav".to_string())
}),
); );
if frontend_config.enabled { if frontend_config.enabled {