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 63a998915555be0b713b9f197da74afbf107444d..a0c4763a6e03ff503c34ef28808994856f1e4796 100644 (file)
--- a/crates/api/src/local_user/verify_email.rs
+++ b/crates/api/src/local_user/verify_email.rs
@@ -1,60 +1,39 @@
 use crate::Perform;
 use actix_web::web::Data;
 use lemmy_api_common::{
+  context::LemmyContext,
   person::{VerifyEmail, VerifyEmailResponse},
-  utils::{blocking, send_email_verification_success},
 };
 use lemmy_db_schema::{
   source::{
     email_verification::EmailVerification,
-    local_user::{LocalUser, LocalUserForm},
+    local_user::{LocalUser, LocalUserUpdateForm},
   },
   traits::Crud,
 };
-use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::LemmyError;
-use lemmy_websocket::LemmyContext;
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
 
 #[async_trait::async_trait(?Send)]
 impl Perform for VerifyEmail {
   type Response = VerifyEmailResponse;
 
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<usize>,
-  ) -> Result<Self::Response, LemmyError> {
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
     let token = self.token.clone();
-    let verification = blocking(context.pool(), move |conn| {
-      EmailVerification::read_for_token(conn, &token)
-    })
-    .await?
-    .map_err(|e| LemmyError::from_error_message(e, "token_not_found"))?;
+    let verification = EmailVerification::read_for_token(&mut context.pool(), &token)
+      .await
+      .with_lemmy_type(LemmyErrorType::TokenNotFound)?;
 
-    let form = LocalUserForm {
+    let form = LocalUserUpdateForm::builder()
       // necessary in case this is a new signup
-      email_verified: Some(true),
+      .email_verified(Some(true))
       // necessary in case email of an existing user was changed
-      email: Some(Some(verification.email)),
-      ..LocalUserForm::default()
-    };
+      .email(Some(Some(verification.email)))
+      .build();
     let local_user_id = verification.local_user_id;
-    blocking(context.pool(), move |conn| {
-      LocalUser::update(conn, local_user_id, &form)
-    })
-    .await??;
 
-    let local_user_view = blocking(context.pool(), move |conn| {
-      LocalUserView::read(conn, local_user_id)
-    })
-    .await??;
+    LocalUser::update(&mut context.pool(), local_user_id, &form).await?;
 
-    send_email_verification_success(&local_user_view, context.settings())?;
-
-    blocking(context.pool(), move |conn| {
-      EmailVerification::delete_old_tokens_for_local_user(conn, local_user_id)
-    })
-    .await??;
+    EmailVerification::delete_old_tokens_for_local_user(&mut context.pool(), local_user_id).await?;
 
     Ok(VerifyEmailResponse {})
   }