mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-05-07 12:32:40 +00:00
5d837780f5
* Moving settings to Database. - Moves many settings into the database. Fixes #2285 - Adds a local_site and instance table. Fixes #2365 . Fixes #2368 - Separates SQL update an insert forms, to avoid runtime errors. - Adds TypedBuilder to all the SQL forms, instead of default. * Fix weird clippy issue. * Removing extra lines. * Some fixes from suggestions. * Fixing apub tests. * Using instance creation helper function. * Move forms to their own line. * Trying to fix local_site_data, still broken. * Testing out async * Testing out async 2 * Fixing federation tests. * Trying to fix check features 1. * Starting on adding diesel async. 1/4th done. * Added async to views and schema. * Adding some more async * Compiling now. * Added diesel async. Fixes #2465 * Running clippy --fix * Trying to fix cargo test on drone. * Trying new muslrust. * Trying a custom dns * Trying a custom dns 2 * Trying a custom dns 3 * Trying a custom dns 4 * Trying a custom dns 5 * Trying a custom dns 6 * Trying a custom dns 7 * Addressing PR comments. * Adding check_apub to all verify functions. * Reverting back drone. * Fixing merge * Fix docker images. * Adding missing discussion_languages. * Trying to fix federation tests. * Fix site setup user creation. * Fix clippy * Fix clippy 2 * Test api faster * Try to fix 1 * Try to fix 2 * What are these lines about * Trying to fix 3 * Moving federation test back to top. * Remove logging cat.
51 lines
1.5 KiB
Rust
51 lines
1.5 KiB
Rust
use crate::Perform;
|
|
use actix_web::web::Data;
|
|
use lemmy_api_common::{
|
|
person::{VerifyEmail, VerifyEmailResponse},
|
|
utils::send_email_verification_success,
|
|
};
|
|
use lemmy_db_schema::{
|
|
source::{
|
|
email_verification::EmailVerification,
|
|
local_user::{LocalUser, LocalUserUpdateForm},
|
|
},
|
|
traits::Crud,
|
|
};
|
|
use lemmy_db_views::structs::LocalUserView;
|
|
use lemmy_utils::error::LemmyError;
|
|
use lemmy_websocket::LemmyContext;
|
|
|
|
#[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> {
|
|
let token = self.token.clone();
|
|
let verification = EmailVerification::read_for_token(context.pool(), &token)
|
|
.await
|
|
.map_err(|e| LemmyError::from_error_message(e, "token_not_found"))?;
|
|
|
|
let form = LocalUserUpdateForm::builder()
|
|
// necessary in case this is a new signup
|
|
.email_verified(Some(true))
|
|
// necessary in case email of an existing user was changed
|
|
.email(Some(Some(verification.email)))
|
|
.build();
|
|
let local_user_id = verification.local_user_id;
|
|
|
|
LocalUser::update(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?;
|
|
|
|
Ok(VerifyEmailResponse {})
|
|
}
|
|
}
|