Compare commits

..

3 Commits

Author SHA1 Message Date
f52b3a2167 tsk-55: Version bump
Some checks failed
Rust Build / Check (pull_request) Successful in 46s
Rust Build / Rustfmt (pull_request) Successful in 37s
Rust Build / Test Suite (pull_request) Successful in 1m29s
Rust Build / Clippy (pull_request) Failing after 2m1s
Rust Build / build (pull_request) Successful in 3m29s
2025-10-20 11:42:19 -04:00
cf67d37e85 Tidying up changes 2025-10-20 11:40:32 -04:00
f912844aa9 tsk-55: Fixing issue with register endpoint 2025-10-20 11:23:37 -04:00
4 changed files with 10 additions and 12 deletions

2
Cargo.lock generated
View File

@@ -748,7 +748,7 @@ dependencies = [
[[package]]
name = "icarus_auth"
version = "0.6.1"
version = "0.6.2"
dependencies = [
"argon2",
"axum",

View File

@@ -1,6 +1,6 @@
[package]
name = "icarus_auth"
version = "0.6.1"
version = "0.6.2"
edition = "2024"
rust-version = "1.90"

View File

@@ -53,7 +53,6 @@ pub async fn register_user(
Json(payload): Json<request::Request>,
) -> (StatusCode, Json<response::Response>) {
let mut user = icarus_models::user::User {
id: uuid::Uuid::nil(),
username: payload.username.clone(),
password: payload.password.clone(),
email: payload.email.clone(),
@@ -62,19 +61,17 @@ pub async fn register_user(
lastname: payload.lastname.clone(),
status: String::from("Active"),
email_verified: true,
date_created: Some(time::OffsetDateTime::now_utc()),
last_login: None,
salt_id: uuid::Uuid::nil(),
..Default::default()
};
match repo::user::exists(&pool, &user.username).await {
Ok(res) => {
if res {
(
StatusCode::NOT_FOUND,
StatusCode::BAD_REQUEST,
Json(response::Response {
message: String::from("Error"),
data: vec![user],
data: Vec::new(),
}),
)
} else {
@@ -89,8 +86,9 @@ pub async fn register_user(
user.password = hashed_password;
match repo::user::insert(&pool, &user).await {
Ok(id) => {
Ok((id, date_created)) => {
user.id = id;
user.date_created = date_created;
(
StatusCode::CREATED,
Json(response::Response {

View File

@@ -94,7 +94,7 @@ pub mod user {
pub async fn insert(
pool: &sqlx::PgPool,
user: &icarus_models::user::User,
) -> Result<uuid::Uuid, sqlx::Error> {
) -> Result<(uuid::Uuid, std::option::Option<time::OffsetDateTime>), sqlx::Error> {
let row = sqlx::query(
r#"
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)?,
};
if !result.id.is_nil() {
Ok(result.id)
if !result.id.is_nil() && !result.date_created.is_none() {
Ok((result.id, result.date_created))
} else {
Err(sqlx::Error::RowNotFound)
}