fix(config): replace external-url into studio api

Author: 9bany

pkg/config/api.go

@@ -19,8 +19,6 @@ type (
 		KongImage string  `toml:"-"`
 		Port      uint16  `toml:"port"`
 		Tls       tlsKong `toml:"tls"`
-		// TODO: replace [auth|studio].api_url
-		ExternalUrl string `toml:"external_url"`
 	}
 
 	tlsKong struct {

pkg/config/config.go

@@ -600,7 +600,7 @@ func (c *config) Load(path string, fsys fs.FS, overrides ...ConfigEditor) error
 	if connString, err := fs.ReadFile(fsys, builder.PoolerUrlPath); err == nil && len(connString) > 0 {
 		c.Db.Pooler.ConnectionString = string(connString)
 	}
-	if len(c.Api.ExternalUrl) == 0 {
+	if len(c.Studio.ApiUrl) == 0 {
 		// Update external api url
 		apiUrl := url.URL{Host: net.JoinHostPort(c.Hostname,
 			strconv.FormatUint(uint64(c.Api.Port), 10),
@@ -610,11 +610,11 @@ func (c *config) Load(path string, fsys fs.FS, overrides ...ConfigEditor) error
 		} else {
 			apiUrl.Scheme = "http"
 		}
-		c.Api.ExternalUrl = apiUrl.String()
+		c.Studio.ApiUrl = apiUrl.String()
 	}
 	// Set default JWT issuer if not configured
 	if len(c.Auth.JwtIssuer) == 0 {
-		c.Auth.JwtIssuer = c.Api.ExternalUrl + "/auth/v1"
+		c.Auth.JwtIssuer = c.Studio.ApiUrl + "/auth/v1"
 	}
 	// Update image versions
 	switch c.Db.MajorVersion {
@@ -860,7 +860,7 @@ func (c *config) Validate(fsys fs.FS) error {
 		if parsed, err := url.Parse(c.Studio.ApiUrl); err != nil {
 			return errors.Errorf("Invalid config for studio.api_url: %w", err)
 		} else if parsed.Host == "" || parsed.Host == c.Hostname {
-			c.Studio.ApiUrl = c.Api.ExternalUrl
+			return errors.New("studio.api_url must be set to a different host than the project hostname")
 		}
 	}
 	// Validate smtp config