aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cargo fmt on all that

Browse Source
This commit is contained in:
Marius Monnier 2022-07-04 23:26:42 +02:00
parent aa792a0862
commit 8828a9bd86
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plume-models/src/email_signups.rs
View File

@ -131,7 +131,8 @@ impl EmailSignup {
} }
fn delete_existings_by_email(conn: &DbConn, email: &str) -> Result<usize> { fn delete_existings_by_email(conn: &DbConn, email: &str) -> Result<usize> {
let existing_signups = email_signups::table.filter(email_signups::email.to_lowercase().eq(email.to_lowercase())); let existing_signups = email_signups::table
.filter(email_signups::email.to_lowercase().eq(email.to_lowercase()));
diesel::delete(existing_signups) diesel::delete(existing_signups)
.execute(&**conn) .execute(&**conn)
.map_err(Error::from) .map_err(Error::from)

7
plume-models/src/password_reset_requests.rs
View File

@ -23,8 +23,11 @@ const TOKEN_VALIDITY_HOURS: i64 = 2;
impl PasswordResetRequest { impl PasswordResetRequest {
pub fn insert(conn: &Connection, email: &str) -> Result<String> { pub fn insert(conn: &Connection, email: &str) -> Result<String> {
// first, delete other password reset tokens associated with this email: // first, delete other password reset tokens associated with this email:
let existing_requests = let existing_requests = password_reset_requests::table.filter(
password_reset_requests::table.filter(password_reset_requests::email.to_lowercase().eq(email.to_lowercase())); password_reset_requests::email
.to_lowercase()
.eq(email.to_lowercase()),
);
diesel::delete(existing_requests).execute(conn)?; diesel::delete(existing_requests).execute(conn)?;
// now, generate a random token, set the expiry date, // now, generate a random token, set the expiry date,

10
plume-models/src/users.rs
View File

@ -61,7 +61,7 @@ pub struct User {
pub outbox_url: String, pub outbox_url: String,
pub inbox_url: String, pub inbox_url: String,
pub summary: String, pub summary: String,
pub email : Option<String>, pub email: Option<String>,
pub hashed_password: Option<String>, pub hashed_password: Option<String>,
pub instance_id: i32, pub instance_id: i32,
pub creation_date: NaiveDateTime, pub creation_date: NaiveDateTime,
@ -204,9 +204,9 @@ impl User {
} }
/** /**
* TODO: Should create user record with normalized(lowercased) email * TODO: Should create user record with normalized(lowercased) email
DONE: Store email case-sensitive but always compare them after lowering DONE: Store email case-sensitive but always compare them after lowering
*/ */
pub fn email_used(conn: &DbConn, email: &str) -> Result<bool> { pub fn email_used(conn: &DbConn, email: &str) -> Result<bool> {
use diesel::dsl::{exists, select}; use diesel::dsl::{exists, select};
@ -214,7 +214,7 @@ impl User {
select(exists( select(exists(
users::table users::table
.filter(users::instance_id.eq(Instance::get_local()?.id)) .filter(users::instance_id.eq(Instance::get_local()?.id))
.filter(users::email.to_lowercase().eq(lower_email)) .filter(users::email.to_lowercase().eq(lower_email)),
)) ))
.get_result(&**conn) .get_result(&**conn)
.map_err(Error::from) .map_err(Error::from)

6
src/routes/email_signups.rs
View File

@ -31,7 +31,11 @@ pub struct EmailSignupForm {
} }
fn emails_match(form: &EmailSignupForm) -> Result<(), ValidationError> { fn emails_match(form: &EmailSignupForm) -> Result<(), ValidationError> {
if form.email_confirmation.to_lowercase().eq(form.email.to_lowercase()) { if form
.email_confirmation
.to_lowercase()
.eq(form.email.to_lowercase())
{
Ok(()) Ok(())
} else { } else {
Err(ValidationError::new("emails_match")) Err(ValidationError::new("emails_match"))