mirror of
https://github.com/LemmyNet/lemmy.git
synced 2025-01-19 04:46:19 +00:00
ad90cd77f9
* add private visibility * filter private communities in post_view.rs * also filter in comment_view * community follower state * remove unused method * sql fmt * add CommunityFollower.approved_by * implement api endpoints * api changes * only admins can create private community for now * add local api tests * fix api tests * follow remote private community * use authorized fetch for content in private community * federate community visibility * dont mark content in private community as public * expose ApprovalRequired in api * also check content fetchable for outbox/featured * address private community content to followers * implement reject activity * fix tests * add files * remove local api tests * dont use delay * is_new_instance * single query for is_new_instance * return subscribed type for pending follow * working * need to catch errors in waitUntil * clippy * fix query * lint for unused async * diesel.toml comment * add comment * avoid db reads * rename approved_by to approver_id * add helper * form init * list pending follows should return items for all communities * clippy * ci * fix down migration * fix api tests * references * rename * run git diff * ci * fix schema check * fix joins * ci * ci * skip_serializing_none * fix test --------- Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
109 lines
3.2 KiB
Rust
109 lines
3.2 KiB
Rust
use crate::{
|
|
newtypes::LocalUserId,
|
|
schema::password_reset_request::dsl::{password_reset_request, published, token},
|
|
source::password_reset_request::{PasswordResetRequest, PasswordResetRequestForm},
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{
|
|
delete,
|
|
dsl::{insert_into, now, IntervalDsl},
|
|
result::Error,
|
|
sql_types::Timestamptz,
|
|
ExpressionMethods,
|
|
IntoSql,
|
|
};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
impl PasswordResetRequest {
|
|
pub async fn create(
|
|
pool: &mut DbPool<'_>,
|
|
from_local_user_id: LocalUserId,
|
|
token_: String,
|
|
) -> Result<PasswordResetRequest, Error> {
|
|
let form = PasswordResetRequestForm {
|
|
local_user_id: from_local_user_id,
|
|
token: token_.into(),
|
|
};
|
|
let conn = &mut get_conn(pool).await?;
|
|
insert_into(password_reset_request)
|
|
.values(form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn read_and_delete(pool: &mut DbPool<'_>, token_: &str) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
delete(password_reset_request)
|
|
.filter(token.eq(token_))
|
|
.filter(published.gt(now.into_sql::<Timestamptz>() - 1.days()))
|
|
.get_result(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
|
|
use crate::{
|
|
source::{
|
|
instance::Instance,
|
|
local_user::{LocalUser, LocalUserInsertForm},
|
|
password_reset_request::PasswordResetRequest,
|
|
person::{Person, PersonInsertForm},
|
|
},
|
|
traits::Crud,
|
|
utils::build_db_pool_for_tests,
|
|
};
|
|
use lemmy_utils::error::LemmyResult;
|
|
use pretty_assertions::assert_eq;
|
|
use serial_test::serial;
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_password_reset() -> LemmyResult<()> {
|
|
let pool = &build_db_pool_for_tests();
|
|
let pool = &mut pool.into();
|
|
|
|
// Setup
|
|
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()).await?;
|
|
let new_person = PersonInsertForm::test_form(inserted_instance.id, "thommy prw");
|
|
let inserted_person = Person::create(pool, &new_person).await?;
|
|
let new_local_user = LocalUserInsertForm::test_form(inserted_person.id);
|
|
let inserted_local_user = LocalUser::create(pool, &new_local_user, vec![]).await?;
|
|
|
|
// Create password reset token
|
|
let token = "nope";
|
|
let inserted_password_reset_request =
|
|
PasswordResetRequest::create(pool, inserted_local_user.id, token.to_string()).await?;
|
|
|
|
// Read it and verify
|
|
let read_password_reset_request = PasswordResetRequest::read_and_delete(pool, token).await?;
|
|
assert_eq!(
|
|
inserted_password_reset_request.id,
|
|
read_password_reset_request.id
|
|
);
|
|
assert_eq!(
|
|
inserted_password_reset_request.local_user_id,
|
|
read_password_reset_request.local_user_id
|
|
);
|
|
assert_eq!(
|
|
inserted_password_reset_request.token,
|
|
read_password_reset_request.token
|
|
);
|
|
assert_eq!(
|
|
inserted_password_reset_request.published,
|
|
read_password_reset_request.published
|
|
);
|
|
|
|
// Cannot reuse same token again
|
|
let read_password_reset_request = PasswordResetRequest::read_and_delete(pool, token).await;
|
|
assert!(read_password_reset_request.is_err());
|
|
|
|
// Cleanup
|
|
let num_deleted = Person::delete(pool, inserted_person.id).await?;
|
|
Instance::delete(pool, inserted_instance.id).await?;
|
|
assert_eq!(1, num_deleted);
|
|
Ok(())
|
|
}
|
|
}
|