💄

Author: mustard-mh

components/server/src/oauth-server/oauth-controller.ts

@@ -16,7 +16,7 @@ import { URL } from "url";
 import { Config } from "../config";
 import { clientRepository, createAuthorizationServer } from "./oauth-authorization-server";
 import { inMemoryDatabase, toolboxClient } from "./db";
-import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server";
+import { getFeatureFlagEnableExperimentalJBTB } from "../util/featureflags";
 
 @injectable()
 export class OAuthController {
@@ -149,11 +149,7 @@ export class OAuthController {
             }
 
             if (clientID === toolboxClient.id) {
-                const enableExperimentalJBTB = await getExperimentsClientForBackend().getValueAsync(
-                    "enable_experimental_jbtb",
-                    false,
-                    { user },
-                );
+                const enableExperimentalJBTB = await getFeatureFlagEnableExperimentalJBTB(user.id);
                 if (!enableExperimentalJBTB) {
                     res.sendStatus(400);
                     return false;

components/server/src/util/featureflags.ts

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) 2024 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License.AGPL.txt in the project root for license information.
+ */
+
+import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server";
+
+export async function getFeatureFlagEnableExperimentalJBTB(userId: string): Promise<boolean> {
+    return getExperimentsClientForBackend().getValueAsync("enable_experimental_jbtb", false, {
+        user: { id: userId },
+        gitpodHost: process.env.GITPOD_HOST,
+    });
+}

components/server/src/workspace/workspace-starter.ts

@@ -136,6 +136,7 @@ import { ctxIsAborted, runWithRequestContext, runWithSubjectId } from "../util/r
 import { SubjectId } from "../auth/subject-id";
 import { ApplicationError, ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
 import { IDESettingsVersion } from "@gitpod/gitpod-protocol/lib/ide-protocol";
+import { getFeatureFlagEnableExperimentalJBTB } from "../util/featureflags";
 
 export interface StartWorkspaceOptions extends Omit<GitpodServer.StartWorkspaceOptions, "ideSettings"> {
     excludeFeatureFlags?: NamedWorkspaceFeatureFlag[];
@@ -301,16 +302,11 @@ export class WorkspaceStarter {
 
             let ideSettings = options.ideSettings;
 
-            const enableExperimentalJBTB = await getExperimentsClientForBackend().getValueAsync(
-                "enable_experimental_jbtb",
-                false,
-                { user },
-            );
-
             // if no explicit ideSettings are passed, we use the one from the last workspace instance
             if (lastValidWorkspaceInstance) {
                 const ideConfig = lastValidWorkspaceInstance.configuration?.ideConfig;
                 if (ideConfig?.ide) {
+                    const enableExperimentalJBTB = await getFeatureFlagEnableExperimentalJBTB(user.id);
                     const preferToolbox = !enableExperimentalJBTB
                         ? false
                         : ideSettings?.preferToolbox ??
@@ -922,11 +918,7 @@ export class WorkspaceStarter {
             };
             if (ideConfig.ideSettings && ideConfig.ideSettings.trim() !== "") {
                 try {
-                    const enableExperimentalJBTB = await getExperimentsClientForBackend().getValueAsync(
-                        "enable_experimental_jbtb",
-                        false,
-                        { user },
-                    );
+                    const enableExperimentalJBTB = await getFeatureFlagEnableExperimentalJBTB(user.id);
                     const ideSettings: IDESettings = JSON.parse(ideConfig.ideSettings);
                     configuration.ideConfig!.ide = ideSettings.defaultIde;
                     configuration.ideConfig!.useLatest = !!ideSettings.useLatestVersion;