Skip to content

fix(auth): honor X-Forwarded-Proto for reset/invite links and email o… #42

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

Merged
thebigjoe1 merged 1 commit into from
Aug 24, 2026
Merged

fix(auth): honor X-Forwarded-Proto for reset/invite links and email o… #42

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion server/routes/app-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ router.post('/test-email', requireAuth, requireAdmin, wrap(async (req, res) => {
const to = (typeof body.to === 'string' && body.to.trim()) || req.user?.email || undefined;
// Origin lets the email template load the app logo. Recipient name
// personalizes the greeting.
const origin = `${req.protocol}://${req.get('host')}`;
const proto = (req.headers['x-forwarded-proto'] || req.protocol || 'http').split(',')[0].trim();
const origin = `${proto}://${req.headers['x-forwarded-host'] || req.get('host')}`;
const recipientName = req.user?.full_name || req.user?.nickname || req.user?.username || null;
try {
const result = await testSmtp({ overrides, to, origin, recipientName });
Expand Down
6 changes: 4 additions & 2 deletions server/routes/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,8 @@ router.post('/forgot-password', rateLimitLogin, wrap(async (req, res) => {
const expires = new Date(Date.now() + 60 * 60 * 1000).toISOString(); // 1 hour
db.prepare('INSERT INTO password_reset_tokens (token, user_id, expires_at) VALUES (?, ?, ?)').run(token, user.id, expires);

const baseUrl = `${req.protocol}://${req.get('host')}`;
const proto = (req.headers['x-forwarded-proto'] || req.protocol || 'http').split(',')[0].trim();
const baseUrl = `${proto}://${req.headers['x-forwarded-host'] || req.get('host')}`;
try {
await sendPasswordReset(user.email, `${baseUrl}/#/reset-password?token=${token}`);
} catch (e) {
Expand Down Expand Up @@ -444,7 +445,8 @@ router.post('/invite', requireAuth, requireAdmin, wrap(async (req, res) => {
db.prepare('INSERT INTO invite_tokens (token, email, role, created_by, expires_at) VALUES (?, ?, ?, ?, ?)')
.run(token, email ? email.trim().toLowerCase() : null, role, req.user.id, expires);

const baseUrl = `${req.protocol}://${req.get('host')}`;
const proto = (req.headers['x-forwarded-proto'] || req.protocol || 'http').split(',')[0].trim();
const baseUrl = `${proto}://${req.headers['x-forwarded-host'] || req.get('host')}`;
const inviteUrl = `${baseUrl}/#/accept-invite?token=${token}`;

if (email && isEmailConfigured()) {
Expand Down
Loading