aitzol
/
Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide email sign-up routings when it's disabled

This commit is contained in:
Kitaiti Makoto 2022-01-12 08:40:20 +09:00
parent b4395bce99
commit 13f7734751
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/routes/email_signups.rs
View File

@ -4,8 +4,12 @@ use crate::{
template_utils::{IntoContext, Ructe}, template_utils::{IntoContext, Ructe},
}; };
use plume_models::{ use plume_models::{
db_conn::DbConn, email_signups::EmailSignup, instance::Instance, lettre::Transport, db_conn::DbConn,
signups::Strategy as SignupStrategy, Error, PlumeRocket, CONFIG, email_signups::EmailSignup,
instance::Instance,
lettre::Transport,
signups::{self, Strategy as SignupStrategy},
Error, PlumeRocket, CONFIG,
}; };
use rocket::{ use rocket::{
http::Status, http::Status,
@ -69,6 +73,7 @@ pub fn create(
form: LenientForm<EmailSignupForm>, form: LenientForm<EmailSignupForm>,
conn: DbConn, conn: DbConn,
rockets: PlumeRocket, rockets: PlumeRocket,
_enabled: signups::Email,
) -> Result<RespondOrRedirect, Ructe> { ) -> Result<RespondOrRedirect, Ructe> {
if !matches!(CONFIG.signup, SignupStrategy::Email) { if !matches!(CONFIG.signup, SignupStrategy::Email) {
return Ok(Flash::error( return Ok(Flash::error(
@ -138,12 +143,17 @@ pub fn create(
} }
#[get("/email_signups/new")] #[get("/email_signups/new")]
pub fn created(conn: DbConn, rockets: PlumeRocket) -> Ructe { pub fn created(conn: DbConn, rockets: PlumeRocket, _enabled: signups::Email) -> Ructe {
render!(email_signups::create(&(&conn, &rockets).to_context())) render!(email_signups::create(&(&conn, &rockets).to_context()))
} }
#[get("/email_signups/<token>")] #[get("/email_signups/<token>")]
pub fn show(token: String, conn: DbConn, rockets: PlumeRocket) -> Result<Ructe, ErrorPage> { pub fn show(
token: String,
conn: DbConn,
rockets: PlumeRocket,
_enabled: signups::Email,
) -> Result<Ructe, ErrorPage> {
let signup = EmailSignup::find_by_token(&conn, token.into())?; let signup = EmailSignup::find_by_token(&conn, token.into())?;
let confirmation = signup.confirm(&conn); let confirmation = signup.confirm(&conn);
if let Some(err) = confirmation.err() { if let Some(err) = confirmation.err() {
@ -179,6 +189,7 @@ pub fn signup(
form: LenientForm<NewUserForm>, form: LenientForm<NewUserForm>,
conn: DbConn, conn: DbConn,
rockets: PlumeRocket, rockets: PlumeRocket,
_enabled: signups::Email,
) -> Result<RespondOrRedirect, Status> { ) -> Result<RespondOrRedirect, Status> {
use RespondOrRedirect::{FlashRedirect, Response}; use RespondOrRedirect::{FlashRedirect, Response};