Remove the dedicated page to add an email address

Author: sandhose

crates/handlers/src/lib.rs

@@ -383,11 +383,6 @@ where
             get(self::views::account::emails::verify::get)
                 .post(self::views::account::emails::verify::post),
         )
-        .route(
-            mas_router::AccountAddEmail::route(),
-            get(self::views::account::emails::add::get)
-                .post(self::views::account::emails::add::post),
-        )
         .route(
             mas_router::AccountRecoveryStart::route(),
             get(self::views::recovery::start::get).post(self::views::recovery::start::post),

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

@@ -1,8 +1,7 @@
-// Copyright 2024 New Vector Ltd.
+// Copyright 2024, 2025 New Vector Ltd.
 // Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 // Please see LICENSE in the repository root for full details.
 
-pub mod add;
 pub mod verify;

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

@@ -488,31 +488,6 @@ impl Route for AccountVerifyEmail {
     }
 }
 
-/// `GET /add-email`
-#[derive(Default, Debug, Clone)]
-pub struct AccountAddEmail {
-    post_auth_action: Option<PostAuthAction>,
-}
-
-impl Route for AccountAddEmail {
-    type Query = PostAuthAction;
-    fn route() -> &'static str {
-        "/add-email"
-    }
-
-    fn query(&self) -> Option<&Self::Query> {
-        self.post_auth_action.as_ref()
-    }
-}
-
-impl AccountAddEmail {
-    #[must_use]
-    pub fn and_then(mut self, action: PostAuthAction) -> Self {
-        self.post_auth_action = Some(action);
-        self
-    }
-}
-
 /// Actions parameters as defined by MSC2965
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(tag = "action")]

crates/router/src/endpoints.rs

@@ -992,51 +992,6 @@ impl TemplateContext for EmailVerificationPageContext {
     }
 }
 
-/// Fields of the account email add form
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, Hash, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum EmailAddFormField {
-    /// The email
-    Email,
-}
-
-impl FormField for EmailAddFormField {
-    fn keep(&self) -> bool {
-        match self {
-            Self::Email => true,
-        }
-    }
-}
-
-/// Context used by the `pages/account/verify.html` templates
-#[derive(Serialize, Default)]
-pub struct EmailAddContext {
-    form: FormState<EmailAddFormField>,
-}
-
-impl EmailAddContext {
-    /// Constructs a context for the email add page
-    #[must_use]
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Set the form state
-    #[must_use]
-    pub fn with_form_state(form: FormState<EmailAddFormField>) -> Self {
-        Self { form }
-    }
-}
-
-impl TemplateContext for EmailAddContext {
-    fn sample(_now: chrono::DateTime<Utc>, _rng: &mut impl Rng) -> Vec<Self>
-    where
-        Self: Sized,
-    {
-        vec![Self::default()]
-    }
-}
-
 /// Fields of the account recovery start form
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, Hash, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]

crates/templates/src/context.rs

@@ -35,16 +35,15 @@ mod macros;
 pub use self::{
     context::{
         ApiDocContext, AppContext, CompatSsoContext, ConsentContext, DeviceConsentContext,
-        DeviceLinkContext, DeviceLinkFormField, EmailAddContext, EmailRecoveryContext,
-        EmailVerificationContext, EmailVerificationPageContext, EmptyContext, ErrorContext,
-        FormPostContext, IndexContext, LoginContext, LoginFormField, NotFoundContext,
-        PasswordRegisterContext, PolicyViolationContext, PostAuthContext, PostAuthContextInner,
-        ReauthContext, ReauthFormField, RecoveryExpiredContext, RecoveryFinishContext,
-        RecoveryFinishFormField, RecoveryProgressContext, RecoveryStartContext,
-        RecoveryStartFormField, RegisterContext, RegisterFormField, SiteBranding, SiteConfigExt,
-        SiteFeatures, TemplateContext, UpstreamExistingLinkContext, UpstreamRegister,
-        UpstreamRegisterFormField, UpstreamSuggestLink, WithCaptcha, WithCsrf, WithLanguage,
-        WithOptionalSession, WithSession,
+        DeviceLinkContext, DeviceLinkFormField, EmailRecoveryContext, EmailVerificationContext,
+        EmailVerificationPageContext, EmptyContext, ErrorContext, FormPostContext, IndexContext,
+        LoginContext, LoginFormField, NotFoundContext, PasswordRegisterContext,
+        PolicyViolationContext, PostAuthContext, PostAuthContextInner, ReauthContext,
+        ReauthFormField, RecoveryExpiredContext, RecoveryFinishContext, RecoveryFinishFormField,
+        RecoveryProgressContext, RecoveryStartContext, RecoveryStartFormField, RegisterContext,
+        RegisterFormField, SiteBranding, SiteConfigExt, SiteFeatures, TemplateContext,
+        UpstreamExistingLinkContext, UpstreamRegister, UpstreamRegisterFormField,
+        UpstreamSuggestLink, WithCaptcha, WithCsrf, WithLanguage, WithOptionalSession, WithSession,
     },
     forms::{FieldError, FormError, FormField, FormState, ToFormState},
 };
@@ -347,9 +346,6 @@ register_templates! {
     /// Render the email verification page
     pub fn render_account_verify_email(WithLanguage<WithCsrf<WithSession<EmailVerificationPageContext>>>) { "pages/account/emails/verify.html" }
 
-    /// Render the email verification page
-    pub fn render_account_add_email(WithLanguage<WithCsrf<WithSession<EmailAddContext>>>) { "pages/account/emails/add.html" }
-
     /// Render the account recovery start page
     pub fn render_recovery_start(WithLanguage<WithCsrf<RecoveryStartContext>>) { "pages/recovery/start.html" }
 
@@ -433,7 +429,6 @@ impl Templates {
         check::render_policy_violation(self, now, rng)?;
         check::render_sso_login(self, now, rng)?;
         check::render_index(self, now, rng)?;
-        check::render_account_add_email(self, now, rng)?;
         check::render_account_verify_email(self, now, rng)?;
         check::render_recovery_start(self, now, rng)?;
         check::render_recovery_progress(self, now, rng)?;