aboutsummaryrefslogtreecommitdiff
path: root/planetwars-server/src/db/users.rs
diff options
context:
space:
mode:
authorIlion Beyst <ilion.beyst@gmail.com>2022-03-13 15:20:03 +0100
committerIlion Beyst <ilion.beyst@gmail.com>2022-03-13 15:20:03 +0100
commitfd52e266c6e25999a49c36f17342977b759a2612 (patch)
tree9c727cac949c9698343d003ee87cfe73c6c6204a /planetwars-server/src/db/users.rs
parentf7655005ff099e8314ecd31e95b26ad74d4efd02 (diff)
downloadplanetwars.dev-fd52e266c6e25999a49c36f17342977b759a2612.tar.xz
planetwars.dev-fd52e266c6e25999a49c36f17342977b759a2612.zip
apply clippy suggestions
Diffstat (limited to 'planetwars-server/src/db/users.rs')
-rw-r--r--planetwars-server/src/db/users.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/planetwars-server/src/db/users.rs b/planetwars-server/src/db/users.rs
index a97ade5..3c071de 100644
--- a/planetwars-server/src/db/users.rs
+++ b/planetwars-server/src/db/users.rs
@@ -48,7 +48,7 @@ pub fn create_user(credentials: &Credentials, conn: &PgConnection) -> QueryResul
let salt: [u8; 32] = rand::thread_rng().gen();
let hash = argon2::hash_raw(credentials.password.as_bytes(), &salt, &argon_config).unwrap();
let new_user = NewUser {
- username: &credentials.username,
+ username: credentials.username,
password_salt: &salt,
password_hash: &hash,
};
@@ -73,9 +73,9 @@ pub fn authenticate_user(credentials: &Credentials, db_conn: &PgConnection) -> O
.unwrap();
if password_matches {
- return Some(user);
+ Some(user)
} else {
- return None;
+ None
}
})
}
@@ -91,15 +91,15 @@ fn test_argon() {
let salt: [u8; 32] = rand::thread_rng().gen();
let hash = argon2::hash_raw(credentials.password.as_bytes(), &salt, &argon_config).unwrap();
let new_user = NewUser {
- username: &credentials.username,
+ username: credentials.username,
password_hash: &hash,
password_salt: &salt,
};
let password_matches = argon2::verify_raw(
credentials.password.as_bytes(),
- &new_user.password_salt,
- &new_user.password_hash,
+ new_user.password_salt,
+ new_user.password_hash,
&argon2_config(),
)
.unwrap();