Implement email verification in the registration flow

Author: sandhose

crates/handlers/src/lib.rs

@@ -379,9 +379,9 @@ where
             get(self::views::register::password::get).post(self::views::register::password::post),
         )
         .route(
-            mas_router::AccountVerifyEmail::route(),
-            get(self::views::account::emails::verify::get)
-                .post(self::views::account::emails::verify::post),
+            mas_router::RegisterVerifyEmail::route(),
+            get(self::views::register::steps::verify_email::get)
+                .post(self::views::register::steps::verify_email::post),
         )
         .route(
             mas_router::AccountRecoveryStart::route(),

crates/handlers/src/views/account/emails/mod.rs

@@ -4,7 +4,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 // Please see LICENSE in the repository root for full details.
 
-pub mod account;
 pub mod app;
 pub mod index;
 pub mod login;

crates/handlers/src/views/account/emails/verify.rs

@@ -18,6 +18,7 @@ use super::shared::OptionalPostAuthAction;
 use crate::{BoundActivityTracker, PreferredLanguage};
 
 pub(crate) mod password;
+pub(crate) mod steps;
 
 #[tracing::instrument(name = "handlers.views.register.get", skip_all, err)]
 pub(crate) async fn get(

crates/handlers/src/views/mod.rs

@@ -354,8 +354,9 @@ pub(crate) async fn post(
 
     repo.save().await?;
 
-    // TODO: redirect to the next step on the registration
-    Ok(format!("{}", registration.id).into_response())
+    Ok(url_builder
+        .redirect(&mas_router::RegisterVerifyEmail::new(registration.id))
+        .into_response())
 }
 
 async fn render(
@@ -468,10 +469,19 @@ mod tests {
         let request = cookies.with_cookies(request);
         let response = state.request(request).await;
         cookies.save_cookies(&response);
-        response.assert_status(StatusCode::OK);
+        response.assert_status(StatusCode::SEE_OTHER);
+        let location = response.headers().get(LOCATION).unwrap();
+
+        // The handler redirects with the ID as the last portion of the path
+        let id = location
+            .to_str()
+            .unwrap()
+            .rsplit('/')
+            .next()
+            .unwrap()
+            .parse()
+            .unwrap();
 
-        // The handler gives us the registration ID in the body for now
-        let id = response.body().parse().unwrap();
         // There should be a new registration in the database
         let mut repo = state.repository().await.unwrap();
         let registration = repo.user_registration().lookup(id).await.unwrap().unwrap();

crates/handlers/src/views/register/mod.rs

@@ -1,7 +1,6 @@
-// Copyright 2024 New Vector Ltd.
-// Copyright 2021-2024 The Matrix.org Foundation C.I.C.
+// Copyright 2025 New Vector Ltd.
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 // Please see LICENSE in the repository root for full details.
 
-pub mod emails;
+pub(crate) mod verify_email;