mirrors/mCaptcha
1
0
Fork 0
mirror of https://github.com/mCaptcha/mCaptcha.git synced 2025-02-17 08:59:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

feat: implement fetching password with either username or email

Browse source
This commit is contained in:
realaravinth 2022-05-11 18:30:01 +05:30
parent 7e2be86c12
commit d9b36179d1
No known key found for this signature in database
GPG key ID: AD9F0F08E855ED88
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -103,9 +103,8 @@ impl MCDatabase for Database {
/// register a new user
async fn register(&self, p: &Register) -> DBResult<()> {
let res;
if let Some(email) = &p.email {
res = sqlx::query!(
let res = if let Some(email) = &p.email {
sqlx::query!(
"insert into mcaptcha_users
(name , password, email, secret) values ($1, $2, $3, $4)",
&p.username,
@ -114,9 +113,9 @@ impl MCDatabase for Database {
&p.secret,
)
.execute(&self.pool)
.await;
.await
} else {
res = sqlx::query!(
sqlx::query!(
"INSERT INTO mcaptcha_users
(name , password, secret) VALUES ($1, $2, $3)",
&p.username,
@ -124,7 +123,7 @@ impl MCDatabase for Database {
&p.secret,
)
.execute(&self.pool)
.await;
.await
};
res.map_err(map_register_err)?;
Ok(())
@ -190,19 +189,30 @@ impl MCDatabase for Database {
}
/// get a user's password
async fn get_password(&self, username: &str) -> DBResult<String> {
async fn get_password(&self, l: &Login) -> DBResult<String> {
struct Password {
password: String,
}
let rec = sqlx::query_as!(
Password,
r#"SELECT password FROM mcaptcha_users WHERE name = ($1)"#,
username,
)
.fetch_one(&self.pool)
.await
.map_err(map_register_err)?;
let rec = match l {
Login::Username(u) => sqlx::query_as!(
Password,
r#"SELECT password FROM mcaptcha_users WHERE name = ($1)"#,
u,
)
.fetch_one(&self.pool)
.await
.map_err(map_register_err)?,
Login::Email(e) => sqlx::query_as!(
Password,
r#"SELECT password FROM mcaptcha_users WHERE email = ($1)"#,
e,
)
.fetch_one(&self.pool)
.await
.map_err(map_register_err)?,
};
Ok(rec.password)
}