Skip to content

refactor(api): centralize password reset URL builder #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sergey3bv wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(api): centralize password reset URL builder #191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions api/src/email_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@ pub trait EmailSender: Send + Sync {
}
}

fn build_reset_url(base_url: &str, reset_token: &str, email: &str) -> String {
format!(
"{}/reset-password?token={}&email={}",
base_url,
urlencoding::encode(reset_token),
urlencoding::encode(email),
)
}

/// Development email sender - logs URLs to console and captures emails for testing
pub struct DevEmailSender {
base_url: String,
Expand Down Expand Up @@ -129,12 +138,7 @@ impl EmailSender for DevEmailSender {
to_email: &str,
reset_token: &str,
) -> Result<(), String> {
let reset_url = format!(
"{}/reset-password?token={}&email={}",
self.base_url,
reset_token,
urlencoding::encode(to_email),
);
let reset_url = build_reset_url(&self.base_url, reset_token, to_email);

tracing::info!("");
tracing::info!("==================================================");
Expand Down Expand Up @@ -410,12 +414,7 @@ impl EmailSender for SendGridEmailSender {
to_email: &str,
reset_token: &str,
) -> Result<(), String> {
let reset_url = format!(
"{}/reset-password?token={}&email={}",
self.base_url,
reset_token,
urlencoding::encode(to_email),
);
let reset_url = build_reset_url(&self.base_url, reset_token, to_email);

let subject = format!("Reset your {} password", BRAND_NAME);
let html_content = format!(
Expand Down Expand Up @@ -696,4 +695,18 @@ mod tests {
"Empty DISABLE_EMAILS should not bypass production check"
);
}

#[test]
fn test_build_reset_url_encodes_email_and_token_with_contract_shape() {
let base_url = "https://login.divine.video";
let token = "abc+123/==";
let email = "test+alias@example.com";

let url = build_reset_url(base_url, token, email);

assert_eq!(
url,
"https://login.divine.video/reset-password?token=abc%2B123%2F%3D%3D&email=test%2Balias%40example.com"
);
}
}
Loading