mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-16 01:14:02 +00:00
1d38aad9d3
* a lot * merge * Fix stuff broken by merge * Get rid of repetitive `&mut *context.conn().await?` * Add blank lines under each line with `conn =` * Fix style mistakes (partial) * Revert "Fix style mistakes (partial)" This reverts commit48a033b87f
. * Revert "Add blank lines under each line with `conn =`" This reverts commit773a6d3beb
. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commitd2c6263ea1
. * Use DbConn for CaptchaAnswer methods * DbConn trait * Remove more `&mut *` * Fix stuff * Re-run CI * try to make ci start * fix * fix * Fix api_common::utils * Fix apub::activities::block * Fix apub::api::resolve_object * Fix some things * Revert "Fix some things" This reverts commit2bf8574bc8
. * Revert "Fix apub::api::resolve_object" This reverts commit3e4059aabb
. * Revert "Fix apub::activities::block" This reverts commit3b02389abd
. * Revert "Fix api_common::utils" This reverts commit7dc73de613
. * Revert "Revert "Fix api_common::utils"" This reverts commitf740f115e5
. * Revert "Revert "Fix apub::activities::block"" This reverts commit2ee206af7c
. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit96ed8bf2e9
. * Fix fetch_local_site_data * Fix get_comment_parent_creator * Remove unused perma deleted text * Fix routes::feeds * Fix lib.rs * Update lib.rs * rerun ci * Attempt to create custom GetConn and RunQueryDsl traits * Start over * Add GetConn trait * aaaa * Revert "aaaa" This reverts commitacc9ca1aed
. * Revert "Revert "aaaa"" This reverts commit443a2a00a5
. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commitab4e94aea5
. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commite4d1712646
. * DbConn and DbPool enums (db_schema only fails to compile for tests) * fmt * Make functions take `&mut DbPool<'_>` and make db_schema tests compile * Add try_join_with_pool macro and run fix-clippy on more crates * Fix some errors * I did it * Remove function variants that take connection * rerun ci * rerun ci * rerun ci
123 lines
2.7 KiB
Rust
123 lines
2.7 KiB
Rust
use crate::{
|
|
schema::captcha_answer::dsl::{answer, captcha_answer, uuid},
|
|
source::captcha_answer::{CaptchaAnswer, CaptchaAnswerForm, CheckCaptchaAnswer},
|
|
utils::{functions::lower, get_conn, DbPool},
|
|
};
|
|
use diesel::{
|
|
delete,
|
|
dsl::exists,
|
|
insert_into,
|
|
result::Error,
|
|
select,
|
|
ExpressionMethods,
|
|
QueryDsl,
|
|
};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
impl CaptchaAnswer {
|
|
pub async fn insert(pool: &mut DbPool<'_>, captcha: &CaptchaAnswerForm) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
|
|
insert_into(captcha_answer)
|
|
.values(captcha)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn check_captcha(
|
|
pool: &mut DbPool<'_>,
|
|
to_check: CheckCaptchaAnswer,
|
|
) -> Result<bool, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
|
|
// fetch requested captcha
|
|
let captcha_exists = select(exists(
|
|
captcha_answer
|
|
.filter((uuid).eq(to_check.uuid))
|
|
.filter(lower(answer).eq(to_check.answer.to_lowercase().clone())),
|
|
))
|
|
.get_result::<bool>(conn)
|
|
.await?;
|
|
|
|
// delete checked captcha
|
|
delete(captcha_answer.filter(uuid.eq(to_check.uuid)))
|
|
.execute(conn)
|
|
.await?;
|
|
|
|
Ok(captcha_exists)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{
|
|
source::captcha_answer::{CaptchaAnswer, CaptchaAnswerForm, CheckCaptchaAnswer},
|
|
utils::build_db_pool_for_tests,
|
|
};
|
|
use serial_test::serial;
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_captcha_happy_path() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
let pool = &mut pool.into();
|
|
|
|
let inserted = CaptchaAnswer::insert(
|
|
pool,
|
|
&CaptchaAnswerForm {
|
|
answer: "XYZ".to_string(),
|
|
},
|
|
)
|
|
.await
|
|
.expect("should not fail to insert captcha");
|
|
|
|
let result = CaptchaAnswer::check_captcha(
|
|
pool,
|
|
CheckCaptchaAnswer {
|
|
uuid: inserted.uuid,
|
|
answer: "xyz".to_string(),
|
|
},
|
|
)
|
|
.await;
|
|
|
|
assert!(result.is_ok());
|
|
assert!(result.unwrap());
|
|
}
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_captcha_repeat_answer_fails() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
let pool = &mut pool.into();
|
|
|
|
let inserted = CaptchaAnswer::insert(
|
|
pool,
|
|
&CaptchaAnswerForm {
|
|
answer: "XYZ".to_string(),
|
|
},
|
|
)
|
|
.await
|
|
.expect("should not fail to insert captcha");
|
|
|
|
let _result = CaptchaAnswer::check_captcha(
|
|
pool,
|
|
CheckCaptchaAnswer {
|
|
uuid: inserted.uuid,
|
|
answer: "xyz".to_string(),
|
|
},
|
|
)
|
|
.await;
|
|
|
|
let result_repeat = CaptchaAnswer::check_captcha(
|
|
pool,
|
|
CheckCaptchaAnswer {
|
|
uuid: inserted.uuid,
|
|
answer: "xyz".to_string(),
|
|
},
|
|
)
|
|
.await;
|
|
|
|
assert!(result_repeat.is_ok());
|
|
assert!(!result_repeat.unwrap());
|
|
}
|
|
}
|