@mablhq/mabl-cli 2.50.12 → 2.51.1

package/cli.js

@@ -43,6 +43,7 @@ yargs
     .commandDir('./commands/branches')
     .commandDir('./commands/config')
     .commandDir('./commands/credentials')
+    .commandDir('./commands/databases')
     .commandDir('./commands/datatables')
     .commandDir('./commands/deploy')
     .commandDir('./commands/environments')

package/commands/environments/environments_cmds/urls_cmds/add.js

@@ -10,12 +10,12 @@ const chalk_1 = __importDefault(require("chalk"));
 const loggingProvider_1 = require("../../../../providers/logging/loggingProvider");
 const mablApi_1 = require("../../../../mablApi");
 const mablApiClientFactory_1 = require("../../../../api/mablApiClientFactory");
-exports.command = `add ${constants_1.CommandArgId}`;
-exports.describe = 'Associate urls with an environment';
+exports.command = `add <${constants_1.CommandArgId}>`;
+exports.describe = 'Associate URLs with an environment';
 exports.builder = (yargs) => {
     addEnvironmentUrlOptions(yargs)
         .positional(constants_1.CommandArgId, {
-        describe: 'Id of environment to add url associations to',
+        describe: 'Id of environment to add URL associations to',
         type: 'string',
     })
         .demandOption(constants_1.CommandArgApplicationId);
@@ -29,11 +29,11 @@ function addEnvironmentUrlOptions(yargs) {
         type: 'string',
     })
         .option(constants_1.CommandArgUrlApp, {
-        describe: 'web application urls to associate with the application-environment pair',
+        describe: 'web application URLs to associate with the application-environment pair',
         type: 'array',
     })
         .option(constants_1.CommandArgUrlApi, {
-        describe: 'api urls to associate with the application-environment pair',
+        describe: 'API URLs to associate with the application-environment pair',
         type: 'array',
     })
         .check((argv) => {

package/core/execution/ApiTestUtils.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PRE_REQUEST_LISTEN = exports.convertMablAssertionsToExecArray = exports.convertMablVariableAssignmentsToExecArray = exports.createMablGeneratedScripts = exports.insertMablAssertionScripts = exports.toPostmanScript = exports.replaceVariables = exports.getActualValue = exports.readBody = exports.getResponseContentType = exports.valueToUnquotedString = exports.assertionTypeSupportsCaseSensitivity = exports.assertionTargetSupportsCaseSensitivity = exports.humanizeAssertion = exports.getAssertionTargetArgument = exports.assertionHasTest = exports.isValidMablAssertion = exports.normalizeRegExpExpectedValue = exports.normalizeExpectedValue = exports.normalizeAssertionValue = exports.assertionRequiresValue = exports.filterValidMablAssertions = exports.filterValidMablVariableAssignments = exports.isValidMablVariableAssignment = exports.removeMablGeneratedScripts = exports.createEmptyRequestEvent = exports.findFirstMatchingEvent = exports.restoreCustomRequestFields = exports.deduplicateApiTestExecutionResults = exports.createEmptyVariable = exports.createEmptyAssertion = exports.humanizeAssertionType = exports.getAssertionTypesForTarget = exports.caseInsensitiveEquals = exports.compareStringsCaseInsensitive = exports.ASSERT_TYPES = exports.ASSERT_TARGETS = exports.COLLECTION_WITH_FOLDERS_ERROR = exports.HMAC_SHA1_SIGNATURE = exports.DEFAULT_ADD_OAUTH1_TO_HEADER_VALUE = exports.DEFAULT_OAUTH1_VERSION = exports.OAUTH1_AUTH = exports.NO_AUTH = exports.BEARER_TOKEN_AUTH = exports.BASIC_AUTH = exports.API_KEY_AUTH = exports.INHERIT_AUTH_FROM_PARENT_VALUE = exports.MABL_GENERATED_COMMENT = exports.MABL_GENERATED_ASSERTION_TOKEN = exports.TEST_LISTEN = void 0;
-exports.uuid = exports.createCommentForApiTestSnippet = exports.convertMablSnippetsToExecArray = exports.createPostmanScript = exports.insertMablScriptsIntoCollection = exports.processPostmanItem = exports.replaceRawScriptWithExecArray = exports.removeInvalidHeaders = exports.processItemAuth = exports.mablAuthToPostman = exports.formatContent = exports.getRequestMode = exports.getFormDataArray = exports.isText = exports.isXML = exports.isJson = exports.isSupportedAuthType = exports.isItemDefinition = exports.isCollectionDefinition = exports.isItemGroupDefinition = exports.isFolder = exports.validateCollectionFeaturesForApiTestEditor = exports.generateRawScriptField = exports.processPostmanItems = exports.createEmptyRequest = exports.createEmptyRequestEventArray = exports.splitLines = void 0;
+exports.uuid = exports.insertTestConfigurationIntoFlow = exports.createCommentForApiTestSnippet = exports.convertMablSnippetsToExecArray = exports.createPostmanScript = exports.insertMablScriptsIntoCollection = exports.processPostmanItem = exports.replaceRawScriptWithExecArray = exports.removeInvalidHeaders = exports.processItemAuth = exports.mablAuthToPostman = exports.formatContent = exports.getRequestMode = exports.getFormDataArray = exports.isText = exports.isXML = exports.isJson = exports.isSupportedAuthType = exports.isItemDefinition = exports.isCollectionDefinition = exports.isItemGroupDefinition = exports.isFolder = exports.validateCollectionFeaturesForApiTestEditor = exports.generateRawScriptField = exports.processPostmanItems = exports.createEmptyRequest = exports.createEmptyRequestEventArray = exports.splitLines = void 0;
 const newman_types_1 = require("./newman-types");
 const lodash_1 = __importDefault(require("lodash"));
 const uuid_1 = require("uuid");
@@ -997,13 +997,10 @@ function processPostmanItem(item) {
     removeInvalidHeaders(item);
 }
 exports.processPostmanItem = processPostmanItem;
-function insertMablScriptsIntoCollection(collection, getSnippet) {
+function insertMablScriptsIntoCollection(itemGroup, getSnippet) {
     var _a, _b;
-    (_a = collection.event) === null || _a === void 0 ? void 0 : _a.forEach((event) => insertMablScriptsIntoEvent(event, getSnippet));
-    (_b = collection.item) === null || _b === void 0 ? void 0 : _b.forEach((item) => {
-        var _a;
-        return (_a = item.event) === null || _a === void 0 ? void 0 : _a.forEach((event) => insertMablScriptsIntoEvent(event, getSnippet));
-    });
+    (_a = itemGroup.event) === null || _a === void 0 ? void 0 : _a.forEach((event) => insertMablScriptsIntoEvent(event, getSnippet));
+    (_b = itemGroup.item) === null || _b === void 0 ? void 0 : _b.forEach((item) => insertMablScriptsIntoCollection(item, getSnippet));
 }
 exports.insertMablScriptsIntoCollection = insertMablScriptsIntoCollection;
 function insertMablScriptsIntoEvent(event, getSnippet) {
@@ -1060,5 +1057,140 @@ function createCommentForApiTestSnippet(snippet, position) {
     return `// ${position} of one-time snippet "${(_b = snippet.name) !== null && _b !== void 0 ? _b : snippet.id}"`;
 }
 exports.createCommentForApiTestSnippet = createCommentForApiTestSnippet;
+function insertTestConfigurationIntoFlow(test, flow) {
+    var _a;
+    const collection = flow.api_steps;
+    const testConfiguration = test.api_configuration;
+    if (!testConfiguration) {
+        return;
+    }
+    const { authentication, pre_request_snippets: preRequestSnippets, post_request_snippets: postRequestSnippets, } = testConfiguration;
+    if (!authentication &&
+        !(preRequestSnippets === null || preRequestSnippets === void 0 ? void 0 : preRequestSnippets.length) &&
+        !(postRequestSnippets === null || postRequestSnippets === void 0 ? void 0 : postRequestSnippets.length)) {
+        return;
+    }
+    const folder = {
+        name: (_a = flow.id) !== null && _a !== void 0 ? _a : 'Flow',
+        item: collection.item,
+    };
+    folder.auth = collection.auth;
+    folder.event = collection.event;
+    delete collection.auth;
+    delete collection.event;
+    collection.item = [folder];
+    if (authentication) {
+        collection.auth = apiTestAuthToPostmanAuth(authentication);
+    }
+    const event = [];
+    if (preRequestSnippets === null || preRequestSnippets === void 0 ? void 0 : preRequestSnippets.length) {
+        event.push(executableSnippetsToPostmanEvent(preRequestSnippets, 'prerequest'));
+    }
+    if (postRequestSnippets === null || postRequestSnippets === void 0 ? void 0 : postRequestSnippets.length) {
+        event.push(executableSnippetsToPostmanEvent(postRequestSnippets, 'test'));
+    }
+    if (event.length) {
+        collection.event = event;
+    }
+}
+exports.insertTestConfigurationIntoFlow = insertTestConfigurationIntoFlow;
+function apiTestAuthToPostmanAuth(apiTestAuth) {
+    const postmanAuth = {
+        type: `${apiTestAuth.type}`,
+    };
+    switch (apiTestAuth.type) {
+        case 'apikey':
+            postmanAuth.apikey = apiKeyAuthenticationToPostman(apiTestAuth.api_key);
+            break;
+        case 'basic':
+            postmanAuth.basic = basicAuthenticationToPostman(apiTestAuth.basic);
+            break;
+        case 'bearer':
+            postmanAuth.bearer = bearerAuthenticationToPostman(apiTestAuth.bearer);
+            break;
+        case 'oauth1':
+            postmanAuth.oauth1 = oauth1AuthenticationToPostman(apiTestAuth.oauth1);
+            break;
+    }
+    return postmanAuth;
+}
+function apiKeyAuthenticationToPostman(auth) {
+    return removeUndefinedValues([
+        toPostmanConfigurationValue('key', auth === null || auth === void 0 ? void 0 : auth.key),
+        toPostmanConfigurationValue('value', auth === null || auth === void 0 ? void 0 : auth.value),
+        toPostmanConfigurationValue('in', auth === null || auth === void 0 ? void 0 : auth.location),
+    ]);
+}
+function basicAuthenticationToPostman(auth) {
+    return removeUndefinedValues([
+        toPostmanConfigurationValue('username', auth === null || auth === void 0 ? void 0 : auth.username),
+        toPostmanConfigurationValue('password', auth === null || auth === void 0 ? void 0 : auth.password),
+    ]);
+}
+function bearerAuthenticationToPostman(auth) {
+    return removeUndefinedValues([
+        toPostmanConfigurationValue('token', auth === null || auth === void 0 ? void 0 : auth.token),
+    ]);
+}
+function oauth1AuthenticationToPostman(auth) {
+    return removeUndefinedValues([
+        toPostmanConfigurationValue('addParamsToHeader', auth === null || auth === void 0 ? void 0 : auth.add_parameters_to_header, 'boolean'),
+        toPostmanConfigurationValue('addEmptyParamsToSign', auth === null || auth === void 0 ? void 0 : auth.add_empty_parameters_to_signature, 'boolean'),
+        toPostmanConfigurationValue('callback', auth === null || auth === void 0 ? void 0 : auth.callback_url),
+        toPostmanConfigurationValue('consumerKey', auth === null || auth === void 0 ? void 0 : auth.consumer_key),
+        toPostmanConfigurationValue('consumerSecret', auth === null || auth === void 0 ? void 0 : auth.consumer_secret),
+        toPostmanConfigurationValue('includeBodyHash', auth === null || auth === void 0 ? void 0 : auth.include_body_hash, 'boolean'),
+        toPostmanConfigurationValue('nonce', auth === null || auth === void 0 ? void 0 : auth.nonce),
+        toPostmanConfigurationValue('realm', auth === null || auth === void 0 ? void 0 : auth.realm),
+        toPostmanConfigurationValue('signatureMethod', auth === null || auth === void 0 ? void 0 : auth.signature_method),
+        toPostmanConfigurationValue('timestamp', auth === null || auth === void 0 ? void 0 : auth.timestamp),
+        toPostmanConfigurationValue('token', auth === null || auth === void 0 ? void 0 : auth.token),
+        toPostmanConfigurationValue('tokenSecret', auth === null || auth === void 0 ? void 0 : auth.token_secret),
+        toPostmanConfigurationValue('verifier', auth === null || auth === void 0 ? void 0 : auth.verifier),
+        toPostmanConfigurationValue('version', auth === null || auth === void 0 ? void 0 : auth.version),
+    ]);
+}
+const removeUndefinedValues = (values) => values.filter((value) => value !== undefined);
+function toPostmanConfigurationValue(key, value, type = 'string') {
+    if (!value) {
+        return;
+    }
+    if (type === 'string') {
+        value = `${value}`;
+    }
+    if (type === 'boolean') {
+        value = `${value}`.toLowerCase() === 'true';
+    }
+    return {
+        key,
+        value,
+        type,
+    };
+}
+function executableSnippetsToPostmanEvent(snippets, type) {
+    return {
+        id: (0, exports.uuid)(),
+        listen: type,
+        mablSnippets: snippets.map((snippet) => executableSnippetToApiTestSnippet(snippet)),
+        script: {
+            exec: [],
+            id: (0, exports.uuid)(),
+            type: 'text/javascript',
+        },
+    };
+}
+function executableSnippetToApiTestSnippet(executableSnippet) {
+    const { invariant_id: invariantId, ...snippet } = { ...executableSnippet };
+    if (executableSnippet.reusable) {
+        return {
+            invariantId: invariantId,
+            reusable: true,
+        };
+    }
+    return {
+        ...snippet,
+        reusable: false,
+    };
+}
 const uuid = () => (0, uuid_1.v4)();
 exports.uuid = uuid;