Skip to content

fix: set a fallback redirectUri for external provider #5165

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 6 commits into from
May 14, 2026
+6 −4
Merged

fix: set a fallback redirectUri for external provider #5165

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
977f310
fix: set a fallback redirectUri for external provider
singh-inder May 4, 2026
09a2ad9
update test
singh-inder May 5, 2026
14ca3f7
Merge branch 'develop' into patch-2
jgoux May 7, 2026
68a7ccf
Merge branch 'develop' into patch-2
avallete May 11, 2026
b6b0cac
Merge branch 'develop' into patch-2
jgoux May 13, 2026
8db6bb2
Merge branch 'develop' into patch-2
avallete May 14, 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
8 changes: 5 additions & 3 deletions apps/cli-go/internal/start/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1355,17 +1355,19 @@ func buildGotrueEnv(dbConfig pgconn.Config) []string {

func appendGotrueExternalProviderEnv(env []string) []string {
for name, config := range utils.Config.Auth.External {
redirectUri := config.RedirectUri
if redirectUri == "" {
redirectUri = utils.Config.Auth.JwtIssuer + "/callback"
}
env = append(
env,
fmt.Sprintf("GOTRUE_EXTERNAL_%s_ENABLED=%v", strings.ToUpper(name), config.Enabled),
fmt.Sprintf("GOTRUE_EXTERNAL_%s_CLIENT_ID=%s", strings.ToUpper(name), config.ClientId),
fmt.Sprintf("GOTRUE_EXTERNAL_%s_SECRET=%s", strings.ToUpper(name), config.Secret.Value),
fmt.Sprintf("GOTRUE_EXTERNAL_%s_SKIP_NONCE_CHECK=%t", strings.ToUpper(name), config.SkipNonceCheck),
fmt.Sprintf("GOTRUE_EXTERNAL_%s_EMAIL_OPTIONAL=%t", strings.ToUpper(name), config.EmailOptional),
fmt.Sprintf("GOTRUE_EXTERNAL_%s_REDIRECT_URI=%s", strings.ToUpper(name), redirectUri),
)
if config.RedirectUri != "" {
env = append(env, fmt.Sprintf("GOTRUE_EXTERNAL_%s_REDIRECT_URI=%s", strings.ToUpper(name), config.RedirectUri))
}
if config.Url != "" {
env = append(env, fmt.Sprintf("GOTRUE_EXTERNAL_%s_URL=%s", strings.ToUpper(name), config.Url))
}
Expand Down
2 changes: 1 addition & 1 deletion apps/cli-go/internal/start/start_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ func TestBuildGotrueEnv(t *testing.T) {
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")
assert.Equal(t, "http://127.0.0.1:54321/auth/v1/callback", env["GOTRUE_EXTERNAL_GITHUB_REDIRECT_URI"])
})

t.Run("preserves explicit provider redirect override", func(t *testing.T) {
Expand Down
Loading