@mablhq/mabl-cli 1.40.12 → 1.42.7

package/api/basicApiClient.js

@@ -28,13 +28,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicApiClient = void 0;
 const ApiError_1 = require("./ApiError");
-const httpUtil_1 = require("../util/httpUtil");
+const axiosProxyConfig_1 = require("../http/axiosProxyConfig");
 const axios_1 = __importDefault(require("axios"));
 const os = __importStar(require("os"));
 const async_retry_1 = __importDefault(require("async-retry"));
 const logUtils_1 = require("../util/logUtils");
 const asyncUtil_1 = require("../util/asyncUtil");
 const types_1 = require("./types");
+const httpUtil_1 = require("../http/httpUtil");
 const MABL_ENTITY_VERSION_HEADER = 'x-mabl-entity-version';
 const DEFAULT_RETRYABLE_REQUEST_TIMEOUT_MILLISECONDS = 60000;
 const DEFAULT_RETRIES = 10;
@@ -55,7 +56,7 @@ const DEFAULT_SSL_VERIFY = false;
 class BasicApiClient {
     constructor(options) {
         var _a, _b, _c, _d, _e;
-        const config = (0, httpUtil_1.axiosProxyConfig)({
+        const config = (0, axiosProxyConfig_1.axiosProxyConfig)({
             sslVerify: (_a = options.sslVerify) !== null && _a !== void 0 ? _a : DEFAULT_SSL_VERIFY,
             proxyHost: options.proxyUrl,
             proxyType: options.proxyType,

package/commands/tests/tests_cmds/create.js

@@ -117,9 +117,9 @@ async function launchTrainingSession(parsed) {
         environmentId,
         height,
         labels,
+        planId,
         testDescription,
         testName,
-        planId,
         url,
         width,
         workspaceId,

package/core/execution/ApiTestUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deduplicateApiTestExecutionResults = void 0;
+exports.restoreCustomRequestFields = exports.deduplicateApiTestExecutionResults = void 0;
 function deduplicateApiTestExecutionResults(postmanResult) {
     var _a;
     const executionsById = {};
@@ -16,3 +16,43 @@ function deduplicateApiTestExecutionResults(postmanResult) {
     return postmanResult;
 }
 exports.deduplicateApiTestExecutionResults = deduplicateApiTestExecutionResults;
+function restoreCustomRequestFields(postmanResult, collection) {
+    const requestItemsById = collection.item.reduce((collectionSet, itemDefinition) => {
+        collectionSet[itemDefinition.id] = itemDefinition;
+        return collectionSet;
+    }, {});
+    postmanResult.run.executions.forEach((execution) => {
+        var _a;
+        const requestItemDefinition = requestItemsById[execution.id];
+        if (((_a = execution.request.body) === null || _a === void 0 ? void 0 : _a.mode) === 'formdata' &&
+            (requestItemDefinition === null || requestItemDefinition === void 0 ? void 0 : requestItemDefinition.request)) {
+            restoreFormDataFileMetadata(execution.request, requestItemDefinition.request);
+        }
+    });
+    return postmanResult;
+}
+exports.restoreCustomRequestFields = restoreCustomRequestFields;
+function restoreFormDataFileMetadata(resultRequest, collectionRequest) {
+    var _a, _b, _c, _d, _e;
+    if ((_a = resultRequest.body) === null || _a === void 0 ? void 0 : _a.formdata) {
+        const requestFormDataBySrc = (_c = (_b = collectionRequest === null || collectionRequest === void 0 ? void 0 : collectionRequest.body) === null || _b === void 0 ? void 0 : _b.formdata) === null || _c === void 0 ? void 0 : _c.reduce((set, formData) => {
+            if (formData.src) {
+                set[formData.src] = formData;
+            }
+            return set;
+        }, {});
+        if (!Array.isArray((_d = resultRequest.body) === null || _d === void 0 ? void 0 : _d.formdata)) {
+            resultRequest.body.formdata = resultRequest.body.formdata
+                .all()
+                .map((formParam) => formParam);
+        }
+        for (const resultFormParam of resultRequest.body.formdata) {
+            if (resultFormParam.type === 'file' &&
+                resultFormParam.src &&
+                !resultFormParam.mablFile) {
+                resultFormParam.mablFile =
+                    (_e = requestFormDataBySrc[resultFormParam.src]) === null || _e === void 0 ? void 0 : _e.mablFile;
+            }
+        }
+    }
+}

package/core/trainer/openUtils.js

@@ -4,14 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logSessionStarted = exports.openUrlInDesktopApp = void 0;
-const querystring_1 = __importDefault(require("querystring"));
 const open_1 = __importDefault(require("open"));
 const env_1 = require("../../env/env");
 const timers_1 = require("timers");
 const messaging_1 = require("../messaging/messaging");
 const chalk_1 = __importDefault(require("chalk"));
+const encodingUtil_1 = require("../../util/encodingUtil");
 async function openUrlInDesktopApp(url, trainingSessionOptions) {
-    const params = querystring_1.default.stringify({ ...trainingSessionOptions });
+    const params = (0, encodingUtil_1.encodeTestConfigAsParamsForParsedUrlProtocol)(trainingSessionOptions, encodingUtil_1.b64EncodeUnicodeInNode);
     const childProcess = await (0, open_1.default)(`${env_1.ELECTRON_PROTOCOL}://${url}/${params}`);
     let childProcessExited = false;
     const keepAliveUntilExited = () => {

package/core/trainer/trainingSessions-types.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEditTestPayloadFromCli = exports.isNewTestPayloadFromCli = exports.isEditTestPayloadFromDesktopApp = exports.isNewTestPayloadFromDesktopApp = exports.isEditTestPayloadFromWebApp = exports.isNewTestPayloadFromWebApp = exports.isPayloadFromCli = exports.isPayloadFromUi = void 0;
+function isPayloadFromUi(payload) {
+    return payload.sender === 'webapp' || payload.sender === 'mabltron';
+}
+exports.isPayloadFromUi = isPayloadFromUi;
+function isPayloadFromCli(payload) {
+    return payload.sender === 'cli' || !isPayloadFromUi(payload);
+}
+exports.isPayloadFromCli = isPayloadFromCli;
+function isNewTestPayloadFromWebApp(payload) {
+    return payload.sender === 'webapp' && payload.testId === undefined;
+}
+exports.isNewTestPayloadFromWebApp = isNewTestPayloadFromWebApp;
+function isEditTestPayloadFromWebApp(payload) {
+    return payload.sender === 'webapp' && payload.testId !== undefined;
+}
+exports.isEditTestPayloadFromWebApp = isEditTestPayloadFromWebApp;
+function isNewTestPayloadFromDesktopApp(payload) {
+    return payload.sender === 'mabltron' && payload.testId === undefined;
+}
+exports.isNewTestPayloadFromDesktopApp = isNewTestPayloadFromDesktopApp;
+function isEditTestPayloadFromDesktopApp(payload) {
+    return payload.sender === 'mabltron' && payload.testId !== undefined;
+}
+exports.isEditTestPayloadFromDesktopApp = isEditTestPayloadFromDesktopApp;
+function isNewTestPayloadFromCli(payload) {
+    return isPayloadFromCli(payload) && payload.testName !== undefined;
+}
+exports.isNewTestPayloadFromCli = isNewTestPayloadFromCli;
+function isEditTestPayloadFromCli(payload) {
+    return isPayloadFromCli(payload) && payload.testId !== undefined;
+}
+exports.isEditTestPayloadFromCli = isEditTestPayloadFromCli;

package/core/trainer/trainingSessions.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.editTest = exports.trainNewTest = exports.ElectronProtocolUrl = void 0;
+exports.editTest = exports.trainNewTest = exports.ElectronProtocolUrl = exports.SENDER = exports.DEFAULT_WIDTH = exports.DEFAULT_HEIGHT = void 0;
 const branches_1 = require("../../commands/commandUtil/branches");
 const testsUtil_1 = require("../../commands/tests/testsUtil");
+const mablApi_1 = require("../../mablApi");
 const constants_1 = require("../../commands/constants");
 const util_1 = require("../util");
 const openUtils_1 = require("./openUtils");
 const util_2 = require("../../commands/commandUtil/util");
+exports.DEFAULT_HEIGHT = 800;
+exports.DEFAULT_WIDTH = 1000;
+exports.SENDER = 'cli';
 var ElectronProtocolUrl;
 (function (ElectronProtocolUrl) {
     ElectronProtocolUrl["EDIT_TEST"] = "editTest";
@@ -15,40 +19,47 @@ var ElectronProtocolUrl;
 async function trainNewTest(trainingSessionOptions) {
     var _a;
     const apiClient = await (0, util_1.getApiClientFromOptions)(trainingSessionOptions, true);
-    if (!trainingSessionOptions.branchName) {
-        trainingSessionOptions.branchName = constants_1.DefaultBranchName;
-    }
-    if (trainingSessionOptions.branchName !== 'master') {
-        await (0, branches_1.checkBranchNameAndAutoBranchMaybe)(trainingSessionOptions.workspaceId, apiClient, trainingSessionOptions.branchName, trainingSessionOptions.autoBranch);
-    }
-    if (trainingSessionOptions.environmentId) {
-        await apiClient.getEnvironment(trainingSessionOptions.environmentId);
+    const branchName = (_a = trainingSessionOptions.branchName) !== null && _a !== void 0 ? _a : constants_1.DefaultBranchName;
+    const { authToken, autoBranch, ...passThroughFields } = trainingSessionOptions;
+    const { applicationId, autoLogin, credentialsId, dataTableIds, environmentId, height, planId, testDescription, testName, url, width, workspaceId, } = passThroughFields;
+    if (branchName !== 'master') {
+        await (0, branches_1.checkBranchNameAndAutoBranchMaybe)(workspaceId, apiClient, branchName, autoBranch);
     }
-    if (trainingSessionOptions.planId) {
-        await apiClient.getPlan(trainingSessionOptions.planId);
+    if (environmentId) {
+        await apiClient.getEnvironment(environmentId);
     }
-    if (trainingSessionOptions.deploymentId) {
-        await apiClient.getDeploymentEntity(trainingSessionOptions.deploymentId);
+    if (planId) {
+        await apiClient.getPlan(planId);
     }
-    if (trainingSessionOptions.applicationId) {
-        await apiClient.getApplication(trainingSessionOptions.applicationId);
+    if (applicationId) {
+        await apiClient.getApplication(applicationId);
     }
-    (0, testsUtil_1.logTestInfoIfPresent)(`Creating test in desktop app: `, trainingSessionOptions.testName);
-    (0, testsUtil_1.logTestInfoIfPresent)(`Add auto login flow: `, trainingSessionOptions.autoLogin);
-    (0, testsUtil_1.logTestInfoIfPresent)(`URL: `, trainingSessionOptions.url);
-    (0, testsUtil_1.logTestInfoIfPresent)(`Workspace: `, trainingSessionOptions.workspaceId);
-    (0, testsUtil_1.logTestInfoIfPresent)(`Branch: `, trainingSessionOptions.branchName);
-    (0, testsUtil_1.logTestInfoIfPresent)(`Plan ID: `, trainingSessionOptions.planId);
-    (0, testsUtil_1.logTestInfoIfPresent)(`Application ID: `, trainingSessionOptions.applicationId);
-    (0, testsUtil_1.logTestInfoIfPresent)(`Environment ID: `, trainingSessionOptions.environmentId);
-    (0, testsUtil_1.logTestInfoIfPresent)(`Credentials ID: `, trainingSessionOptions.credentialsId);
-    (0, testsUtil_1.logTestInfoIfPresent)(`Datatable ID(s): `, (_a = trainingSessionOptions.dataTableIds) === null || _a === void 0 ? void 0 : _a.join(', '));
-    (0, testsUtil_1.logTestInfoIfPresent)(`Test description: `, trainingSessionOptions.testDescription);
-    await (0, openUtils_1.openUrlInDesktopApp)(ElectronProtocolUrl.TRAIN_NEW_TEST, trainingSessionOptions);
+    const account = await apiClient.getAccountByWorkspaceId(workspaceId);
+    (0, testsUtil_1.logTestInfoIfPresent)(`Creating test in desktop app: `, testName);
+    (0, testsUtil_1.logTestInfoIfPresent)(`Add auto login flow: `, autoLogin);
+    (0, testsUtil_1.logTestInfoIfPresent)(`URL: `, url);
+    (0, testsUtil_1.logTestInfoIfPresent)(`Workspace: `, workspaceId);
+    (0, testsUtil_1.logTestInfoIfPresent)(`Account ID: `, account.id);
+    (0, testsUtil_1.logTestInfoIfPresent)(`Branch: `, branchName);
+    (0, testsUtil_1.logTestInfoIfPresent)(`Plan ID: `, planId);
+    (0, testsUtil_1.logTestInfoIfPresent)(`Application ID: `, applicationId);
+    (0, testsUtil_1.logTestInfoIfPresent)(`Environment ID: `, environmentId);
+    (0, testsUtil_1.logTestInfoIfPresent)(`Credentials ID: `, credentialsId);
+    (0, testsUtil_1.logTestInfoIfPresent)(`Datatable ID(s): `, dataTableIds === null || dataTableIds === void 0 ? void 0 : dataTableIds.join(', '));
+    (0, testsUtil_1.logTestInfoIfPresent)(`Test description: `, testDescription);
+    const scriptConfig = {
+        ...passThroughFields,
+        accountId: account.id,
+        branchName,
+        height: height !== null && height !== void 0 ? height : exports.DEFAULT_HEIGHT,
+        sender: exports.SENDER,
+        width: width !== null && width !== void 0 ? width : exports.DEFAULT_WIDTH,
+    };
+    await (0, openUtils_1.openUrlInDesktopApp)(ElectronProtocolUrl.TRAIN_NEW_TEST, scriptConfig);
 }
 exports.trainNewTest = trainNewTest;
 async function editTest(trainingSessionOptions) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const apiClient = await (0, util_1.getApiClientFromOptions)(trainingSessionOptions, true);
     let testRunIdConfig = { testId: '', filterHttpRequests: false };
     if (trainingSessionOptions.testRunId) {
@@ -69,31 +80,38 @@ async function editTest(trainingSessionOptions) {
     if (!((_g = test.flows) === null || _g === void 0 ? void 0 : _g.length)) {
         throw new Error(util_2.TEST_INFO_NOT_FOUND);
     }
+    const workspaceId = test.organization_id;
     if (branchName !== 'master') {
-        await (0, branches_1.checkBranchNameAndAutoBranchMaybe)(test.organization_id, apiClient, branchName, trainingSessionOptions.autoBranch);
+        await (0, branches_1.checkBranchNameAndAutoBranchMaybe)(workspaceId, apiClient, branchName, trainingSessionOptions.autoBranch);
     }
     const finalUrl = (0, testsUtil_1.getFinalUrl)(test, url);
     if (environmentId) {
         await apiClient.getEnvironment(environmentId);
     }
+    const account = await apiClient.getAccountByWorkspaceId(workspaceId);
     (0, testsUtil_1.logTestInfoIfPresent)(`Editing test in desktop app: `, `${test.name} - ${test.invariant_id}`);
     (0, testsUtil_1.logTestInfoIfPresent)(`Test description: `, test.description);
     (0, testsUtil_1.logTestInfoIfPresent)(`URL: `, finalUrl);
-    (0, testsUtil_1.logTestInfoIfPresent)(`Workspace: `, test.organization_id);
+    (0, testsUtil_1.logTestInfoIfPresent)(`Workspace: `, workspaceId);
     (0, testsUtil_1.logTestInfoIfPresent)(`Branch: `, branchName);
     (0, testsUtil_1.logTestInfoIfPresent)(`Environment ID: `, environmentId);
     (0, testsUtil_1.logTestInfoIfPresent)(`Credentials ID: `, credentialsId);
     const scriptConfig = {
+        accountId: account.id,
         applicationId: trainingSessionOptions.applicationId,
         branchName,
         credentialsId,
-        deploymentId: trainingSessionOptions.deploymentId,
+        disableIsolation: trainingSessionOptions.disableIsolation,
         environmentId,
-        testId,
-        testType: test.test_type,
-        workspaceId: test.organization_id,
+        height: (_h = trainingSessionOptions.height) !== null && _h !== void 0 ? _h : exports.DEFAULT_HEIGHT,
+        ignoreCertificateErrors: trainingSessionOptions.ignoreCertificateErrors,
         planId: testRunIdConfig.fromPlanId,
+        sender: exports.SENDER,
+        testId,
+        testType: (_j = test.test_type) !== null && _j !== void 0 ? _j : mablApi_1.Journey.TestTypeEnum.Browser,
         url: finalUrl,
+        width: (_k = trainingSessionOptions.width) !== null && _k !== void 0 ? _k : exports.DEFAULT_WIDTH,
+        workspaceId,
     };
     await (0, openUtils_1.openUrlInDesktopApp)(ElectronProtocolUrl.EDIT_TEST, scriptConfig);
 }