|
|
|
@ -1,11 +1,10 @@
|
|
|
|
|
use activitypub_federation::{config::Data, http_signatures::generate_actor_keypair};
|
|
|
|
|
use actix_web::{http::StatusCode, web::Json, HttpRequest, HttpResponse, HttpResponseBuilder};
|
|
|
|
|
use actix_web::{web::Json, HttpRequest};
|
|
|
|
|
use lemmy_api_common::{
|
|
|
|
|
claims::Claims,
|
|
|
|
|
context::LemmyContext,
|
|
|
|
|
person::{LoginResponse, Register},
|
|
|
|
|
utils::{
|
|
|
|
|
create_login_cookie,
|
|
|
|
|
generate_inbox_url,
|
|
|
|
|
generate_local_apub_endpoint,
|
|
|
|
|
generate_shared_inbox_url,
|
|
|
|
@ -42,7 +41,7 @@ pub async fn register(
|
|
|
|
|
data: Json<Register>,
|
|
|
|
|
req: HttpRequest,
|
|
|
|
|
context: Data<LemmyContext>,
|
|
|
|
|
) -> Result<HttpResponse, LemmyError> {
|
|
|
|
|
) -> Result<Json<LoginResponse>, LemmyError> {
|
|
|
|
|
let site_view = SiteView::read_local(&mut context.pool()).await?;
|
|
|
|
|
let local_site = site_view.local_site;
|
|
|
|
|
let require_registration_application =
|
|
|
|
@ -158,7 +157,6 @@ pub async fn register(
|
|
|
|
|
.await?;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let mut res = HttpResponseBuilder::new(StatusCode::OK);
|
|
|
|
|
let mut login_response = LoginResponse {
|
|
|
|
|
jwt: None,
|
|
|
|
|
registration_created: false,
|
|
|
|
@ -170,7 +168,6 @@ pub async fn register(
|
|
|
|
|
|| (!require_registration_application && !local_site.require_email_verification)
|
|
|
|
|
{
|
|
|
|
|
let jwt = Claims::generate(inserted_local_user.id, req, &context).await?;
|
|
|
|
|
res.cookie(create_login_cookie(jwt.clone()));
|
|
|
|
|
login_response.jwt = Some(jwt);
|
|
|
|
|
} else {
|
|
|
|
|
if local_site.require_email_verification {
|
|
|
|
@ -201,5 +198,5 @@ pub async fn register(
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Ok(res.json(login_response))
|
|
|
|
|
Ok(Json(login_response))
|
|
|
|
|
}
|
|
|
|
|