@mablhq/mabl-cli 1.58.7 → 1.58.15

package/api/featureSet.js

@@ -5,6 +5,7 @@ const types_1 = require("../browserLauncher/types");
 const ACCESSIBILITY_CHECK_FEATURE_FLAG = 'accessibility_checks';
 const PERFORMANCE_TESTING_BROWSER_RUNS_FEATURE_FLAG = 'performance_testing_browser_runs';
 const SMARTER_WAIT_FEATURE_FLAG = 'smarter_wait';
+const CREDENTIALS_CLOUD = 'credentials_cloud';
 var FindImplementationVersion;
 (function (FindImplementationVersion) {
     FindImplementationVersion[FindImplementationVersion["V1"] = 0] = "V1";
@@ -25,6 +26,9 @@ class FeatureSet {
     hasAccessibilityChecksEnabled() {
         return this.featureFlags.has(ACCESSIBILITY_CHECK_FEATURE_FLAG);
     }
+    hasCloudCredentialsEnabled() {
+        return this.featureFlags.has(CREDENTIALS_CLOUD);
+    }
     hasPerformanceTestingBrowserRunsFeatureEnabled() {
         return this.featureFlags.has(PERFORMANCE_TESTING_BROWSER_RUNS_FEATURE_FLAG);
     }

package/commands/commandUtil/util.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseColinJoinedVariablePair = exports.validateValuePairInputs = exports.validateArrayInputs = exports.getWorkspaceIdFromAppOrEnv = exports.getJourneyFlowArray = exports.TEST_WITHOUT_FLOWS_MESSAGE = exports.getWorkspaceId = exports.failWrapper = exports.getDescribeDescriptions = void 0;
+exports.getCredentialType = exports.parseColinJoinedVariablePair = exports.validateValuePairInputs = exports.validateArrayInputs = exports.getWorkspaceIdFromAppOrEnv = exports.getJourneyFlowArray = exports.TEST_WITHOUT_FLOWS_MESSAGE = exports.getWorkspaceId = exports.failWrapper = exports.getDescribeDescriptions = void 0;
+const mablApi_1 = require("../../mablApi");
 const cliConfigProvider_1 = require("../../providers/cliConfigProvider");
 const constants_1 = require("../constants");
 const loggingProvider_1 = require("../../providers/logging/loggingProvider");
@@ -112,3 +113,14 @@ function parseColinJoinedVariablePair(input) {
     return { name, value };
 }
 exports.parseColinJoinedVariablePair = parseColinJoinedVariablePair;
+function getCredentialType(credential) {
+    if (credential.cloud_only) {
+        return credential.type === mablApi_1.Credentials.TypeEnum.Basic
+            ? 'Cloud'
+            : 'Cloud with MFA';
+    }
+    return credential.type === mablApi_1.Credentials.TypeEnum.Basic
+        ? 'Basic'
+        : 'Basic with MFA';
+}
+exports.getCredentialType = getCredentialType;

package/commands/credentials/credentials_cmds/list.js

@@ -11,6 +11,7 @@ const moment = require("moment");
 const list_1 = require("../../commandUtil/list");
 const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
 const constants_1 = require("../../constants");
+const chalk = require('chalk');
 exports.command = 'list';
 exports.describe = 'List your credentials';
 exports.builder = (0, list_1.getListBuilderOptions)('credentials');
@@ -20,11 +21,12 @@ async function listCredentials(parsed) {
     const limit = parsed.limit;
     const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
+    const hasCloudCredentialsEnabled = (await apiClient.getEffectiveFeaturesByWorkspaceId(workspaceId)).hasCloudCredentialsEnabled();
     const credentials = await apiClient.getCredentials(workspaceId, limit);
-    printCredentials(credentials, output);
+    printCredentials(credentials, output, hasCloudCredentialsEnabled);
     return credentials.length;
 }
-function printCredentials(credentials, output) {
+function printCredentials(credentials, output, hasCloudCredentialsEnabled) {
     switch (output) {
         case 'json':
             loggingProvider_1.logger.info(JSON.stringify(credentials, null, 2));
@@ -34,13 +36,18 @@ function printCredentials(credentials, output) {
             break;
         default:
             const table = new cli_table3_1.default({
-                head: ['ID', 'Name', 'Description', 'Created time'],
+                head: ['ID', 'Name', 'Type', 'Description', 'Created time'],
                 wordWrap: true,
             });
             credentials.forEach((credential) => {
                 table.push([
                     { rowSpan: 1, content: credential.id, vAlign: 'center' },
                     { rowSpan: 1, content: credential.name, vAlign: 'center' },
+                    {
+                        rowSpan: 1,
+                        content: (0, util_1.getCredentialType)(credential),
+                        vAlign: 'center',
+                    },
                     {
                         rowSpan: 1,
                         content: credential.description || '---',
@@ -56,4 +63,7 @@ function printCredentials(credentials, output) {
             loggingProvider_1.logger.info(table.toString());
             break;
     }
+    if (hasCloudCredentialsEnabled) {
+        loggingProvider_1.logger.info(chalk.bgBlack(chalk.yellow.bold('\nCloud credentials are not available for local runs.')));
+    }
 }

package/commands/tests/testsUtil.js

@@ -422,7 +422,7 @@ async function pullDownTestRunConfig(testRunId, apiClient) {
 }
 exports.pullDownTestRunConfig = pullDownTestRunConfig;
 async function extractTestRunConfig(executionMessage, apiClient) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     const journeyRun = (_a = executionMessage.journey_run) !== null && _a !== void 0 ? _a : (await apiClient.getTestRun(executionMessage.journey_run_id));
     const planRun = executionMessage.plan_run;
     const maybeRunnerType = ((_b = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _b === void 0 ? void 0 : _b.nodejs_runtime_variant)
@@ -431,20 +431,23 @@ async function extractTestRunConfig(executionMessage, apiClient) {
         : undefined;
     return {
         branchName: (_d = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _d === void 0 ? void 0 : _d.source_control_tag,
-        credentialsId: ((_e = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _e === void 0 ? void 0 : _e.credentials_required)
-            ? (_f = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _f === void 0 ? void 0 : _f.credentials_id
+        basicAuthCredentialsId: ((_e = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _e === void 0 ? void 0 : _e.http_auth_credentials_required)
+            ? (_f = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _f === void 0 ? void 0 : _f.http_auth_credentials_id
             : undefined,
-        dataTableVariables: ((_g = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _g === void 0 ? void 0 : _g.user_variables) &&
-            (0, utils_1.variableRowAsScenario)((_h = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _h === void 0 ? void 0 : _h.user_variables),
-        deviceEmulation: (_j = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _j === void 0 ? void 0 : _j.device_emulation,
-        environmentId: (_l = (_k = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _k === void 0 ? void 0 : _k.deployment) === null || _l === void 0 ? void 0 : _l.environment_id,
+        credentialsId: ((_g = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _g === void 0 ? void 0 : _g.credentials_required)
+            ? (_h = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _h === void 0 ? void 0 : _h.credentials_id
+            : undefined,
+        dataTableVariables: ((_j = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _j === void 0 ? void 0 : _j.user_variables) &&
+            (0, utils_1.variableRowAsScenario)((_k = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _k === void 0 ? void 0 : _k.user_variables),
+        deviceEmulation: (_l = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _l === void 0 ? void 0 : _l.device_emulation,
+        environmentId: (_o = (_m = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _m === void 0 ? void 0 : _m.deployment) === null || _o === void 0 ? void 0 : _o.environment_id,
         filterHttpRequests: true,
-        importedVariables: (_m = journeyRun.journey_parameters) === null || _m === void 0 ? void 0 : _m.imported_variables,
-        pageLoadWait: (_o = journeyRun.journey_parameters) === null || _o === void 0 ? void 0 : _o.page_load_wait,
+        importedVariables: (_p = journeyRun.journey_parameters) === null || _p === void 0 ? void 0 : _p.imported_variables,
+        pageLoadWait: (_q = journeyRun.journey_parameters) === null || _q === void 0 ? void 0 : _q.page_load_wait,
         runId: journeyRun.id,
         runnerType: maybeRunnerType,
-        testId: (_p = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey) === null || _p === void 0 ? void 0 : _p.invariant_id,
-        url: (_r = (_q = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _q === void 0 ? void 0 : _q.deployment) === null || _r === void 0 ? void 0 : _r.uri,
+        testId: (_r = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey) === null || _r === void 0 ? void 0 : _r.invariant_id,
+        url: (_t = (_s = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _s === void 0 ? void 0 : _s.deployment) === null || _t === void 0 ? void 0 : _t.uri,
     };
 }
 exports.extractTestRunConfig = extractTestRunConfig;

package/core/execution/TestResult.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TestResultStatus = void 0;
+exports.isApiTestResult = exports.TestResultStatus = void 0;
 var TestResultStatus;
 (function (TestResultStatus) {
     TestResultStatus["failed"] = "failed";
@@ -9,3 +9,7 @@ var TestResultStatus;
     TestResultStatus["stopped"] = "stopped";
     TestResultStatus["terminated"] = "terminated";
 })(TestResultStatus = exports.TestResultStatus || (exports.TestResultStatus = {}));
+function isApiTestResult(result) {
+    return 'flowResults' in result;
+}
+exports.isApiTestResult = isApiTestResult;

package/core/trainer/trainingSessions.js

@@ -8,6 +8,8 @@ const constants_1 = require("../../commands/constants");
 const util_1 = require("../util");
 const openUtils_1 = require("./openUtils");
 const util_2 = require("../../commands/commandUtil/util");
+const loggingProvider_1 = require("../../providers/logging/loggingProvider");
+const chalk = require('chalk');
 exports.DEFAULT_HEIGHT = 800;
 exports.DEFAULT_WIDTH = 1000;
 exports.SENDER = 'cli';
@@ -31,6 +33,13 @@ async function trainNewTest(trainingSessionOptions) {
     if (planId) {
         await apiClient.getPlan(planId);
     }
+    if (credentialsId) {
+        const credential = await apiClient.getCredential(credentialsId);
+        if (credential.cloud_only) {
+            loggingProvider_1.logger.error(chalk.red.bold(`Cannot use Cloud Credentials in the trainer. Use a basic one instead.`));
+            process.exit(1);
+        }
+    }
     if (applicationId) {
         await apiClient.getApplication(applicationId);
     }
@@ -70,6 +79,13 @@ async function editTest(trainingSessionOptions) {
     const credentialsId = (_b = trainingSessionOptions.credentialsId) !== null && _b !== void 0 ? _b : testRunIdConfig.credentialsId;
     const branchName = (_d = (_c = trainingSessionOptions.branchName) !== null && _c !== void 0 ? _c : testRunIdConfig.branchName) !== null && _d !== void 0 ? _d : constants_1.DefaultBranchName;
     const environmentId = (_e = trainingSessionOptions.environmentId) !== null && _e !== void 0 ? _e : testRunIdConfig.environmentId;
+    if (credentialsId) {
+        const credential = await apiClient.getCredential(credentialsId);
+        if (credential.cloud_only) {
+            loggingProvider_1.logger.error(chalk.red.bold(`Cannot use Cloud Credentials in the trainer. Use a basic one instead.`));
+            process.exit(1);
+        }
+    }
     const testId = (_f = trainingSessionOptions.testId) !== null && _f !== void 0 ? _f : testRunIdConfig.testId;
     if (!testId) {
         throw new Error('Unable to determine test Id run');