moved config param sso.configurator_root_path to ui.base_url

added default values for ui.base_url
updated sso doc

Author: Flyover-ArtSk

configurator/backend/appconfig/appconfig.go

@@ -23,6 +23,7 @@ func setDefaultParams(containerized bool) {
 	viper.SetDefault("server.self_hosted", true)
 	viper.SetDefault("server.log.level", "info")
 	viper.SetDefault("server.allowed_domains", []string{"localhost", jcors.AppTopLevelDomainTemplate})
+	viper.SetDefault("ui.base_url", "/")
 
 	if containerized {
 		viper.SetDefault("server.log.path", "/home/configurator/data/logs")

configurator/backend/authorization/boxyhq.go

@@ -19,7 +19,6 @@ const (
 type SSOProvider interface {
 	GetUser(code string) (*UserEntity, error)
 	AuthLink() string
-	GetConfiguration() *SSOConfig
 	AccessTokenTTL() time.Duration
 	Name() string
 }
@@ -106,10 +105,6 @@ func (bp *BoxyHQProvider) AuthLink() string {
 	return authLink
 }
 
-func (bp *BoxyHQProvider) GetConfiguration() *SSOConfig {
-	return bp.ssoConfig
-}
-
 func (bp *BoxyHQProvider) Name() string {
 	return BoxyHQ
 }

configurator/backend/authorization/service.go

@@ -46,7 +46,6 @@ type SSOConfig struct {
 	Product               string        `json:"product" validate:"required"`
 	Host                  string        `json:"host" validate:"required"`
 	AccessTokenTTLSeconds time.Duration `json:"access_token_ttl_seconds" validate:"required"`
-	ConfiguratorRootPath  string        `json:"configurator_root_path"`
 }
 
 type Service struct {
@@ -99,7 +98,7 @@ func CreateSSOProvider(vp *viper.Viper) SSOProvider {
 	var err error
 
 	ssoConfig := &SSOConfig{}
-	envConfig := os.Getenv("SSO_CONFIG")
+	envConfig := os.Getenv("JITSU_SSO_CONFIG")
 
 	if envConfig == "" {
 		vpSSO := vp.Sub("sso")
@@ -114,12 +113,11 @@ func CreateSSOProvider(vp *viper.Viper) SSOProvider {
 			Product:               vpSSO.GetString("product"),
 			Host:                  vpSSO.GetString("host"),
 			AccessTokenTTLSeconds: vpSSO.GetDuration("access_token_ttl_seconds"),
-			ConfiguratorRootPath:  vpSSO.GetString("configurator_root_path"),
 		}
 	} else {
 		err = json.Unmarshal([]byte(envConfig), ssoConfig)
 		if err != nil {
-			logging.Errorf("Can't unmarshal SSO_CONFIG from env variables: %v", err)
+			logging.Errorf("Can't unmarshal JITSU_SSO_CONFIG from env variables: %v", err)
 			return nil
 		}
 	}
@@ -421,13 +419,6 @@ func (s *Service) GetSSOAuthorizationLink() string {
 	return s.ssoAuthProvider.AuthLink()
 }
 
-func (s *Service) GetConfiguratorRootPath() string {
-	if s.ssoAuthProvider == nil {
-		return ""
-	}
-	return s.ssoAuthProvider.GetConfiguration().ConfiguratorRootPath
-}
-
 func (s *Service) Close() error {
 	if err := s.authProvider.Close(); err != nil {
 		return fmt.Errorf("Error closing authorization provider: %v", err)

configurator/backend/handlers/sso_auth.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/jitsucom/jitsu/configurator/authorization"
+	"github.com/spf13/viper"
 	"net/http"
 )
 
@@ -39,18 +40,15 @@ func (oh *SSOAuthHandler) Handler(c *gin.Context) {
 		return
 	}
 
-	crp := oh.authService.GetConfiguratorRootPath()
-	if crp == "" {
-		crp = "/"
-	}
+	uiBaseUrl := viper.GetString("UI_BASE_URL")
 
 	td, err := oh.authService.SSOAuthenticate(code)
 	if err != nil {
-		c.String(http.StatusOK, errorTmpl, err, crp)
+		c.String(http.StatusOK, errorTmpl, err, uiBaseUrl)
 		return
 	}
 
-	c.String(http.StatusOK, successTmpl, td.AccessTokenEntity.AccessToken, td.RefreshTokenEntity.RefreshToken, crp)
+	c.String(http.StatusOK, successTmpl, td.AccessTokenEntity.AccessToken, td.RefreshTokenEntity.RefreshToken, uiBaseUrl)
 
 	return
 }

docker/entrypoint.sh

@@ -67,6 +67,7 @@ trap graceful_exit SIGQUIT SIGTERM SIGINT SIGHUP
 # ENV variables
 export JITSU_CONFIGURATOR_URL=http://localhost:7000
 export JITSU_SERVER_URL=http://localhost:8001
+export UI_BASE_URL=/configurator
 ## Backward compatibility (Joint image has enabled user recognition by default)
 export USER_RECOGNITION_ENABLED=${USER_RECOGNITION_ENABLED:=true}
 

documentation/configurator-configuration/sso-authentication/index.mdx

@@ -24,10 +24,10 @@ sso:
   configurator_root_path: '/configurator'
 ```
 
-or you can configure it with env variable SSO_CONFIG:
+or you can configure it with env variable `JITSU_SSO_CONFIG`:
 
 ```
-export SSO_CONFIG='{"provider": "boxyhq", "host": "https://boxyhq.com", "tenant": "boxyhq.com", "product": "jitsu", "access_token_ttl_seconds": 86400, "configurator_root_path": "/configurator"}'
+export JITSU_SSO_CONFIG='{"provider": "boxyhq", "host": "https://boxyhq.com", "tenant": "boxyhq.com", "product": "jitsu", "access_token_ttl_seconds": 86400, "configurator_root_path": "/configurator"}'
 ```
 
 After you have configured the SSO auth, the "Continue with SSO" button will appear on the authorization page.