feat(auth): add config opt to send port number in callback urls

scottmckendry · Aug 23, 2024 · 9ed14d9 · 9ed14d9
1 parent d0e4550
commit 9ed14d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/auth/auth.go b/auth/auth.go
@@ -95,10 +95,13 @@ func RequireAuth(handlerFunc http.HandlerFunc, auth *AuthService) http.HandlerFu
 }
 
 func buildCallbackURL(provider string) string {
+	hostUrl := fmt.Sprintf("%s", config.Envs.PublicHost)
+	if config.Envs.SendPortInCallback {
+		hostUrl = fmt.Sprintf("%s:%s", hostUrl, config.Envs.Port)
+	}
 	return fmt.Sprintf(
-		"%s:%s/auth/%s/callback",
-		config.Envs.PublicHost,
-		config.Envs.Port,
+		"%s/auth/%s/callback",
+		hostUrl,
 		provider,
 	)
 }
diff --git a/config/config.go b/config/config.go
@@ -15,6 +15,7 @@ const (
 type Config struct {
 	PublicHost              string
 	Port                    string
+	SendPortInCallback      bool
 	DatabaseURL             string
 	CookiesAuthSecret       string
 	CookiesAuthAgeInSeconds int
@@ -37,6 +38,7 @@ func initConfig() *Config {
 	return &Config{
 		PublicHost:              getEnv("PUBLIC_HOST", "http://localhost"),
 		Port:                    getEnv("PORT", "3000"),
+		SendPortInCallback:      getEnvAsBool("SEND_PORT_IN_CALLBACK", true),
 		DatabaseURL:             getEnv("DATABASE_URL", "file:mnemstart.db"),
 		CookiesAuthSecret:       getEnv("COOKIES_AUTH_SECRET", "youllneverguesswhatthisis"),
 		CookiesAuthAgeInSeconds: getEnvAsInt("COOKIES_AUTH_AGE_IN_SECONDS", thirtyDaysInSeconds),