Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / api / src / local_user / verify_email.rs

diff --git a/crates/api/src/local_user/verify_email.rs b/crates/api/src/local_user/verify_email.rs
index 80befc5a8344a79ee4173c87c8850f0896f51959..a0c4763a6e03ff503c34ef28808994856f1e4796 100644 (file)
--- a/crates/api/src/local_user/verify_email.rs
+++ b/crates/api/src/local_user/verify_email.rs
@@ -3,7 +3,6 @@ use actix_web::web::Data;
 use lemmy_api_common::{
   context::LemmyContext,
   person::{VerifyEmail, VerifyEmailResponse},
-  utils::send_email_verification_success,
 };
 use lemmy_db_schema::{
   source::{
@@ -12,8 +11,7 @@ use lemmy_db_schema::{
   },
   traits::Crud,
 };
-use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::LemmyError;
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
 
 #[async_trait::async_trait(?Send)]
 impl Perform for VerifyEmail {
@@ -21,9 +19,9 @@ impl Perform for VerifyEmail {
 
   async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
     let token = self.token.clone();
-    let verification = EmailVerification::read_for_token(context.pool(), &token)
+    let verification = EmailVerification::read_for_token(&mut context.pool(), &token)
       .await
-      .map_err(|e| LemmyError::from_error_message(e, "token_not_found"))?;
+      .with_lemmy_type(LemmyErrorType::TokenNotFound)?;
 
     let form = LocalUserUpdateForm::builder()
       // necessary in case this is a new signup
@@ -33,13 +31,9 @@ impl Perform for VerifyEmail {
       .build();
     let local_user_id = verification.local_user_id;
 
-    LocalUser::update(context.pool(), local_user_id, &form).await?;
+    LocalUser::update(&mut context.pool(), local_user_id, &form).await?;
 
-    let local_user_view = LocalUserView::read(context.pool(), local_user_id).await?;
-
-    send_email_verification_success(&local_user_view, context.settings())?;
-
-    EmailVerification::delete_old_tokens_for_local_user(context.pool(), local_user_id).await?;
+    EmailVerification::delete_old_tokens_for_local_user(&mut context.pool(), local_user_id).await?;
 
     Ok(VerifyEmailResponse {})
   }