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

Tidying up changes

Browse Source
This commit is contained in:
phoenix
2025-10-20 11:40:32 -04:00
parent f912844aa9
commit cf67d37e85
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/callers/register.rs
View File

@@ -52,9 +52,7 @@ 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>) {
// TODO: Some cleanup here
let mut user = icarus_models::user::User { let mut user = icarus_models::user::User {
id: uuid::Uuid::nil(),
username: payload.username.clone(), username: payload.username.clone(),
password: payload.password.clone(), password: payload.password.clone(),
email: payload.email.clone(), email: payload.email.clone(),
@@ -63,9 +61,7 @@ pub async fn register_user(
lastname: payload.lastname.clone(), lastname: payload.lastname.clone(),
status: String::from("Active"), status: String::from("Active"),
email_verified: true, email_verified: true,
date_created: Some(time::OffsetDateTime::now_utc()), ..Default::default()
last_login: None,
salt_id: uuid::Uuid::nil(),
}; };
match repo::user::exists(&pool, &user.username).await { match repo::user::exists(&pool, &user.username).await {
@@ -90,8 +86,9 @@ pub async fn register_user(
user.password = hashed_password; user.password = hashed_password;
match repo::user::insert(&pool, &user).await { match repo::user::insert(&pool, &user).await {
Ok(id) => { Ok((id, date_created)) => {
user.id = id; user.id = id;
user.date_created = date_created;
( (
StatusCode::CREATED, StatusCode::CREATED,
Json(response::Response { Json(response::Response {

6
src/repo/mod.rs
View File

@@ -94,7 +94,7 @@ pub mod user {
pub async fn insert( pub async fn insert(
pool: &sqlx::PgPool, pool: &sqlx::PgPool,
user: &icarus_models::user::User, user: &icarus_models::user::User,
) -> Result<uuid::Uuid, sqlx::Error> { ) -> Result<(uuid::Uuid, std::option::Option<time::OffsetDateTime>), sqlx::Error> {
let row = sqlx::query( let row = sqlx::query(
r#" r#"
INSERT INTO "user" (username, password, email, phone, firstname, lastname, email_verified, status, salt_id) INSERT INTO "user" (username, password, email, phone, firstname, lastname, email_verified, status, salt_id)
@@ -124,8 +124,8 @@ pub mod user {
.map_err(|_e| sqlx::Error::RowNotFound)?, .map_err(|_e| sqlx::Error::RowNotFound)?,
}; };
if !result.id.is_nil() { if !result.id.is_nil() && !result.date_created.is_none() {
Ok(result.id) Ok((result.id, result.date_created))
} else { } else {
Err(sqlx::Error::RowNotFound) Err(sqlx::Error::RowNotFound)
} }