Skip to content

Commit

Permalink
feat(users): Convert emails to lowercase from requests (#6601)
Browse files Browse the repository at this point in the history
  • Loading branch information
ThisIsMani authored Nov 20, 2024
1 parent 75ec96b commit c04f81e
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions crates/router/src/types/domain/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ impl UserEmail {
pub fn new(email: Secret<String, pii::EmailStrategy>) -> UserResult<Self> {
use validator::ValidateEmail;

let email_string = email.expose();
let email_string = email.expose().to_lowercase();
let email =
pii::Email::from_str(&email_string).change_context(UserErrors::EmailParsingError)?;

Expand All @@ -123,21 +123,8 @@ impl UserEmail {
}

pub fn from_pii_email(email: pii::Email) -> UserResult<Self> {
use validator::ValidateEmail;

let email_string = email.peek();
if email_string.validate_email() {
let (_username, domain) = match email_string.split_once('@') {
Some((u, d)) => (u, d),
None => return Err(UserErrors::EmailParsingError.into()),
};
if BLOCKED_EMAIL.contains(domain) {
return Err(UserErrors::InvalidEmailError.into());
}
Ok(Self(email))
} else {
Err(UserErrors::EmailParsingError.into())
}
let email_string = email.expose().map(|inner| inner.to_lowercase());
Self::new(email_string)
}

pub fn into_inner(self) -> pii::Email {
Expand Down

0 comments on commit c04f81e

Please sign in to comment.