use crate::PerformCrud;
use actix_web::web::Data;
-use lemmy_api_common::{blocking, honeypot_check, password_length_check, person::*};
+use lemmy_api_common::{
+ person::{LoginResponse, Register},
+ utils::{blocking, honeypot_check, password_length_check, 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_schema::{
+ aggregates::structs::PersonAggregates,
newtypes::CommunityId,
source::{
community::{
},
local_user::{LocalUser, LocalUserForm},
person::{Person, PersonForm},
+ registration_application::{RegistrationApplication, RegistrationApplicationForm},
site::Site,
},
traits::{Crud, Followable, Joinable},
- ListingType,
- SortType,
};
-use lemmy_db_views_actor::person_view::PersonViewSafe;
+use lemmy_db_views::structs::LocalUserView;
+use lemmy_db_views_actor::structs::PersonViewSafe;
use lemmy_utils::{
apub::generate_actor_keypair,
claims::Claims,
utils::{check_slurs, is_valid_actor_name},
- ApiError,
ConnectionId,
LemmyError,
};
impl PerformCrud for Register {
type Response = LoginResponse;
+ #[tracing::instrument(skip(self, context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
) -> Result<LoginResponse, LemmyError> {
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(), Site::read_simple).await? {
+ if let Ok(site) = blocking(context.pool(), Site::read_local_site).await? {
if !site.open_registration {
- return Err(ApiError::err_plain("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_plain("passwords_dont_match").into());
+ return Err(LemmyError::from_message("passwords_dont_match"));
}
// Check if there are admins. False if admins exist
})
.await?;
if !check {
- return Err(ApiError::err_plain("captcha_incorrect").into());
+ return Err(LemmyError::from_message("captcha_incorrect"));
}
}
let actor_keypair = generate_actor_keypair()?;
if !is_valid_actor_name(&data.username, context.settings().actor_name_max_length) {
- return Err(ApiError::err_plain("invalid_username").into());
+ return Err(LemmyError::from_message("invalid_username"));
}
- let actor_id = generate_apub_endpoint(
+ let actor_id = generate_local_apub_endpoint(
EndpointType::Person,
&data.username,
&context.settings().get_protocol_and_hostname(),
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(|e| ApiError::err("user_already_exists", e))?;
+ .map_err(|e| LemmyError::from_error_message(e, "user_already_exists"))?;
// Create the local user
- // TODO some of these could probably use the DB defaults
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),
- show_bot_accounts: Some(true),
- 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),
- show_read_posts: Some(true),
- show_new_post_notifs: Some(false),
- send_notifications_to_email: Some(false),
+ email_verified: Some(false),
+ ..LocalUserForm::default()
};
let inserted_local_user = match blocking(context.pool(), move |conn| {
})
.await??;
- return Err(ApiError::err(err_type, e).into());
+ return Err(LemmyError::from_error_message(e, 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
Ok(c) => c,
Err(_e) => {
let default_community_name = "main";
- let actor_id = generate_apub_endpoint(
+ let actor_id = generate_local_apub_endpoint(
EndpointType::Community,
default_community_name,
&protocol_and_hostname,
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);
blocking(context.pool(), follow)
.await?
- .map_err(|e| ApiError::err("community_follower_already_exists", e))?;
+ .map_err(|e| LemmyError::from_error_message(e, "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);
blocking(context.pool(), join)
.await?
- .map_err(|e| ApiError::err("community_moderator_already_exists", e))?;
+ .map_err(|e| LemmyError::from_error_message(e, "community_moderator_already_exists"))?;
}
- // Return the jwt
- Ok(LoginResponse {
- jwt: Claims::jwt(
- inserted_local_user.id.0,
- &context.secret().jwt_secret,
- &context.settings().hostname,
- )?,
- })
+ 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 {
+ let local_user_view = LocalUserView {
+ local_user: inserted_local_user,
+ person: inserted_person,
+ counts: PersonAggregates::default(),
+ };
+ // we check at the beginning of this method that email is set
+ let email = local_user_view
+ .local_user
+ .email
+ .clone()
+ .expect("email was provided");
+ send_verification_email(
+ &local_user_view,
+ &email,
+ context.pool(),
+ &context.settings(),
+ )
+ .await?;
+ login_response.verify_email_sent = true;
+ }
+
+ if require_application {
+ login_response.registration_created = true;
+ }
+ }
+
+ Ok(login_response)
}
}
projects / lemmy.git / blobdiff