feat: add forward auth url to env generation

Author: steveiliop56

internal/utils/constants.go

@@ -1,10 +1,11 @@
 package utils
 
 const (
-	DefaultNginxPort     = "80"
-	DefaultNginxPortSSL  = "443"
-	DefaultPostgresPort  = "5432"
-	DefaultDomain        = "example.com"
-	DefaultLocalDomain   = "tipi.local"
-	MinimumDockerVersion = 28
+	DefaultNginxPort      = "80"
+	DefaultNginxPortSSL   = "443"
+	DefaultPostgresPort   = "5432"
+	DefaultDomain         = "example.com"
+	DefaultLocalDomain    = "tipi.local"
+	MinimumDockerVersion  = 28
+	DefaultForwardAuthURL = "http://runtipi:3000/api/auth/traefik"
 )

internal/utils/env.go

@@ -149,25 +149,26 @@ func GenerateEnvFile(customEnvFile string) error {
 
 	// Create new environment map
 	newEnv := EnvMap{
-		"INTERNAL_IP":           settings.InternalIP,
-		"ARCHITECTURE":          runtime.GOARCH,
-		"TIPI_VERSION":          string(version),
-		"ROOT_FOLDER_HOST":      config.RootFolder,
-		"NGINX_PORT":            RawToString(settings.NginxPort),
-		"NGINX_PORT_SSL":        RawToString(settings.NginxSSLPort),
-		"RUNTIPI_APP_DATA_PATH": appDataPath,
-		"POSTGRES_HOST":         "runtipi-db",
-		"POSTGRES_PORT":         RawToString(settings.PostgresPort),
-		"POSTGRES_DBNAME":       "tipi",
-		"POSTGRES_USERNAME":     "tipi",
-		"POSTGRES_PASSWORD":     postgresPassword,
-		"REDIS_HOST":            "runtipi-redis",
-		"REDIS_PASSWORD":        redisPassword,
-		"DOMAIN":                settings.Domain,
-		"LOCAL_DOMAIN":          settings.LocalDomain,
-		"RABBITMQ_HOST":         "runtipi-queue",
-		"RABBITMQ_USERNAME":     "tipi",
-		"RABBITMQ_PASSWORD":     rabbitmqPassword,
+		"INTERNAL_IP":              settings.InternalIP,
+		"ARCHITECTURE":             runtime.GOARCH,
+		"TIPI_VERSION":             string(version),
+		"ROOT_FOLDER_HOST":         config.RootFolder,
+		"NGINX_PORT":               RawToString(settings.NginxPort),
+		"NGINX_PORT_SSL":           RawToString(settings.NginxSSLPort),
+		"RUNTIPI_APP_DATA_PATH":    appDataPath,
+		"POSTGRES_HOST":            "runtipi-db",
+		"POSTGRES_PORT":            RawToString(settings.PostgresPort),
+		"POSTGRES_DBNAME":          "tipi",
+		"POSTGRES_USERNAME":        "tipi",
+		"POSTGRES_PASSWORD":        postgresPassword,
+		"REDIS_HOST":               "runtipi-redis",
+		"REDIS_PASSWORD":           redisPassword,
+		"DOMAIN":                   settings.Domain,
+		"LOCAL_DOMAIN":             settings.LocalDomain,
+		"RABBITMQ_HOST":            "runtipi-queue",
+		"RABBITMQ_USERNAME":        "tipi",
+		"RABBITMQ_PASSWORD":        rabbitmqPassword,
+		"RUNTIPI_FORWARD_AUTH_URL": settings.ForwardAuthURL,
 	}
 
 	// Set default values if not present
@@ -189,6 +190,9 @@ func GenerateEnvFile(customEnvFile string) error {
 	if newEnv["LOCAL_DOMAIN"] == "" {
 		newEnv["LOCAL_DOMAIN"] = DefaultLocalDomain
 	}
+	if newEnv["RUNTIPI_FORWARD_AUTH_URL"] == "" {
+		newEnv["RUNTIPI_FORWARD_AUTH_URL"] = DefaultForwardAuthURL
+	}
 
 	// Handle custom env file if provided
 	if customEnvFile != "" {

internal/utils/schemas.go

@@ -30,13 +30,13 @@ func RawToString(value json.RawMessage) string {
 
 // SettingsSchema represents the JSON settings file structure
 type SettingsSchema struct {
-	AppDataPath  string          `json:"appDataPath,omitempty"`
-	StoragePath  string          `json:"storagePath,omitempty"`
-	InternalIP   string          `json:"internalIp,omitempty"`
-	NginxPort    json.RawMessage `json:"nginxPort"`
-	NginxSSLPort json.RawMessage `json:"nginxSslPort"`
-	PostgresPort json.RawMessage `json:"postgresPort"`
-	Domain       string          `json:"domain,omitempty"`
-	LocalDomain  string          `json:"localDomain,omitempty"`
+	AppDataPath    string          `json:"appDataPath,omitempty"`
+	StoragePath    string          `json:"storagePath,omitempty"`
+	InternalIP     string          `json:"internalIp,omitempty"`
+	NginxPort      json.RawMessage `json:"nginxPort"`
+	NginxSSLPort   json.RawMessage `json:"nginxSslPort"`
+	PostgresPort   json.RawMessage `json:"postgresPort"`
+	Domain         string          `json:"domain,omitempty"`
+	LocalDomain    string          `json:"localDomain,omitempty"`
+	ForwardAuthURL string          `json:"forwardAuthUrl,omitempty"`
 }
-