Skip to content

fix: mailer links regression #5166

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
jgoux merged 2 commits into from
May 5, 2026
+11 −9
Merged

fix: mailer links regression #5166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9da7fac
fix
7ttp May 4, 2026
f6c1529
test
7ttp May 5, 2026
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
9 changes: 5 additions & 4 deletions internal/start/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,6 +1283,7 @@ func buildGotrueEnv(dbConfig pgconn.Config) []string {
if len(utils.Config.Auth.Sms.TestOTP) > 0 {
formatMapForEnvConfig(utils.Config.Auth.Sms.TestOTP, &testOTP)
}
mailerVerifyURL := strings.TrimRight(utils.Config.AuthExternalURL(), "/") + "/verify"

return []string{
"API_EXTERNAL_URL=" + utils.Config.AuthExternalURL(),
Expand Down Expand Up @@ -1315,10 +1316,10 @@ func buildGotrueEnv(dbConfig pgconn.Config) []string {

fmt.Sprintf("GOTRUE_SMTP_MAX_FREQUENCY=%v", utils.Config.Auth.Email.MaxFrequency),

"GOTRUE_MAILER_URLPATHS_INVITE=/verify",
"GOTRUE_MAILER_URLPATHS_CONFIRMATION=/verify",
"GOTRUE_MAILER_URLPATHS_RECOVERY=/verify",
"GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE=/verify",
"GOTRUE_MAILER_URLPATHS_INVITE=" + mailerVerifyURL,
"GOTRUE_MAILER_URLPATHS_CONFIRMATION=" + mailerVerifyURL,
"GOTRUE_MAILER_URLPATHS_RECOVERY=" + mailerVerifyURL,
"GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE=" + mailerVerifyURL,
"GOTRUE_RATE_LIMIT_EMAIL_SENT=360000",

fmt.Sprintf("GOTRUE_EXTERNAL_PHONE_ENABLED=%v", utils.Config.Auth.Sms.EnableSignup),
Expand Down
11 changes: 6 additions & 5 deletions internal/start/start_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ func TestBuildGotrueEnv(t *testing.T) {
utils.Config = original
})

t.Run("uses auth scoped external url and relative mailer paths", func(t *testing.T) {
t.Run("uses auth scoped external url and absolute mailer verify urls", func(t *testing.T) {
utils.Config = config.NewConfig()
utils.Config.Api.ExternalUrl = "http://127.0.0.1:54321"
utils.Config.Auth.ExternalUrl = "http://127.0.0.1:54321/auth/v1"
Expand All @@ -328,10 +328,10 @@ func TestBuildGotrueEnv(t *testing.T) {

assert.Equal(t, "http://127.0.0.1:54321/auth/v1", env["API_EXTERNAL_URL"])
assert.Equal(t, "http://127.0.0.1:54321/auth/v1", env["GOTRUE_JWT_ISSUER"])
assert.Equal(t, "/verify", env["GOTRUE_MAILER_URLPATHS_INVITE"])
assert.Equal(t, "/verify", env["GOTRUE_MAILER_URLPATHS_CONFIRMATION"])
assert.Equal(t, "/verify", env["GOTRUE_MAILER_URLPATHS_RECOVERY"])
assert.Equal(t, "/verify", env["GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE"])
assert.Equal(t, "http://127.0.0.1:54321/auth/v1/verify", env["GOTRUE_MAILER_URLPATHS_INVITE"])
assert.Equal(t, "http://127.0.0.1:54321/auth/v1/verify", env["GOTRUE_MAILER_URLPATHS_CONFIRMATION"])
assert.Equal(t, "http://127.0.0.1:54321/auth/v1/verify", env["GOTRUE_MAILER_URLPATHS_RECOVERY"])
assert.Equal(t, "http://127.0.0.1:54321/auth/v1/verify", env["GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE"])
assert.NotContains(t, env, "GOTRUE_EXTERNAL_GITHUB_REDIRECT_URI")
})

Expand All @@ -350,6 +350,7 @@ func TestBuildGotrueEnv(t *testing.T) {

assert.Equal(t, "http://127.0.0.1:54321/auth/v1", env["API_EXTERNAL_URL"])
assert.Equal(t, "https://issuer.example.com/auth/v1", env["GOTRUE_JWT_ISSUER"])
assert.Equal(t, "http://127.0.0.1:54321/auth/v1/verify", env["GOTRUE_MAILER_URLPATHS_INVITE"])
assert.Equal(t, "https://example.com/custom/callback", env["GOTRUE_EXTERNAL_AZURE_REDIRECT_URI"])
})
}
Expand Down
Loading