Merge factors type for authentication
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
use actix::Addr;
|
||||
use actix_web::{HttpResponse, Responder, web};
|
||||
use actix_web::{web, HttpResponse, Responder};
|
||||
|
||||
use crate::actors::users_actor::{DeleteUserRequest, FindUserByUsername, UsersActor};
|
||||
use crate::data::current_user::CurrentUser;
|
||||
@@ -15,10 +15,16 @@ struct FindUserResult {
|
||||
user_id: Option<String>,
|
||||
}
|
||||
|
||||
pub async fn find_username(req: web::Form<FindUserNameReq>, users: web::Data<Addr<UsersActor>>) -> impl Responder {
|
||||
let res = users.send(FindUserByUsername(req.0.username)).await.unwrap();
|
||||
pub async fn find_username(
|
||||
req: web::Form<FindUserNameReq>,
|
||||
users: web::Data<Addr<UsersActor>>,
|
||||
) -> impl Responder {
|
||||
let res = users
|
||||
.send(FindUserByUsername(req.0.username))
|
||||
.await
|
||||
.unwrap();
|
||||
HttpResponse::Ok().json(FindUserResult {
|
||||
user_id: res.0.map(|r| r.uid.0)
|
||||
user_id: res.0.map(|r| r.uid.0),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -27,9 +33,11 @@ pub struct DeleteUserReq {
|
||||
user_id: UserID,
|
||||
}
|
||||
|
||||
|
||||
pub async fn delete_user(user: CurrentUser, req: web::Form<DeleteUserReq>,
|
||||
users: web::Data<Addr<UsersActor>>) -> impl Responder {
|
||||
pub async fn delete_user(
|
||||
user: CurrentUser,
|
||||
req: web::Form<DeleteUserReq>,
|
||||
users: web::Data<Addr<UsersActor>>,
|
||||
) -> impl Responder {
|
||||
if user.uid == req.user_id {
|
||||
return HttpResponse::BadRequest().body("You can not remove your own account!");
|
||||
}
|
||||
@@ -41,4 +49,3 @@ pub async fn delete_user(user: CurrentUser, req: web::Form<DeleteUserReq>,
|
||||
HttpResponse::InternalServerError().finish()
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user