Compare commits
1 Commits
v0.6.1-mai
...
v0.6.2-mai
Author | SHA1 | Date | |
---|---|---|---|
6ec3b25e7d |
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -748,7 +748,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "icarus_auth"
|
||||
version = "0.6.1"
|
||||
version = "0.6.2"
|
||||
dependencies = [
|
||||
"argon2",
|
||||
"axum",
|
||||
|
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "icarus_auth"
|
||||
version = "0.6.1"
|
||||
version = "0.6.2"
|
||||
edition = "2024"
|
||||
rust-version = "1.90"
|
||||
|
||||
|
@@ -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 {
|
||||
|
@@ -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,10 +124,10 @@ pub mod user {
|
||||
.map_err(|_e| sqlx::Error::RowNotFound)?,
|
||||
};
|
||||
|
||||
if !result.id.is_nil() {
|
||||
Ok(result.id)
|
||||
} else {
|
||||
if result.id.is_nil() && result.date_created.is_none() {
|
||||
Err(sqlx::Error::RowNotFound)
|
||||
} else {
|
||||
Ok((result.id, result.date_created))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user