fix(cli): fix oauth flow (#3169)

kubeshop · Sep 20, 2023 · 23aff08 · 23aff08
1 parent b5cb94e
commit 23aff08
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/cli/config/config.go b/cli/config/config.go
@@ -17,6 +17,8 @@ var (
 	Version                 = "dev"
 	Env                     = "dev"
 	DefaultCloudAPIEndpoint = "http://localhost:8090"
+	DefaultCloudDomain      = "tracetest.io"
+	DefaultCloudPath        = "/"
 )
 
 type ConfigFlags struct {

diff --git a/cli/config/configurator.go b/cli/config/configurator.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/kubeshop/tracetest/cli/analytics"
 	"github.com/kubeshop/tracetest/cli/pkg/oauth"
@@ -60,6 +61,10 @@ func (c Configurator) Start(ctx context.Context, prev Config, flags ConfigFlags)
 		return err
 	}
 
+	if strings.Contains(serverURL, DefaultCloudDomain) {
+		path = &DefaultCloudPath
+	}
+
 	cfg := Config{
 		Scheme:     scheme,
 		Endpoint:   endpoint,

diff --git a/cli/pkg/oauth/oauth.go b/cli/pkg/oauth/oauth.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	"net"
 	"net/http"
+	"strings"
 	"sync"
 
 	"github.com/kubeshop/tracetest/cli/ui"
@@ -115,7 +116,7 @@ func (s *OAuthServer) start() error {
 
 func (s *OAuthServer) callback(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
-	w.Header().Set("Access-Control-Allow-Origin", s.frontendEndpoint)
+	w.Header().Set("Access-Control-Allow-Origin", strings.TrimSuffix(s.frontendEndpoint, "/"))
 
 	w.WriteHeader(http.StatusOK)
 	w.Write([]byte(`{"success": true}`))