use crate::PerformCrud;
use actix_web::web::Data;
-use lemmy_api_common::{blocking, password_length_check, person::*};
+use lemmy_api_common::{
+ blocking,
+ honeypot_check,
+ password_length_check,
+ person::*,
+ send_verification_email,
+};
use lemmy_apub::{
- generate_apub_endpoint,
generate_followers_url,
generate_inbox_url,
+ generate_local_apub_endpoint,
generate_shared_inbox_url,
EndpointType,
};
-use lemmy_db_queries::{
- source::{local_user::LocalUser_, site::Site_},
- Crud,
- Followable,
- Joinable,
- ListingType,
- SortType,
-};
use lemmy_db_schema::{
+ newtypes::CommunityId,
source::{
- community::*,
+ community::{
+ Community,
+ CommunityFollower,
+ CommunityFollowerForm,
+ CommunityForm,
+ CommunityModerator,
+ CommunityModeratorForm,
+ },
local_user::{LocalUser, LocalUserForm},
- person::*,
- site::*,
+ person::{Person, PersonForm},
+ registration_application::{RegistrationApplication, RegistrationApplicationForm},
+ site::Site,
},
- CommunityId,
+ traits::{Crud, Followable, Joinable},
};
use lemmy_db_views_actor::person_view::PersonViewSafe;
use lemmy_utils::{
apub::generate_actor_keypair,
claims::Claims,
- settings::structs::Settings,
- utils::{check_slurs, is_valid_username},
- ApiError,
+ utils::{check_slurs, is_valid_actor_name},
ConnectionId,
LemmyError,
};
impl PerformCrud for Register {
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: &Register = &self;
+ let data: &Register = self;
+
+ // no email verification, or applications if the site is not setup yet
+ let (mut email_verification, mut require_application) = (false, false);
// Make sure site has open registration
- if let Ok(site) = blocking(context.pool(), move |conn| Site::read_simple(conn)).await? {
+ if let Ok(site) = blocking(context.pool(), Site::read_local_site).await? {
if !site.open_registration {
- return Err(ApiError::err("registration_closed").into());
+ return Err(LemmyError::from_message("registration_closed"));
}
+ email_verification = site.require_email_verification;
+ require_application = site.require_application;
}
password_length_check(&data.password)?;
+ honeypot_check(&data.honeypot)?;
+
+ if email_verification && data.email.is_none() {
+ return Err(LemmyError::from_message("email_required"));
+ }
+
+ if require_application && data.answer.is_none() {
+ return Err(LemmyError::from_message(
+ "registration_application_answer_required",
+ ));
+ }
// Make sure passwords match
if data.password != data.password_verify {
- return Err(ApiError::err("passwords_dont_match").into());
+ return Err(LemmyError::from_message("passwords_dont_match"));
}
// Check if there are admins. False if admins exist
.await??;
// If its not the admin, check the captcha
- if !no_admins && Settings::get().captcha().enabled {
+ if !no_admins && context.settings().captcha.enabled {
let check = context
.chat_server()
.send(CheckCaptcha {
})
.await?;
if !check {
- return Err(ApiError::err("captcha_incorrect").into());
+ return Err(LemmyError::from_message("captcha_incorrect"));
}
}
- check_slurs(&data.username)?;
+ check_slurs(&data.username, &context.settings().slur_regex())?;
let actor_keypair = generate_actor_keypair()?;
- if !is_valid_username(&data.username) {
- return Err(ApiError::err("invalid_username").into());
+ if !is_valid_actor_name(&data.username, context.settings().actor_name_max_length) {
+ return Err(LemmyError::from_message("invalid_username"));
}
- let actor_id = generate_apub_endpoint(EndpointType::Person, &data.username)?;
+ let actor_id = generate_local_apub_endpoint(
+ EndpointType::Person,
+ &data.username,
+ &context.settings().get_protocol_and_hostname(),
+ )?;
// We have to create both a person, and local_user
name: data.username.to_owned(),
actor_id: Some(actor_id.clone()),
private_key: Some(Some(actor_keypair.private_key)),
- public_key: Some(Some(actor_keypair.public_key)),
+ public_key: actor_keypair.public_key,
inbox_url: Some(generate_inbox_url(&actor_id)?),
shared_inbox_url: Some(Some(generate_shared_inbox_url(&actor_id)?)),
admin: Some(no_admins),
Person::create(conn, &person_form)
})
.await?
- .map_err(|_| ApiError::err("user_already_exists"))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("user_already_exists"))?;
// Create the local user
let local_user_form = LocalUserForm {
- person_id: inserted_person.id,
- email: Some(data.email.to_owned()),
- password_encrypted: data.password.to_owned(),
+ person_id: Some(inserted_person.id),
+ email: Some(data.email.as_deref().map(|s| s.to_owned())),
+ password_encrypted: Some(data.password.to_string()),
show_nsfw: Some(data.show_nsfw),
- theme: Some("browser".into()),
- default_sort_type: Some(SortType::Active as i16),
- default_listing_type: Some(ListingType::Subscribed as i16),
- lang: Some("browser".into()),
- show_avatars: Some(true),
- show_scores: Some(true),
- send_notifications_to_email: Some(false),
+ email_verified: Some(false),
+ ..LocalUserForm::default()
};
let inserted_local_user = match blocking(context.pool(), move |conn| {
// If the local user creation errored, then delete that person
blocking(context.pool(), move |conn| {
- Person::delete(&conn, inserted_person.id)
+ Person::delete(conn, inserted_person.id)
})
.await??;
- return Err(ApiError::err(err_type).into());
+ return Err(LemmyError::from(e).with_message(err_type));
}
};
+ if require_application {
+ // Create the registration application
+ let form = RegistrationApplicationForm {
+ local_user_id: Some(inserted_local_user.id),
+ // We already made sure answer was not null above
+ answer: data.answer.to_owned(),
+ ..RegistrationApplicationForm::default()
+ };
+
+ blocking(context.pool(), move |conn| {
+ RegistrationApplication::create(conn, &form)
+ })
+ .await??;
+ }
+
let main_community_keypair = generate_actor_keypair()?;
// Create the main community if it doesn't exist
+ let protocol_and_hostname = context.settings().get_protocol_and_hostname();
let main_community = match blocking(context.pool(), move |conn| {
Community::read(conn, CommunityId(2))
})
Ok(c) => c,
Err(_e) => {
let default_community_name = "main";
- let actor_id = generate_apub_endpoint(EndpointType::Community, default_community_name)?;
+ let actor_id = generate_local_apub_endpoint(
+ EndpointType::Community,
+ default_community_name,
+ &protocol_and_hostname,
+ )?;
let community_form = CommunityForm {
name: default_community_name.to_string(),
title: "The Default Community".to_string(),
description: Some("The Default Community".to_string()),
actor_id: Some(actor_id.to_owned()),
- private_key: Some(main_community_keypair.private_key),
- public_key: Some(main_community_keypair.public_key),
+ private_key: Some(Some(main_community_keypair.private_key)),
+ public_key: main_community_keypair.public_key,
followers_url: Some(generate_followers_url(&actor_id)?),
inbox_url: Some(generate_inbox_url(&actor_id)?),
shared_inbox_url: Some(Some(generate_shared_inbox_url(&actor_id)?)),
};
let follow = move |conn: &'_ _| CommunityFollower::follow(conn, &community_follower_form);
- if blocking(context.pool(), follow).await?.is_err() {
- return Err(ApiError::err("community_follower_already_exists").into());
- };
+ blocking(context.pool(), follow)
+ .await?
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_follower_already_exists"))?;
// If its an admin, add them as a mod and follower to main
if no_admins {
};
let join = move |conn: &'_ _| CommunityModerator::join(conn, &community_moderator_form);
- if blocking(context.pool(), join).await?.is_err() {
- return Err(ApiError::err("community_moderator_already_exists").into());
+ blocking(context.pool(), join)
+ .await?
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_moderator_already_exists"))?;
+ }
+
+ let mut login_response = LoginResponse {
+ jwt: None,
+ registration_created: false,
+ verify_email_sent: false,
+ };
+
+ // Log the user in directly if email verification and application aren't required
+ if !require_application && !email_verification {
+ login_response.jwt = Some(
+ Claims::jwt(
+ inserted_local_user.id.0,
+ &context.secret().jwt_secret,
+ &context.settings().hostname,
+ )?
+ .into(),
+ );
+ } else {
+ if email_verification {
+ send_verification_email(
+ inserted_local_user.id,
+ // we check at the beginning of this method that email is set
+ &inserted_local_user.email.expect("email was provided"),
+ &inserted_person.name,
+ context.pool(),
+ &context.settings(),
+ )
+ .await?;
+ login_response.verify_email_sent = true;
+ }
+
+ if require_application {
+ login_response.registration_created = true;
}
}
- // Return the jwt
- Ok(LoginResponse {
- jwt: Claims::jwt(inserted_local_user.id.0)?,
- })
+ Ok(login_response)
}
}
projects / lemmy.git / blobdiff