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.
63 lines
1.8 KiB
Rust
63 lines
1.8 KiB
Rust
use crate::Perform;
|
|
use actix_web::web::Data;
|
|
use bcrypt::verify;
|
|
use lemmy_api_common::{
|
|
person::{ChangePassword, LoginResponse},
|
|
utils::{get_local_user_view_from_jwt, password_length_check},
|
|
};
|
|
use lemmy_db_schema::source::local_user::LocalUser;
|
|
use lemmy_utils::{claims::Claims, error::LemmyError, ConnectionId};
|
|
use lemmy_websocket::LemmyContext;
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
impl Perform for ChangePassword {
|
|
type Response = LoginResponse;
|
|
|
|
#[tracing::instrument(skip(self, context, _websocket_id))]
|
|
async fn perform(
|
|
&self,
|
|
context: &Data<LemmyContext>,
|
|
_websocket_id: Option<ConnectionId>,
|
|
) -> Result<LoginResponse, LemmyError> {
|
|
let data: &ChangePassword = self;
|
|
let local_user_view =
|
|
get_local_user_view_from_jwt(data.auth.as_ref(), context.pool(), context.secret()).await?;
|
|
|
|
password_length_check(&data.new_password)?;
|
|
|
|
// Make sure passwords match
|
|
if data.new_password != data.new_password_verify {
|
|
return Err(LemmyError::from_message("passwords_dont_match"));
|
|
}
|
|
|
|
// Check the old password
|
|
let valid: bool = verify(
|
|
&data.old_password,
|
|
&local_user_view.local_user.password_encrypted,
|
|
)
|
|
.unwrap_or(false);
|
|
if !valid {
|
|
return Err(LemmyError::from_message("password_incorrect"));
|
|
}
|
|
|
|
let local_user_id = local_user_view.local_user.id;
|
|
let new_password = data.new_password.to_owned();
|
|
let updated_local_user =
|
|
LocalUser::update_password(context.pool(), local_user_id, &new_password).await?;
|
|
|
|
// Return the jwt
|
|
Ok(LoginResponse {
|
|
jwt: Some(
|
|
Claims::jwt(
|
|
updated_local_user.id.0,
|
|
&context.secret().jwt_secret,
|
|
&context.settings().hostname,
|
|
)?
|
|
.into(),
|
|
),
|
|
verify_email_sent: false,
|
|
registration_created: false,
|
|
})
|
|
}
|
|
}
|