use crate::Perform;
use actix_web::web::Data;
use lemmy_api_common::{
+ context::LemmyContext,
person::{LoginResponse, SaveUserSettings},
- utils::{blocking, get_local_user_view_from_jwt, send_verification_email},
+ utils::{get_local_user_view_from_jwt, send_verification_email},
};
use lemmy_db_schema::{
source::{
- local_user::{LocalUser, LocalUserForm},
- local_user_language::LocalUserLanguage,
- person::{Person, PersonForm},
- site::Site,
+ actor_language::LocalUserLanguage,
+ local_user::{LocalUser, LocalUserUpdateForm},
+ person::{Person, PersonUpdateForm},
},
traits::Crud,
- utils::{diesel_option_overwrite, diesel_option_overwrite_to_url, naive_now},
+ utils::{diesel_option_overwrite, diesel_option_overwrite_to_url},
};
+use lemmy_db_views::structs::SiteView;
use lemmy_utils::{
claims::Claims,
error::LemmyError,
- utils::{is_valid_display_name, is_valid_matrix_id},
+ utils::validation::{
+ build_totp_2fa,
+ generate_totp_2fa_secret,
+ is_valid_display_name,
+ is_valid_matrix_id,
+ },
ConnectionId,
};
-use lemmy_websocket::LemmyContext;
#[async_trait::async_trait(?Send)]
impl Perform for SaveUserSettings {
let data: &SaveUserSettings = self;
let local_user_view =
get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
+ let site_view = SiteView::read_local(context.pool()).await?;
let avatar = diesel_option_overwrite_to_url(&data.avatar)?;
let banner = diesel_option_overwrite_to_url(&data.banner)?;
let bio = diesel_option_overwrite(&data.bio);
let display_name = diesel_option_overwrite(&data.display_name);
let matrix_user_id = diesel_option_overwrite(&data.matrix_user_id);
- let bot_account = data.bot_account;
- let email_deref = data.email.as_deref().map(|e| e.to_lowercase());
+ let email_deref = data.email.as_deref().map(str::to_lowercase);
let email = diesel_option_overwrite(&email_deref);
if let Some(Some(email)) = &email {
// When the site requires email, make sure email is not Some(None). IE, an overwrite to a None value
if let Some(email) = &email {
- let site_fut = blocking(context.pool(), Site::read_local_site);
- if email.is_none() && site_fut.await??.require_email_verification {
+ if email.is_none() && site_view.local_site.require_email_verification {
return Err(LemmyError::from_message("email_required"));
}
}
if let Some(Some(display_name)) = &display_name {
if !is_valid_display_name(
display_name.trim(),
- context.settings().actor_name_max_length,
+ site_view.local_site.actor_name_max_length as usize,
) {
return Err(LemmyError::from_message("invalid_username"));
}
let person_id = local_user_view.person.id;
let default_listing_type = data.default_listing_type;
let default_sort_type = data.default_sort_type;
- let password_encrypted = local_user_view.local_user.password_encrypted;
- let public_key = Some(local_user_view.person.public_key);
-
- let person_form = PersonForm {
- name: local_user_view.person.name,
- avatar,
- banner,
- inbox_url: None,
- display_name,
- published: None,
- updated: Some(naive_now()),
- banned: None,
- deleted: None,
- actor_id: None,
- bio,
- local: None,
- admin: None,
- private_key: None,
- public_key,
- last_refreshed_at: None,
- shared_inbox_url: None,
- matrix_user_id,
- bot_account,
- ban_expires: None,
- };
- blocking(context.pool(), move |conn| {
- Person::update(conn, person_id, &person_form)
- })
- .await?
- .map_err(|e| LemmyError::from_error_message(e, "user_already_exists"))?;
+ let person_form = PersonUpdateForm::builder()
+ .display_name(display_name)
+ .bio(bio)
+ .matrix_user_id(matrix_user_id)
+ .bot_account(data.bot_account)
+ .avatar(avatar)
+ .banner(banner)
+ .build();
- if let Some(discussion_languages) = data.discussion_languages.clone() {
- // An empty array is a "clear" / set all languages
- let languages = if discussion_languages.is_empty() {
- None
- } else {
- Some(discussion_languages)
- };
+ Person::update(context.pool(), person_id, &person_form)
+ .await
+ .map_err(|e| LemmyError::from_error_message(e, "user_already_exists"))?;
- blocking(context.pool(), move |conn| {
- LocalUserLanguage::update_user_languages(conn, languages, local_user_id)
- })
- .await??;
+ if let Some(discussion_languages) = data.discussion_languages.clone() {
+ LocalUserLanguage::update(context.pool(), discussion_languages, local_user_id).await?;
}
- let local_user_form = LocalUserForm {
- person_id: Some(person_id),
- email,
- password_encrypted: Some(password_encrypted),
- show_nsfw: data.show_nsfw,
- show_bot_accounts: data.show_bot_accounts,
- show_scores: data.show_scores,
- theme: data.theme.to_owned(),
- default_sort_type,
- default_listing_type,
- interface_language: data.interface_language.to_owned(),
- show_avatars: data.show_avatars,
- show_read_posts: data.show_read_posts,
- show_new_post_notifs: data.show_new_post_notifs,
- send_notifications_to_email: data.send_notifications_to_email,
- email_verified: None,
- accepted_application: None,
+ // If generate_totp is Some(false), this will clear it out from the database.
+ let (totp_2fa_secret, totp_2fa_url) = if let Some(generate) = data.generate_totp_2fa {
+ if generate {
+ let secret = generate_totp_2fa_secret();
+ let url =
+ build_totp_2fa(&site_view.site.name, &local_user_view.person.name, &secret)?.get_url();
+ (Some(Some(secret)), Some(Some(url)))
+ } else {
+ (Some(None), Some(None))
+ }
+ } else {
+ (None, None)
};
- let local_user_res = blocking(context.pool(), move |conn| {
- LocalUser::update(conn, local_user_id, &local_user_form)
- })
- .await?;
+ let local_user_form = LocalUserUpdateForm::builder()
+ .email(email)
+ .show_avatars(data.show_avatars)
+ .show_read_posts(data.show_read_posts)
+ .show_new_post_notifs(data.show_new_post_notifs)
+ .send_notifications_to_email(data.send_notifications_to_email)
+ .show_nsfw(data.show_nsfw)
+ .show_bot_accounts(data.show_bot_accounts)
+ .show_scores(data.show_scores)
+ .default_sort_type(default_sort_type)
+ .default_listing_type(default_listing_type)
+ .theme(data.theme.clone())
+ .interface_language(data.interface_language.clone())
+ .totp_2fa_secret(totp_2fa_secret)
+ .totp_2fa_url(totp_2fa_url)
+ .build();
+
+ let local_user_res = LocalUser::update(context.pool(), local_user_id, &local_user_form).await;
let updated_local_user = match local_user_res {
Ok(u) => u,
Err(e) => {