Fixed the docker issue
Rust Build / Check (pull_request) Successful in 35s
Rust Build / Test Suite (pull_request) Successful in 53s
Rust Build / Rustfmt (pull_request) Successful in 29s
Rust Build / Clippy (pull_request) Successful in 30s
Rust Build / build (pull_request) Successful in 41s
Rust Build / Check (pull_request) Successful in 35s
Rust Build / Test Suite (pull_request) Successful in 53s
Rust Build / Rustfmt (pull_request) Successful in 29s
Rust Build / Clippy (pull_request) Successful in 30s
Rust Build / build (pull_request) Successful in 41s
This commit is contained in:
@@ -82,9 +82,11 @@ pub async fn register_user(
|
|||||||
None => String::new()
|
None => String::new()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
println!("Checking if user exists");
|
||||||
match repo::user::exists(&pool, &user.username).await {
|
match repo::user::exists(&pool, &user.username).await {
|
||||||
Ok(res) => {
|
Ok(res) => {
|
||||||
if res {
|
if res {
|
||||||
|
println!("Already exists");
|
||||||
(
|
(
|
||||||
StatusCode::BAD_REQUEST,
|
StatusCode::BAD_REQUEST,
|
||||||
Json(response::Response {
|
Json(response::Response {
|
||||||
@@ -93,16 +95,20 @@ pub async fn register_user(
|
|||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
|
println!("Good to create");
|
||||||
|
println!("Generate salt string");
|
||||||
let salt_string = hashing::generate_salt().unwrap();
|
let salt_string = hashing::generate_salt().unwrap();
|
||||||
let mut salt = textsender_models::user::Salt::default();
|
let mut salt = textsender_models::user::Salt::default();
|
||||||
let generated_salt = salt_string;
|
let generated_salt = salt_string;
|
||||||
salt.salt = generated_salt.to_string();
|
salt.salt = generated_salt.to_string();
|
||||||
|
println!("Creating salt");
|
||||||
salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
|
salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
|
||||||
user.salt_id = salt.id;
|
user.salt_id = salt.id;
|
||||||
let hashed_password =
|
let hashed_password =
|
||||||
hashing::hash_password(&user.password, &generated_salt).unwrap();
|
hashing::hash_password(&user.password, &generated_salt).unwrap();
|
||||||
user.password = hashed_password;
|
user.password = hashed_password;
|
||||||
|
|
||||||
|
println!("Creating user");
|
||||||
match repo::user::insert(&pool, &user).await {
|
match repo::user::insert(&pool, &user).await {
|
||||||
Ok((id, date_created)) => {
|
Ok((id, date_created)) => {
|
||||||
user.id = id;
|
user.id = id;
|
||||||
|
|||||||
+2
-2
@@ -134,7 +134,7 @@ pub mod user {
|
|||||||
let result = InsertedData {
|
let result = InsertedData {
|
||||||
id: row.try_get("id").map_err(|_e| sqlx::Error::RowNotFound)?,
|
id: row.try_get("id").map_err(|_e| sqlx::Error::RowNotFound)?,
|
||||||
date_created: row
|
date_created: row
|
||||||
.try_get("date_created")
|
.try_get("created")
|
||||||
.map_err(|_e| sqlx::Error::RowNotFound)?,
|
.map_err(|_e| sqlx::Error::RowNotFound)?,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -160,7 +160,7 @@ pub mod salt {
|
|||||||
) -> Result<textsender_models::user::Salt, sqlx::Error> {
|
) -> Result<textsender_models::user::Salt, sqlx::Error> {
|
||||||
let result = sqlx::query(
|
let result = sqlx::query(
|
||||||
r#"
|
r#"
|
||||||
SELECT * FROM "salt" WHERE id = $1
|
SELECT id, salt FROM "salt" WHERE id = $1
|
||||||
"#,
|
"#,
|
||||||
)
|
)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
|
|||||||
Reference in New Issue
Block a user