@mablhq/mabl-cli 1.21.7 → 1.22.1

package/mablscriptFind/index.js.LICENSE.txt

@@ -8,14 +8,14 @@
  */
 
 /**
- * @license Complex.js v2.0.15 12/05/2020
+ * @license Complex.js v2.1.1 12/05/2020
  *
  * Copyright (c) 2020, Robert Eisele (robert@xarg.org)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  **/
 
 /**
- * @license Fraction.js v4.1.3 23/05/2021
+ * @license Fraction.js v4.2.0 05/03/2022
  * https://www.xarg.org/2014/03/rational-numbers-in-javascript/
  *
  * Copyright (c) 2021, Robert Eisele (robert@xarg.org)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "1.21.7",
+  "version": "1.22.1",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",

package/providers/authenticationProvider.js

@@ -40,7 +40,7 @@ class AuthenticationProvider {
         return authConfig;
     }
     async maybeRenewAuthentication(authConfig) {
-        if (!authConfig.refreshToken) {
+        if (!authConfig.refreshToken || authConfig.authType === types_1.AuthType.ApiKey) {
             if (this.verbose) {
                 loggingProvider_1.logger.info(`Authentication refresh token ${chalk.red.bold('Not Found')}`);
             }

package/providers/cliConfigProvider.js

@@ -136,6 +136,10 @@ class CliConfigProvider {
     static async getWorkspace() {
         return (await getAuthConfigFile()).get(WORKSPACE);
     }
+    static async getProxyMode() {
+        const proxyMode = await this.getConfigProperty(configKeys_1.configKeys.proxyMode);
+        return (0, configKeys_1.isValidProxyMode)(proxyMode) ? proxyMode : 'mabl';
+    }
     static getConfigProperty(key) {
         return getValue(propertyKeyToStoredKey(key));
     }
@@ -166,13 +170,6 @@ class CliConfigProvider {
         const httpConfig = {
             sslVerify: httpUtil_1.EXECUTION_ENGINE_SSL_VERIFY,
         };
-        const proxyHostValue = await this.getConfigProperty(configKeys_1.configKeys.proxy);
-        if (proxyHostValue) {
-            if (typeof proxyHostValue !== 'string') {
-                throw new Error('Invalid proxy host value');
-            }
-            httpConfig.proxyHost = new URL(proxyHostValue);
-        }
         const sslVerifyValue = await this.getConfigProperty(configKeys_1.configKeys.sslVerify);
         if (sslVerifyValue !== undefined) {
             if (typeof sslVerifyValue !== 'boolean') {
@@ -180,13 +177,28 @@ class CliConfigProvider {
             }
             httpConfig.sslVerify = sslVerifyValue;
         }
+        const mablHttpConfig = { ...httpConfig };
+        const testHttpConfig = { ...httpConfig };
+        const proxyHostValue = await this.getConfigProperty(configKeys_1.configKeys.proxy);
+        const proxyMode = await this.getProxyMode();
+        if (proxyHostValue) {
+            if (typeof proxyHostValue !== 'string') {
+                throw new Error('Invalid proxy host value');
+            }
+            if (proxyMode === 'mabl' || proxyMode === 'all') {
+                mablHttpConfig.proxyHost = new URL(proxyHostValue);
+            }
+            if (proxyMode === 'test' || proxyMode === 'all') {
+                testHttpConfig.proxyHost = new URL(proxyHostValue);
+            }
+        }
         return {
             authentication,
             userId: config.get(USER_ID_NAME),
             email: config.get(EMAIL_NAME),
             userFullName: config.get(USER_FULL_NAME_NAME),
             workspace: config.get(WORKSPACE),
-            http: httpConfig,
+            http: { mabl: mablHttpConfig, test: testHttpConfig },
         };
     }
     static clearAuthConfig() {