Mirrors/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy synced 2024-11-25 22:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Notify admin about registration application after email verification (fixes #3024) (#3995)

Browse source
This commit is contained in:
Nutomic 2023-09-28 16:06:45 +02:00 committed by GitHub
parent 9bb99bec5e
commit 210c470ebd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/api/src/local_user/verify_email.rs
View file

@ -2,20 +2,25 @@ use actix_web::web::{Data, Json};
use lemmy_api_common::{ use lemmy_api_common::{
context::LemmyContext, context::LemmyContext,
person::{VerifyEmail, VerifyEmailResponse}, person::{VerifyEmail, VerifyEmailResponse},
utils::send_new_applicant_email_to_admins,
}; };
use lemmy_db_schema::{ use lemmy_db_schema::{
source::{ source::{
email_verification::EmailVerification, email_verification::EmailVerification,
local_user::{LocalUser, LocalUserUpdateForm}, local_user::{LocalUser, LocalUserUpdateForm},
person::Person,
}, },
traits::Crud, traits::Crud,
RegistrationMode,
}; };
use lemmy_db_views::structs::SiteView;
use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType}; use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
pub async fn verify_email( pub async fn verify_email(
data: Json<VerifyEmail>, data: Json<VerifyEmail>,
context: Data<LemmyContext>, context: Data<LemmyContext>,
) -> Result<Json<VerifyEmailResponse>, LemmyError> { ) -> Result<Json<VerifyEmailResponse>, LemmyError> {
let site_view = SiteView::read_local(&mut context.pool()).await?;
let token = data.token.clone(); let token = data.token.clone();
let verification = EmailVerification::read_for_token(&mut context.pool(), &token) let verification = EmailVerification::read_for_token(&mut context.pool(), &token)
.await .await
@ -30,9 +35,18 @@ pub async fn verify_email(
}; };
let local_user_id = verification.local_user_id; let local_user_id = verification.local_user_id;
LocalUser::update(&mut context.pool(), local_user_id, &form).await?; let local_user = LocalUser::update(&mut context.pool(), local_user_id, &form).await?;
EmailVerification::delete_old_tokens_for_local_user(&mut context.pool(), local_user_id).await?; EmailVerification::delete_old_tokens_for_local_user(&mut context.pool(), local_user_id).await?;
// send out notification about registration application to admins if enabled
if site_view.local_site.registration_mode == RegistrationMode::RequireApplication
&& site_view.local_site.application_email_admins
{
let person = Person::read(&mut context.pool(), local_user.person_id).await?;
send_new_applicant_email_to_admins(&person.name, &mut context.pool(), context.settings())
.await?;
}
Ok(Json(VerifyEmailResponse {})) Ok(Json(VerifyEmailResponse {}))
} }

4
crates/api_crud/src/user/create.rs
View file

@ -158,8 +158,8 @@ pub async fn register(
RegistrationApplication::create(&mut context.pool(), &form).await?; RegistrationApplication::create(&mut context.pool(), &form).await?;
} }
// Email the admins // Email the admins, only if email verification is not required
if local_site.application_email_admins { if local_site.application_email_admins && !local_site.require_email_verification {
send_new_applicant_email_to_admins(&data.username, &mut context.pool(), context.settings()) send_new_applicant_email_to_admins(&data.username, &mut context.pool(), context.settings())
.await?; .await?;
} }