[public-api] Parametrize connection URL based on token

Author: easyCZ

components/public-api-server/pkg/proxy/conn.go

@@ -102,7 +102,12 @@ func NewConnectionPool(address *url.URL, poolSize int) (*ConnectionPool, error)
 				return nil, errors.New("unknown token type")
 			}
 
-			conn, err := gitpod.ConnectToServer(address.String(), opts)
+			endpoint, err := getEndpointBasedOnToken(token, address)
+			if err != nil {
+				return nil, fmt.Errorf("failed to construct endpoint: %w", err)
+			}
+
+			conn, err := gitpod.ConnectToServer(endpoint, opts)
 			if err != nil {
 				return nil, fmt.Errorf("failed to create new connection to server: %w", err)
 			}
@@ -140,3 +145,14 @@ func (p *ConnectionPool) Get(ctx context.Context, token auth.Token) (gitpod.APII
 
 	return conn, nil
 }
+
+func getEndpointBasedOnToken(t auth.Token, u *url.URL) (string, error) {
+	switch t.Type {
+	case auth.AccessTokenType:
+		return fmt.Sprintf("%s/api/v1", u.String()), nil
+	case auth.CookieTokenType:
+		return fmt.Sprintf("%s/api/gitpod", u.String()), nil
+	default:
+		return "", errors.New("unknown token type")
+	}
+}

components/public-api-server/pkg/proxy/conn_test.go

@@ -6,6 +6,7 @@ package proxy
 
 import (
 	"context"
+	"net/url"
 	"testing"
 
 	gitpod "github.com/gitpod-io/gitpod/gitpod-protocol"
@@ -47,3 +48,16 @@ func TestConnectionPool(t *testing.T) {
 	require.True(t, pool.cache.Contains(barToken))
 	require.True(t, pool.cache.Contains(bazToken))
 }
+
+func TestEndpointBasedOnToken(t *testing.T) {
+	u, err := url.Parse("wss://gitpod.io")
+	require.NoError(t, err)
+
+	endpointForAccessToken, err := getEndpointBasedOnToken(auth.NewAccessToken("foo"), u)
+	require.NoError(t, err)
+	require.Equal(t, "wss://gitpod.io/api/v1", endpointForAccessToken)
+
+	endpointForCookie, err := getEndpointBasedOnToken(auth.NewCookieToken("foo"), u)
+	require.NoError(t, err)
+	require.Equal(t, "wss://gitpod.io/api/gitpod", endpointForCookie)
+}

install/installer/pkg/components/public-api-server/configmap.go

@@ -35,7 +35,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 	})
 
 	cfg := config.Configuration{
-		GitpodServiceURL:               fmt.Sprintf("wss://%s/api/gitpod", ctx.Config.Domain),
+		GitpodServiceURL:               fmt.Sprintf("wss://%s", ctx.Config.Domain),
 		StripeWebhookSigningSecretPath: stripeSecretPath,
 		BillingServiceAddress:          net.JoinHostPort(fmt.Sprintf("%s.%s.svc.cluster.local", usage.Component, ctx.Namespace), strconv.Itoa(usage.GRPCServicePort)),
 		Server: &baseserver.Configuration{

install/installer/pkg/components/public-api-server/configmap_test.go

@@ -31,7 +31,7 @@ func TestConfigMap(t *testing.T) {
 	})
 
 	expectedConfiguration := config.Configuration{
-		GitpodServiceURL:               "wss://test.domain.everything.awesome.is/api/gitpod",
+		GitpodServiceURL:               "wss://test.domain.everything.awesome.is",
 		BillingServiceAddress:          fmt.Sprintf("usage.%s.svc.cluster.local:9001", ctx.Namespace),
 		StripeWebhookSigningSecretPath: stripeSecretPath,
 		Server: &baseserver.Configuration{