mirrors/mCaptcha
1
0
Fork 0
mirror of https://github.com/mCaptcha/mCaptcha.git synced 2025-05-01 04:41:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: return username to store in sessions when getting password

Browse source
This commit is contained in:
realaravinth 2022-05-11 18:53:18 +05:30
parent d9b36179d1
commit 5bcf7beddc
No known key found for this signature in database
GPG key ID: AD9F0F08E855ED88
3 changed files with 36 additions and 18 deletions
db/db-sqlx-postgres/src
lib.rs

14
db/db-sqlx-postgres/src/lib.rs
View file

@ -189,15 +189,16 @@ impl MCDatabase for Database {
}
/// get a user's password
async fn get_password(&self, l: &Login) -> DBResult<String> {
async fn get_password(&self, l: &Login) -> DBResult<NameHash> {
struct Password {
name: String,
password: String,
}
let rec = match l {
Login::Username(u) => sqlx::query_as!(
Password,
r#"SELECT password FROM mcaptcha_users WHERE name = ($1)"#,
r#"SELECT name, password FROM mcaptcha_users WHERE name = ($1)"#,
u,
)
.fetch_one(&self.pool)
@ -206,7 +207,7 @@ impl MCDatabase for Database {
Login::Email(e) => sqlx::query_as!(
Password,
r#"SELECT password FROM mcaptcha_users WHERE email = ($1)"#,
r#"SELECT name, password FROM mcaptcha_users WHERE email = ($1)"#,
e,
)
.fetch_one(&self.pool)
@ -214,7 +215,12 @@ impl MCDatabase for Database {
.map_err(map_register_err)?,
};
Ok(rec.password)
let res = NameHash {
hash: rec.password,
username: rec.name,
};
Ok(res)
}
}