@mablhq/mabl-cli 1.12.9 → 1.12.38

package/core/trainer/trainingSessions.js

@@ -1,50 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.editTest = exports.trainNewTest = void 0;
-const authenticationProvider_1 = require("../../providers/authenticationProvider");
+exports.editTest = exports.trainNewTest = exports.ElectronProtocolUrl = void 0;
 const branches_1 = require("../../commands/commandUtil/branches");
 const testsUtil_1 = require("../../commands/tests/testsUtil");
-const trainerBrowserUtil_1 = require("./trainerBrowserUtil");
-const util_1 = require("../../commands/commandUtil/util");
 const constants_1 = require("../../commands/constants");
-const util_2 = require("../util");
-const trainingSessionActions_1 = require("../messaging/actions/trainingSessionActions");
+const util_1 = require("../util");
+const openUtils_1 = require("./openUtils");
+const util_2 = require("../../commands/commandUtil/util");
+var ElectronProtocolUrl;
+(function (ElectronProtocolUrl) {
+    ElectronProtocolUrl["EDIT_TEST"] = "editTest";
+    ElectronProtocolUrl["TRAIN_NEW_TEST"] = "trainNewTest";
+})(ElectronProtocolUrl = exports.ElectronProtocolUrl || (exports.ElectronProtocolUrl = {}));
 async function trainNewTest(trainingSessionOptions) {
-    var _a, _b;
-    trainingSessionActions_1.TrainingEventEmitter.sessionInitializing();
-    const authConfig = await new authenticationProvider_1.AuthenticationProvider().getAuthConfigWithAutoRenew();
-    const apiClient = await util_2.getApiClientFromOptions(trainingSessionOptions, true);
+    var _a;
+    const apiClient = await util_1.getApiClientFromOptions(trainingSessionOptions, true);
     if (!trainingSessionOptions.branchName) {
         trainingSessionOptions.branchName = constants_1.DefaultBranchName;
     }
     if (trainingSessionOptions.branchName !== 'master') {
         await branches_1.checkBranchNameAndAutoBranchMaybe(trainingSessionOptions.workspaceId, apiClient, trainingSessionOptions.branchName, trainingSessionOptions.autoBranch);
     }
-    let environment;
     if (trainingSessionOptions.environmentId) {
-        environment = await apiClient.getEnvironment(trainingSessionOptions.environmentId, true);
+        await apiClient.getEnvironment(trainingSessionOptions.environmentId);
     }
-    let plan;
     if (trainingSessionOptions.planId) {
-        plan = await apiClient.getPlan(trainingSessionOptions.planId);
+        await apiClient.getPlan(trainingSessionOptions.planId);
     }
-    let deployment;
     if (trainingSessionOptions.deploymentId) {
-        deployment = await apiClient.getDeploymentEntity(trainingSessionOptions.deploymentId);
+        await apiClient.getDeploymentEntity(trainingSessionOptions.deploymentId);
     }
-    let application;
     if (trainingSessionOptions.applicationId) {
-        application = await apiClient.getApplication(trainingSessionOptions.applicationId);
+        await apiClient.getApplication(trainingSessionOptions.applicationId);
     }
-    let autoLoginFlows;
-    if (trainingSessionOptions.autoLogin) {
-        autoLoginFlows = await apiClient.getFlows({
-            organization_id: trainingSessionOptions.workspaceId,
-            flow_type: 'login',
-            limit: 1,
-        });
-    }
-    testsUtil_1.logTestInfoIfPresent(`Creating test: `, trainingSessionOptions.testName);
+    testsUtil_1.logTestInfoIfPresent(`Creating test in desktop app: `, trainingSessionOptions.testName);
     testsUtil_1.logTestInfoIfPresent(`Add auto login flow: `, trainingSessionOptions.autoLogin);
     testsUtil_1.logTestInfoIfPresent(`URL: `, trainingSessionOptions.url);
     testsUtil_1.logTestInfoIfPresent(`Workspace: `, trainingSessionOptions.workspaceId);
@@ -55,26 +44,12 @@ async function trainNewTest(trainingSessionOptions) {
     testsUtil_1.logTestInfoIfPresent(`Credentials ID: `, trainingSessionOptions.credentialsId);
     testsUtil_1.logTestInfoIfPresent(`Datatable ID(s): `, (_a = trainingSessionOptions.dataTableIds) === null || _a === void 0 ? void 0 : _a.join(', '));
     testsUtil_1.logTestInfoIfPresent(`Test description: `, trainingSessionOptions.testDescription);
-    const browserPreferences = testsUtil_1.generateChromiumPreferencesFile();
-    const browserPreferencesDirectory = await testsUtil_1.prepareChromePreferencesDirectory(browserPreferences);
-    const runnerType = await apiClient.getRunnerTypeFromFeatureFlag(trainingSessionOptions.workspaceId);
-    const trainingBrowser = await testsUtil_1.createBrowserWithAuthedExtension((_b = trainingSessionOptions.authToken) !== null && _b !== void 0 ? _b : authConfig.accessToken, trainingSessionOptions.width, trainingSessionOptions.height, browserPreferencesDirectory, {
-        runnerType,
-    });
-    trainerBrowserUtil_1.addManualCloseEventWatch(trainingBrowser, trainingSessionActions_1.TrainingEventEmitter.sessionClosed);
-    trainerBrowserUtil_1.addClosedAllWindowsEventWatch(trainingBrowser, trainingSessionActions_1.TrainingEventEmitter.sessionClosed);
-    const backgroundPage = await testsUtil_1.getExtensionBackgroundPageWithCliTool(trainingBrowser);
-    await testsUtil_1.createTrainingSession(backgroundPage, trainingSessionOptions, environment, plan, deployment, application, autoLoginFlows ? autoLoginFlows[0] : undefined);
-    trainingSessionActions_1.TrainingEventEmitter.sessionStarted();
-    await testsUtil_1.cleanUpInitialPages(trainingBrowser);
-    testsUtil_1.logCtlCLine();
+    await openUtils_1.openUrlInDesktopApp(ElectronProtocolUrl.TRAIN_NEW_TEST, trainingSessionOptions);
 }
 exports.trainNewTest = trainNewTest;
 async function editTest(trainingSessionOptions) {
     var _a, _b, _c, _d, _e, _f, _g;
-    trainingSessionActions_1.TrainingEventEmitter.sessionInitializing();
-    const authConfig = await new authenticationProvider_1.AuthenticationProvider().getAuthConfigWithAutoRenew();
-    const apiClient = await util_2.getApiClientFromOptions(trainingSessionOptions, true);
+    const apiClient = await util_1.getApiClientFromOptions(trainingSessionOptions, true);
     let testRunIdConfig = { testId: '', filterHttpRequests: false };
     if (trainingSessionOptions.testRunId) {
         testRunIdConfig = await testsUtil_1.pullDownTestRunConfig(trainingSessionOptions.testRunId, apiClient);
@@ -91,35 +66,35 @@ async function editTest(trainingSessionOptions) {
     if (test.default) {
         throw new Error('Editing of the mabl default supplied tests is not supported');
     }
+    if (!((_g = test.flows) === null || _g === void 0 ? void 0 : _g.length)) {
+        throw new Error(util_2.TEST_INFO_NOT_FOUND);
+    }
     if (branchName !== 'master') {
         await branches_1.checkBranchNameAndAutoBranchMaybe(test.organization_id, apiClient, branchName, trainingSessionOptions.autoBranch);
     }
     const finalUrl = testsUtil_1.getFinalUrl(test, url);
-    const flowArray = await util_1.getJourneyFlowArray(test, apiClient, branchName);
-    let environment;
     if (environmentId) {
-        environment = await apiClient.getEnvironment(environmentId, true);
+        await apiClient.getEnvironment(environmentId);
     }
-    testsUtil_1.logTestInfoIfPresent(`Editing test: `, `${test.name} - ${test.invariant_id}`);
+    testsUtil_1.logTestInfoIfPresent(`Editing test in desktop app: `, `${test.name} - ${test.invariant_id}`);
     testsUtil_1.logTestInfoIfPresent(`Test description: `, test.description);
     testsUtil_1.logTestInfoIfPresent(`URL: `, finalUrl);
     testsUtil_1.logTestInfoIfPresent(`Workspace: `, test.organization_id);
     testsUtil_1.logTestInfoIfPresent(`Branch: `, branchName);
     testsUtil_1.logTestInfoIfPresent(`Environment ID: `, environmentId);
     testsUtil_1.logTestInfoIfPresent(`Credentials ID: `, credentialsId);
-    const browserPreferences = testsUtil_1.generateChromiumPreferencesFile();
-    const browserPreferencesDirectory = await testsUtil_1.prepareChromePreferencesDirectory(browserPreferences);
-    const runnerType = await apiClient.getRunnerTypeFromFeatureFlag(test.organization_id);
-    const trainingBrowser = await testsUtil_1.createBrowserWithAuthedExtension((_g = trainingSessionOptions.authToken) !== null && _g !== void 0 ? _g : authConfig.accessToken, trainingSessionOptions.width, trainingSessionOptions.height, browserPreferencesDirectory, {
-        disableIsolation: trainingSessionOptions.disableIsolation,
-        ignoreCertificateErrors: trainingSessionOptions.ignoreCertificateErrors,
-        runnerType,
-    });
-    const backgroundPage = await testsUtil_1.getExtensionBackgroundPageWithCliTool(trainingBrowser);
-    trainerBrowserUtil_1.addManualCloseEventWatch(trainingBrowser, trainingSessionActions_1.TrainingEventEmitter.sessionClosed);
-    trainerBrowserUtil_1.addClosedAllWindowsEventWatch(trainingBrowser, trainingSessionActions_1.TrainingEventEmitter.sessionClosed);
-    await testsUtil_1.editTheTest(backgroundPage, test, flowArray, branchName, finalUrl, credentialsId, environment);
-    trainingSessionActions_1.TrainingEventEmitter.sessionStarted();
-    testsUtil_1.logCtlCLine();
+    const scriptConfig = {
+        applicationId: trainingSessionOptions.applicationId,
+        branchName,
+        credentialsId,
+        deploymentId: trainingSessionOptions.deploymentId,
+        environmentId,
+        testId,
+        testType: test.test_type,
+        workspaceId: test.organization_id,
+        planId: testRunIdConfig.fromPlanId,
+        url: finalUrl,
+    };
+    await openUtils_1.openUrlInDesktopApp(ElectronProtocolUrl.EDIT_TEST, scriptConfig);
 }
 exports.editTest = editTest;

package/env/defaultEnv.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SCRIPT_NAME = exports.OKTA_URL = exports.OKTA_CLIENT_ID = exports.LOCAL_TRAINER_PATH = exports.EXTENSION_ID = exports.ENV = exports.DEBUG_EVENT_EMITTER = exports.CONSOLE_LOGGING_LEVEL = exports.CONF_FILE_VERSION = exports.CONF_FILE_PROJECT_NAME = exports.BASE_APP_URL = exports.BASE_API_URL = void 0;
+exports.ELECTRON_PROTOCOL = exports.SCRIPT_NAME = exports.OKTA_URL = exports.OKTA_CLIENT_ID = exports.LOCAL_TRAINER_PATH = exports.EXTENSION_ID = exports.ENV = exports.DEBUG_EVENT_EMITTER = exports.CONSOLE_LOGGING_LEVEL = exports.CONF_FILE_VERSION = exports.CONF_FILE_PROJECT_NAME = exports.BASE_APP_URL = exports.BASE_API_URL = void 0;
 exports.BASE_API_URL = 'https://api.mabl.com';
 exports.BASE_APP_URL = 'https://app.mabl.com';
 exports.CONF_FILE_PROJECT_NAME = 'mabl-cli';
@@ -13,3 +13,4 @@ exports.LOCAL_TRAINER_PATH = '';
 exports.OKTA_CLIENT_ID = '0oa1fte4dlVvEr5bb5d7';
 exports.OKTA_URL = 'https://auth2.mabl.com';
 exports.SCRIPT_NAME = 'mabl';
+exports.ELECTRON_PROTOCOL = 'mabl-app';

package/env/dev.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SCRIPT_NAME = exports.OKTA_URL = exports.OKTA_CLIENT_ID = exports.LOCAL_TRAINER_PATH = exports.EXTENSION_ID = exports.ENV = exports.DEBUG_EVENT_EMITTER = exports.CONSOLE_LOGGING_LEVEL = exports.CONF_FILE_VERSION = exports.CONF_FILE_PROJECT_NAME = exports.BASE_APP_URL = exports.BASE_API_URL = void 0;
+exports.ELECTRON_PROTOCOL = exports.SCRIPT_NAME = exports.OKTA_URL = exports.OKTA_CLIENT_ID = exports.LOCAL_TRAINER_PATH = exports.EXTENSION_ID = exports.ENV = exports.DEBUG_EVENT_EMITTER = exports.CONSOLE_LOGGING_LEVEL = exports.CONF_FILE_VERSION = exports.CONF_FILE_PROJECT_NAME = exports.BASE_APP_URL = exports.BASE_API_URL = void 0;
 exports.BASE_API_URL = 'https://api-dev.mabl.com';
 exports.BASE_APP_URL = 'https://app-dev.mabl.com';
 exports.CONF_FILE_PROJECT_NAME = 'mabl-cli-dev';
@@ -13,3 +13,4 @@ exports.LOCAL_TRAINER_PATH = '';
 exports.OKTA_CLIENT_ID = '0oamuehnyLZhBbKh91d6';
 exports.OKTA_URL = 'https://auth2-dev.mabl.com';
 exports.SCRIPT_NAME = 'mabl-dev';
+exports.ELECTRON_PROTOCOL = 'mabl-app-dev';

package/env/env.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setConfigFileProjectName = exports.setGlobalConfigEnv = exports.EnvOption = exports.SCRIPT_NAME = exports.OKTA_URL = exports.OKTA_CLIENT_ID = exports.LOCAL_TRAINER_PATH = exports.EXTENSION_ID = exports.ENV = exports.DEBUG_EVENT_EMITTER = exports.CONSOLE_LOGGING_LEVEL = exports.CONF_FILE_VERSION = exports.CONF_FILE_PROJECT_NAME = exports.BASE_APP_URL = exports.BASE_API_URL = void 0;
+exports.setConfigFileProjectName = exports.setGlobalConfigEnv = exports.EnvOption = exports.ELECTRON_PROTOCOL = exports.SCRIPT_NAME = exports.OKTA_URL = exports.OKTA_CLIENT_ID = exports.LOCAL_TRAINER_PATH = exports.EXTENSION_ID = exports.ENV = exports.DEBUG_EVENT_EMITTER = exports.CONSOLE_LOGGING_LEVEL = exports.CONF_FILE_VERSION = exports.CONF_FILE_PROJECT_NAME = exports.BASE_APP_URL = exports.BASE_API_URL = void 0;
 const localEnv = __importStar(require("./local"));
 const devEnv = __importStar(require("./dev"));
 const prodEnv = __importStar(require("./prod"));
@@ -36,6 +36,7 @@ exports.LOCAL_TRAINER_PATH = defaultEnv.LOCAL_TRAINER_PATH;
 exports.OKTA_CLIENT_ID = defaultEnv.OKTA_CLIENT_ID;
 exports.OKTA_URL = defaultEnv.OKTA_URL;
 exports.SCRIPT_NAME = defaultEnv.SCRIPT_NAME;
+exports.ELECTRON_PROTOCOL = defaultEnv.ELECTRON_PROTOCOL;
 var EnvOption;
 (function (EnvOption) {
     EnvOption["dev"] = "dev";
@@ -60,6 +61,7 @@ function setGlobalConfigEnv(env) {
     exports.OKTA_CLIENT_ID = envMap[env].OKTA_CLIENT_ID;
     exports.OKTA_URL = envMap[env].OKTA_URL;
     exports.SCRIPT_NAME = envMap[env].SCRIPT_NAME;
+    exports.ELECTRON_PROTOCOL = envMap[env].ELECTRON_PROTOCOL;
 }
 exports.setGlobalConfigEnv = setGlobalConfigEnv;
 function setConfigFileProjectName(projectName) {

package/env/local.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SCRIPT_NAME = exports.OKTA_URL = exports.OKTA_CLIENT_ID = exports.LOCAL_TRAINER_PATH = exports.EXTENSION_ID = exports.ENV = exports.DEBUG_EVENT_EMITTER = exports.CONSOLE_LOGGING_LEVEL = exports.CONF_FILE_VERSION = exports.CONF_FILE_PROJECT_NAME = exports.BASE_APP_URL = exports.BASE_API_URL = void 0;
+exports.ELECTRON_PROTOCOL = exports.SCRIPT_NAME = exports.OKTA_URL = exports.OKTA_CLIENT_ID = exports.LOCAL_TRAINER_PATH = exports.EXTENSION_ID = exports.ENV = exports.DEBUG_EVENT_EMITTER = exports.CONSOLE_LOGGING_LEVEL = exports.CONF_FILE_VERSION = exports.CONF_FILE_PROJECT_NAME = exports.BASE_APP_URL = exports.BASE_API_URL = void 0;
 exports.BASE_API_URL = 'http://localhost:8080';
 exports.BASE_APP_URL = 'https://app-local.mabl.com:3000';
 exports.CONF_FILE_PROJECT_NAME = 'mabl-cli-local';
@@ -13,3 +13,4 @@ exports.LOCAL_TRAINER_PATH = process.env.LOCAL_TRAINER_PATH;
 exports.OKTA_CLIENT_ID = '0oamuehnyLZhBbKh91d6';
 exports.OKTA_URL = 'https://auth2-dev.mabl.com';
 exports.SCRIPT_NAME = 'mabl-local';
+exports.ELECTRON_PROTOCOL = 'mabl-app-local';

package/env/prod.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SCRIPT_NAME = exports.OKTA_URL = exports.OKTA_CLIENT_ID = exports.LOCAL_TRAINER_PATH = exports.EXTENSION_ID = exports.ENV = exports.DEBUG_EVENT_EMITTER = exports.CONSOLE_LOGGING_LEVEL = exports.CONF_FILE_VERSION = exports.CONF_FILE_PROJECT_NAME = exports.BASE_APP_URL = exports.BASE_API_URL = void 0;
+exports.ELECTRON_PROTOCOL = exports.SCRIPT_NAME = exports.OKTA_URL = exports.OKTA_CLIENT_ID = exports.LOCAL_TRAINER_PATH = exports.EXTENSION_ID = exports.ENV = exports.DEBUG_EVENT_EMITTER = exports.CONSOLE_LOGGING_LEVEL = exports.CONF_FILE_VERSION = exports.CONF_FILE_PROJECT_NAME = exports.BASE_APP_URL = exports.BASE_API_URL = void 0;
 exports.BASE_API_URL = 'https://api.mabl.com';
 exports.BASE_APP_URL = 'https://app.mabl.com';
 exports.CONF_FILE_PROJECT_NAME = 'mabl-cli';
@@ -13,3 +13,4 @@ exports.LOCAL_TRAINER_PATH = '';
 exports.OKTA_CLIENT_ID = '0oa1fte4dlVvEr5bb5d7';
 exports.OKTA_URL = 'https://auth2.mabl.com';
 exports.SCRIPT_NAME = 'mabl';
+exports.ELECTRON_PROTOCOL = 'mabl-app';