mirror/mCaptcha
1
0
Fork 1
mirror of https://github.com/mCaptcha/mCaptcha.git synced 2026-02-11 10:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: migrate adding captcha to use db_* interface

Browse Source
This commit is contained in:
realaravinth
2022-05-12 19:10:04 +05:30
parent 79ff7b9917
commit bd75fc625c
5 changed files with 10 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/api/v1/mcaptcha/create.rs
View File

@@ -58,11 +58,8 @@ pub async fn create(
}
pub mod runner {
use futures::future::try_join_all;
use libmcaptcha::DefenseBuilder;
use log::debug;
use super::*;
use libmcaptcha::DefenseBuilder;
pub async fn create(
payload: &CreateCaptcha,
@@ -76,12 +73,7 @@ pub mod runner {
defense.build()?;
debug!("creating config");
// let mcaptcha_config =
// // add_mcaptcha_util(payload.duration, &payload.description, &data, username).await?;
let mut key;
let duration = payload.duration as i32;
loop {
key = get_random(32);
@@ -97,31 +89,9 @@ pub mod runner {
Err(e) => return Err(e.into()),
}
}
let mut futs = Vec::with_capacity(payload.levels.len());
for level in payload.levels.iter() {
let difficulty_factor = level.difficulty_factor as i32;
let visitor_threshold = level.visitor_threshold as i32;
let fut = sqlx::query!(
"INSERT INTO mcaptcha_levels (
difficulty_factor,
visitor_threshold,
config_id) VALUES (
$1, $2, (
SELECT config_id FROM mcaptcha_config WHERE
key = ($3) AND user_id = (
SELECT ID FROM mcaptcha_users WHERE name = $4
)));",
difficulty_factor,
visitor_threshold,
&key,
&username,
)
.execute(&data.db);
futs.push(fut);
}
try_join_all(futs).await?;
data.dblib
.add_captcha_levels(&username, &key, &payload.levels)
.await?;
let mcaptcha_config = MCaptchaDetails {
name: payload.description.clone(),
key,

28
src/api/v1/mcaptcha/update.rs
View File

@@ -155,33 +155,13 @@ pub mod runner {
&username,
&payload.key,
)
.execute(&data.db); //.await?;
.execute(&data.db);
futs.push(update_fut);
for level in payload.levels.iter() {
let difficulty_factor = level.difficulty_factor as i32;
let visitor_threshold = level.visitor_threshold as i32;
let fut = sqlx::query!(
"INSERT INTO mcaptcha_levels (
difficulty_factor,
visitor_threshold,
config_id) VALUES (
$1, $2, (
SELECT config_id FROM mcaptcha_config WHERE key = ($3) AND
user_id = (
SELECT ID from mcaptcha_users WHERE name = $4
)
));",
difficulty_factor,
visitor_threshold,
&payload.key,
&username,
)
.execute(&data.db); //.await?;
futs.push(fut);
}
data.dblib
.add_captcha_levels(&username, &payload.key, &payload.levels)
.await?;
try_join_all(futs).await?;
if let Err(ServiceError::CaptchaError(e)) = data
.captcha