phoenix/icarus_auth
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases 52 Wiki Activity

tsk-61: Adding changes to make feature available

Browse Source
This commit is contained in:
phoenix
2025-10-20 12:16:31 -04:00
parent 6c83e566bf
commit 34687dda7d
1 changed files with 62 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/callers/register.rs
View File

@@ -52,67 +52,74 @@ pub async fn register_user(
axum::Extension(pool): axum::Extension<sqlx::PgPool>, axum::Extension(pool): axum::Extension<sqlx::PgPool>,
Json(payload): Json<request::Request>, Json(payload): Json<request::Request>,
) -> (StatusCode, Json<response::Response>) { ) -> (StatusCode, Json<response::Response>) {
let mut user = icarus_models::user::User { if is_registration_enabled() {
username: payload.username.clone(), let mut user = icarus_models::user::User {
password: payload.password.clone(), username: payload.username.clone(),
email: payload.email.clone(), password: payload.password.clone(),
phone: payload.phone.clone(), email: payload.email.clone(),
firstname: payload.firstname.clone(), phone: payload.phone.clone(),
lastname: payload.lastname.clone(), firstname: payload.firstname.clone(),
status: String::from("Active"), lastname: payload.lastname.clone(),
email_verified: true, status: String::from("Active"),
..Default::default() email_verified: true,
}; ..Default::default()
};
match repo::user::exists(&pool, &user.username).await { match repo::user::exists(&pool, &user.username).await {
Ok(res) => { Ok(res) => {
if res { if res {
( (
StatusCode::BAD_REQUEST,
Json(response::Response {
message: String::from("Error"),
data: Vec::new(),
}),
)
} else {
let salt_string = hashing::generate_salt().unwrap();
let mut salt = icarus_models::user::salt::Salt::default();
let generated_salt = salt_string;
salt.salt = generated_salt.to_string();
salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
user.salt_id = salt.id;
let hashed_password =
hashing::hash_password(&user.password, &generated_salt).unwrap();
user.password = hashed_password;
match repo::user::insert(&pool, &user).await {
Ok((id, date_created)) => {
user.id = id;
user.date_created = date_created;
(
StatusCode::CREATED,
Json(response::Response {
message: String::from("User created"),
data: vec![user],
}),
)
}
Err(err) => (
StatusCode::BAD_REQUEST, StatusCode::BAD_REQUEST,
Json(response::Response { Json(response::Response {
message: err.to_string(), message: String::from("Error"),
data: vec![user], data: Vec::new(),
}), }),
), )
} else {
let salt_string = hashing::generate_salt().unwrap();
let mut salt = icarus_models::user::salt::Salt::default();
let generated_salt = salt_string;
salt.salt = generated_salt.to_string();
salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
user.salt_id = salt.id;
let hashed_password =
hashing::hash_password(&user.password, &generated_salt).unwrap();
user.password = hashed_password;
match repo::user::insert(&pool, &user).await {
Ok((id, date_created)) => {
user.id = id;
user.date_created = date_created;
(
StatusCode::CREATED,
Json(response::Response {
message: String::from("User created"),
data: vec![user],
}),
)
}
Err(err) => (
StatusCode::BAD_REQUEST,
Json(response::Response {
message: err.to_string(),
data: vec![user],
}),
),
}
} }
} }
Err(err) => (
StatusCode::BAD_REQUEST,
Json(response::Response {
message: err.to_string(),
data: vec![user],
}),
),
} }
Err(err) => ( } else {
StatusCode::BAD_REQUEST, (axum::http::StatusCode::NOT_ACCEPTABLE, Json(response::Response{
Json(response::Response { message: String::from("Registration is not enabled"),
message: err.to_string(), data:: Vec::new()
data: vec![user], }))
}),
),
} }
} }