From e6d3c4e0e59e24a7b7c83e6353f452d888425ae8 Mon Sep 17 00:00:00 2001
From: Lennart <18233294+lennart-k@users.noreply.github.com>
Date: Tue, 11 Feb 2025 17:13:58 +0100
Subject: [PATCH] nextcloud_login: Fix routing

---
 crates/nextcloud_login/Cargo.toml | 1 -
 crates/nextcloud_login/src/lib.rs | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/crates/nextcloud_login/Cargo.toml b/crates/nextcloud_login/Cargo.toml
index d642b1c..447016f 100644
--- a/crates/nextcloud_login/Cargo.toml
+++ b/crates/nextcloud_login/Cargo.toml
@@ -20,6 +20,5 @@ futures-core.workspace = true
 hex.workspace = true
 mime_guess.workspace = true
 rand.workspace = true
-dashmap.workspace = true
 uuid.workspace = true
 chrono.workspace = true
diff --git a/crates/nextcloud_login/src/lib.rs b/crates/nextcloud_login/src/lib.rs
index fc3c89b..8a2f6d7 100644
--- a/crates/nextcloud_login/src/lib.rs
+++ b/crates/nextcloud_login/src/lib.rs
@@ -206,18 +206,18 @@ pub fn configure_nextcloud_login<AP: AuthenticationProvider>(
     auth_provider: Arc<AP>,
 ) {
     cfg.service(
-        web::scope("")
+        web::scope("/index.php/login/v2")
             .wrap(AuthenticationMiddleware::new(auth_provider.clone()))
             .app_data(Data::from(nextcloud_flows_state))
             .app_data(Data::from(auth_provider.clone()))
-            .service(web::resource("/index.php/login/v2").post(post_nextcloud_login))
+            .service(web::resource("").post(post_nextcloud_login))
             .service(
-                web::resource("/login/v2/poll/{flow}")
+                web::resource("/poll/{flow}")
                     .name("nc_login_poll")
                     .post(post_nextcloud_poll::<AP>),
             )
             .service(
-                web::resource("/login/v2/flow/{flow}")
+                web::resource("/flow/{flow}")
                     .name("nc_login_flow")
                     .get(get_nextcloud_flow)
                     .post(post_nextcloud_flow),