Remove the reauth view

Author: sandhose

crates/handlers/src/lib.rs

@@ -371,10 +371,6 @@ where
             get(self::views::login::get).post(self::views::login::post),
         )
         .route(mas_router::Logout::route(), post(self::views::logout::post))
-        .route(
-            mas_router::Reauth::route(),
-            get(self::views::reauth::get).post(self::views::reauth::post),
-        )
         .route(
             mas_router::Register::route(),
             get(self::views::register::get),

crates/handlers/src/views/mod.rs

@@ -8,7 +8,6 @@ pub mod app;
 pub mod index;
 pub mod login;
 pub mod logout;
-pub mod reauth;
 pub mod recovery;
 pub mod register;
 pub mod shared;

crates/handlers/src/views/reauth.rs

@@ -255,66 +255,6 @@ impl SimpleRoute for Logout {
     const PATH: &'static str = "/logout";
 }
 
-/// `GET|POST /reauth`
-#[derive(Default, Debug, Clone)]
-pub struct Reauth {
-    post_auth_action: Option<PostAuthAction>,
-}
-
-impl Reauth {
-    #[must_use]
-    pub fn and_then(action: PostAuthAction) -> Self {
-        Self {
-            post_auth_action: Some(action),
-        }
-    }
-
-    #[must_use]
-    pub fn and_continue_grant(data: Ulid) -> Self {
-        Self {
-            post_auth_action: Some(PostAuthAction::continue_grant(data)),
-        }
-    }
-
-    #[must_use]
-    pub fn and_continue_device_code_grant(data: Ulid) -> Self {
-        Self {
-            post_auth_action: Some(PostAuthAction::continue_device_code_grant(data)),
-        }
-    }
-
-    /// Get a reference to the reauth's post auth action.
-    #[must_use]
-    pub fn post_auth_action(&self) -> Option<&PostAuthAction> {
-        self.post_auth_action.as_ref()
-    }
-
-    pub fn go_next(&self, url_builder: &UrlBuilder) -> axum::response::Redirect {
-        match &self.post_auth_action {
-            Some(action) => action.go_next(url_builder),
-            None => url_builder.redirect(&Index),
-        }
-    }
-}
-
-impl Route for Reauth {
-    type Query = PostAuthAction;
-
-    fn route() -> &'static str {
-        "/reauth"
-    }
-
-    fn query(&self) -> Option<&Self::Query> {
-        self.post_auth_action.as_ref()
-    }
-}
-
-impl From<Option<PostAuthAction>> for Reauth {
-    fn from(post_auth_action: Option<PostAuthAction>) -> Self {
-        Self { post_auth_action }
-    }
-}
-
 /// `POST /register`
 #[derive(Default, Debug, Clone)]
 pub struct Register {

crates/router/src/endpoints.rs

@@ -381,7 +381,7 @@ impl FormField for LoginFormField {
     }
 }
 
-/// Inner context used in login and reauth screens. See [`PostAuthContext`].
+/// Inner context used in login screen. See [`PostAuthContext`].
 #[derive(Serialize)]
 #[serde(tag = "kind", rename_all = "snake_case")]
 pub enum PostAuthContextInner {
@@ -420,7 +420,7 @@ pub enum PostAuthContextInner {
     ManageAccount,
 }
 
-/// Context used in login and reauth screens, for the post-auth action to do
+/// Context used in login screen, for the post-auth action to do
 #[derive(Serialize)]
 pub struct PostAuthContext {
     /// The post auth action params from the URL
@@ -734,59 +734,6 @@ impl PolicyViolationContext {
     }
 }
 
-/// Fields of the reauthentication form
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, Hash, PartialEq, Eq)]
-#[serde(rename_all = "kebab-case")]
-pub enum ReauthFormField {
-    /// The password field
-    Password,
-}
-
-impl FormField for ReauthFormField {
-    fn keep(&self) -> bool {
-        match self {
-            Self::Password => false,
-        }
-    }
-}
-
-/// Context used by the `reauth.html` template
-#[derive(Serialize, Default)]
-pub struct ReauthContext {
-    form: FormState<ReauthFormField>,
-    next: Option<PostAuthContext>,
-}
-
-impl TemplateContext for ReauthContext {
-    fn sample(_now: chrono::DateTime<Utc>, _rng: &mut impl Rng) -> Vec<Self>
-    where
-        Self: Sized,
-    {
-        // TODO: samples with errors
-        vec![ReauthContext {
-            form: FormState::default(),
-            next: None,
-        }]
-    }
-}
-
-impl ReauthContext {
-    /// Add an error on the reauthentication form
-    #[must_use]
-    pub fn with_form_state(self, form: FormState<ReauthFormField>) -> Self {
-        Self { form, ..self }
-    }
-
-    /// Add a post authentication action to the context
-    #[must_use]
-    pub fn with_post_action(self, next: PostAuthContext) -> Self {
-        Self {
-            next: Some(next),
-            ..self
-        }
-    }
-}
-
 /// Context used by the `sso.html` template
 #[derive(Serialize)]
 pub struct CompatSsoContext {

crates/templates/src/context.rs

@@ -38,10 +38,10 @@ pub use self::{
         DeviceConsentContext, DeviceLinkContext, DeviceLinkFormField, EmailRecoveryContext,
         EmailVerificationContext, EmptyContext, ErrorContext, FormPostContext, IndexContext,
         LoginContext, LoginFormField, NotFoundContext, PasswordRegisterContext,
-        PolicyViolationContext, PostAuthContext, PostAuthContextInner, ReauthContext,
-        ReauthFormField, RecoveryExpiredContext, RecoveryFinishContext, RecoveryFinishFormField,
-        RecoveryProgressContext, RecoveryStartContext, RecoveryStartFormField, RegisterContext,
-        RegisterFormField, RegisterStepsDisplayNameContext, RegisterStepsDisplayNameFormField,
+        PolicyViolationContext, PostAuthContext, PostAuthContextInner, RecoveryExpiredContext,
+        RecoveryFinishContext, RecoveryFinishFormField, RecoveryProgressContext,
+        RecoveryStartContext, RecoveryStartFormField, RegisterContext, RegisterFormField,
+        RegisterStepsDisplayNameContext, RegisterStepsDisplayNameFormField,
         RegisterStepsEmailInUseContext, RegisterStepsVerifyEmailContext,
         RegisterStepsVerifyEmailFormField, SiteBranding, SiteConfigExt, SiteFeatures,
         TemplateContext, UpstreamExistingLinkContext, UpstreamRegister, UpstreamRegisterFormField,
@@ -372,9 +372,6 @@ register_templates! {
     /// Render the account recovery disabled page
     pub fn render_recovery_disabled(WithLanguage<EmptyContext>) { "pages/recovery/disabled.html" }
 
-    /// Render the re-authentication form
-    pub fn render_reauth(WithLanguage<WithCsrf<WithSession<ReauthContext>>>) { "pages/reauth.html" }
-
     /// Render the form used by the form_post response mode
     pub fn render_form_post<T: Serialize>(WithLanguage<FormPostContext<T>>) { "form_post.html" }
 
@@ -456,7 +453,6 @@ impl Templates {
         check::render_recovery_expired(self, now, rng)?;
         check::render_recovery_consumed(self, now, rng)?;
         check::render_recovery_disabled(self, now, rng)?;
-        check::render_reauth(self, now, rng)?;
         check::render_form_post::<EmptyContext>(self, now, rng)?;
         check::render_error(self, now, rng)?;
         check::render_email_verification_txt(self, now, rng)?;