@hubspot/local-dev-lib 0.4.2-experimental.0 → 0.5.0-experimental.0

package/config/utils.js

@@ -0,0 +1,326 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isConfigAccountValid = exports.getConfigAccountIndexById = exports.getConfigAccountByInferredIdentifier = exports.getConfigAccountByIdentifier = exports.getAccountIdentifierAndType = exports.buildConfigFromEnvironment = exports.parseConfig = exports.normalizeParsedConfig = exports.writeConfigFile = exports.formatConfigForWrite = exports.removeUndefinedFieldsFromConfigAccount = exports.readConfigFile = exports.getConfigPathEnvironmentVariables = exports.getLocalConfigDefaultFilePath = exports.getLocalConfigFilePath = exports.getGlobalConfigFilePath = void 0;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const findup_sync_1 = __importDefault(require("findup-sync"));
+const config_1 = require("../constants/config");
+const auth_1 = require("../constants/auth");
+const FileSystemError_1 = require("../models/FileSystemError");
+const logger_1 = require("../lib/logger");
+const environment_1 = require("../lib/environment");
+const path_1 = require("../lib/path");
+const files_1 = require("../constants/files");
+const lang_1 = require("../utils/lang");
+function getGlobalConfigFilePath() {
+    return config_1.GLOBAL_CONFIG_PATH;
+}
+exports.getGlobalConfigFilePath = getGlobalConfigFilePath;
+function getLocalConfigFilePath() {
+    return (0, findup_sync_1.default)([
+        config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+        config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME.replace('.yml', '.yaml'),
+    ]);
+}
+exports.getLocalConfigFilePath = getLocalConfigFilePath;
+function getLocalConfigDefaultFilePath() {
+    return `${(0, path_1.getCwd)()}/${config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}`;
+}
+exports.getLocalConfigDefaultFilePath = getLocalConfigDefaultFilePath;
+function getConfigPathEnvironmentVariables() {
+    const configFilePathFromEnvironment = process.env[config_1.ENVIRONMENT_VARIABLES.HUBSPOT_CONFIG_PATH];
+    const useEnvironmentConfig = process.env[config_1.ENVIRONMENT_VARIABLES.USE_ENVIRONMENT_HUBSPOT_CONFIG] ===
+        'true';
+    if (configFilePathFromEnvironment && useEnvironmentConfig) {
+        throw new Error((0, lang_1.i18n)('config.utils.getConfigPathEnvironmentVariables.invalidEnvironmentVariables'));
+    }
+    return {
+        configFilePathFromEnvironment,
+        useEnvironmentConfig,
+    };
+}
+exports.getConfigPathEnvironmentVariables = getConfigPathEnvironmentVariables;
+function readConfigFile(configPath) {
+    let source = '';
+    try {
+        source = fs_extra_1.default.readFileSync(configPath).toString();
+    }
+    catch (err) {
+        throw new FileSystemError_1.FileSystemError({ cause: err }, {
+            filepath: configPath,
+            operation: 'read',
+        });
+    }
+    return source;
+}
+exports.readConfigFile = readConfigFile;
+function removeUndefinedFieldsFromConfigAccount(account) {
+    Object.keys(account).forEach(k => {
+        const key = k;
+        if (account[key] === undefined) {
+            delete account[key];
+        }
+    });
+    if ('auth' in account && account.auth) {
+        if (account.authType === auth_1.OAUTH_AUTH_METHOD.value) {
+            Object.keys(account.auth).forEach(k => {
+                const key = k;
+                if (account.auth?.[key] === undefined) {
+                    delete account.auth?.[key];
+                }
+            });
+        }
+        if ('tokenInfo' in account.auth &&
+            typeof account.auth.tokenInfo === 'object') {
+            Object.keys(account.auth.tokenInfo).forEach(k => {
+                const key = k;
+                if (account.auth?.tokenInfo[key] === undefined) {
+                    delete account.auth?.tokenInfo[key];
+                }
+            });
+        }
+    }
+    return account;
+}
+exports.removeUndefinedFieldsFromConfigAccount = removeUndefinedFieldsFromConfigAccount;
+// Ensure written config files have fields in a consistent order
+function formatConfigForWrite(config) {
+    const { defaultAccount, defaultCmsPublishMode, httpTimeout, allowUsageTracking, accounts, ...rest } = config;
+    const orderedConfig = {
+        ...(defaultAccount && { defaultAccount }),
+        defaultCmsPublishMode,
+        httpTimeout,
+        allowUsageTracking,
+        ...rest,
+        accounts: accounts.map(account => {
+            const { name, accountId, env, authType, ...rest } = account;
+            return {
+                name,
+                accountId,
+                env,
+                authType,
+                ...rest,
+            };
+        }),
+    };
+    return removeUndefinedFieldsFromConfigAccount(orderedConfig);
+}
+exports.formatConfigForWrite = formatConfigForWrite;
+function writeConfigFile(config, configPath) {
+    const source = js_yaml_1.default.dump(JSON.parse(JSON.stringify(formatConfigForWrite(config), null, 2)));
+    try {
+        fs_extra_1.default.ensureFileSync(configPath);
+        fs_extra_1.default.writeFileSync(configPath, source);
+    }
+    catch (err) {
+        throw new FileSystemError_1.FileSystemError({ cause: err }, {
+            filepath: configPath,
+            operation: 'write',
+        });
+    }
+}
+exports.writeConfigFile = writeConfigFile;
+function getAccountType(sandboxAccountType) {
+    if (sandboxAccountType) {
+        if (sandboxAccountType.toUpperCase() === 'DEVELOPER') {
+            return config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
+        }
+        if (sandboxAccountType.toUpperCase() === 'STANDARD') {
+            return config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
+        }
+    }
+    return config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD;
+}
+function normalizeParsedConfig(parsedConfig) {
+    if (parsedConfig.portals) {
+        parsedConfig.accounts = parsedConfig.portals.map(account => {
+            if (account.portalId) {
+                account.accountId = account.portalId;
+                delete account.portalId;
+            }
+            if (!account.accountType) {
+                account.accountType = getAccountType(account.sandboxAccountType);
+                delete account.sandboxAccountType;
+            }
+            return account;
+        });
+        delete parsedConfig.portals;
+    }
+    if (parsedConfig.defaultPortal) {
+        const defaultAccount = getConfigAccountByInferredIdentifier(parsedConfig.accounts, parsedConfig.defaultPortal);
+        if (defaultAccount) {
+            parsedConfig.defaultAccount = defaultAccount.accountId;
+        }
+        delete parsedConfig.defaultPortal;
+    }
+    if (parsedConfig.defaultMode) {
+        parsedConfig.defaultCmsPublishMode = parsedConfig.defaultMode;
+        delete parsedConfig.defaultMode;
+    }
+    return parsedConfig;
+}
+exports.normalizeParsedConfig = normalizeParsedConfig;
+function parseConfig(configSource) {
+    let parsedYaml;
+    try {
+        parsedYaml = js_yaml_1.default.load(configSource);
+    }
+    catch (err) {
+        throw new Error((0, lang_1.i18n)('config.utils.parseConfig.error'), { cause: err });
+    }
+    return normalizeParsedConfig(parsedYaml);
+}
+exports.parseConfig = parseConfig;
+function buildConfigFromEnvironment() {
+    const apiKey = process.env[config_1.ENVIRONMENT_VARIABLES.HUBSPOT_API_KEY];
+    const clientId = process.env[config_1.ENVIRONMENT_VARIABLES.HUBSPOT_CLIENT_ID];
+    const clientSecret = process.env[config_1.ENVIRONMENT_VARIABLES.HUBSPOT_CLIENT_SECRET];
+    const personalAccessKey = process.env[config_1.ENVIRONMENT_VARIABLES.HUBSPOT_PERSONAL_ACCESS_KEY];
+    const accountIdVar = process.env[config_1.ENVIRONMENT_VARIABLES.HUBSPOT_ACCOUNT_ID] ||
+        process.env[config_1.ENVIRONMENT_VARIABLES.HUBSPOT_PORTAL_ID];
+    const refreshToken = process.env[config_1.ENVIRONMENT_VARIABLES.HUBSPOT_REFRESH_TOKEN];
+    const hubspotEnvironment = process.env[config_1.ENVIRONMENT_VARIABLES.HUBSPOT_ENVIRONMENT];
+    const httpTimeoutVar = process.env[config_1.ENVIRONMENT_VARIABLES.HTTP_TIMEOUT];
+    const httpUseLocalhostVar = process.env[config_1.ENVIRONMENT_VARIABLES.HTTP_USE_LOCALHOST];
+    const allowUsageTrackingVar = process.env[config_1.ENVIRONMENT_VARIABLES.ALLOW_USAGE_TRACKING];
+    const defaultCmsPublishModeVar = process.env[config_1.ENVIRONMENT_VARIABLES.DEFAULT_CMS_PUBLISH_MODE];
+    if (!accountIdVar) {
+        throw new Error((0, lang_1.i18n)('config.utils.buildConfigFromEnvironment.missingAccountId'));
+    }
+    const accountId = parseInt(accountIdVar);
+    const httpTimeout = httpTimeoutVar ? parseInt(httpTimeoutVar) : undefined;
+    const httpUseLocalhost = httpUseLocalhostVar
+        ? httpUseLocalhostVar === 'true'
+        : undefined;
+    const allowUsageTracking = allowUsageTrackingVar
+        ? allowUsageTrackingVar === 'true'
+        : undefined;
+    const defaultCmsPublishMode = defaultCmsPublishModeVar === files_1.CMS_PUBLISH_MODE.draft ||
+        defaultCmsPublishModeVar === files_1.CMS_PUBLISH_MODE.publish
+        ? defaultCmsPublishModeVar
+        : undefined;
+    const env = (0, environment_1.getValidEnv)(hubspotEnvironment);
+    let account;
+    if (personalAccessKey) {
+        account = {
+            authType: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+            accountId,
+            personalAccessKey,
+            env,
+            name: accountIdVar,
+            auth: {
+                tokenInfo: {},
+            },
+        };
+    }
+    else if (clientId && clientSecret && refreshToken) {
+        account = {
+            authType: auth_1.OAUTH_AUTH_METHOD.value,
+            accountId,
+            auth: {
+                clientId,
+                clientSecret,
+                scopes: auth_1.OAUTH_SCOPES.map((scope) => scope.value),
+                tokenInfo: {
+                    refreshToken,
+                },
+            },
+            env,
+            name: accountIdVar,
+        };
+    }
+    else if (apiKey) {
+        account = {
+            authType: auth_1.API_KEY_AUTH_METHOD.value,
+            accountId,
+            apiKey,
+            env,
+            name: accountIdVar,
+        };
+    }
+    else {
+        throw new Error((0, lang_1.i18n)('config.utils.buildConfigFromEnvironment.invalidAuthType'));
+    }
+    return {
+        accounts: [account],
+        defaultAccount: accountId,
+        httpTimeout,
+        httpUseLocalhost,
+        allowUsageTracking,
+        defaultCmsPublishMode,
+    };
+}
+exports.buildConfigFromEnvironment = buildConfigFromEnvironment;
+function getAccountIdentifierAndType(accountIdentifier) {
+    const identifierAsNumber = typeof accountIdentifier === 'number'
+        ? accountIdentifier
+        : parseInt(accountIdentifier);
+    const isId = !isNaN(identifierAsNumber);
+    return {
+        identifier: isId ? identifierAsNumber : accountIdentifier,
+        identifierType: isId
+            ? config_1.ACCOUNT_IDENTIFIERS.ACCOUNT_ID
+            : config_1.ACCOUNT_IDENTIFIERS.NAME,
+    };
+}
+exports.getAccountIdentifierAndType = getAccountIdentifierAndType;
+function getConfigAccountByIdentifier(accounts, identifierFieldName, identifier) {
+    return accounts.find(account => account[identifierFieldName] === identifier);
+}
+exports.getConfigAccountByIdentifier = getConfigAccountByIdentifier;
+function getConfigAccountByInferredIdentifier(accounts, accountIdentifier) {
+    const { identifier, identifierType } = getAccountIdentifierAndType(accountIdentifier);
+    return accounts.find(account => account[identifierType] === identifier);
+}
+exports.getConfigAccountByInferredIdentifier = getConfigAccountByInferredIdentifier;
+function getConfigAccountIndexById(accounts, id) {
+    return accounts.findIndex(account => account.accountId === id);
+}
+exports.getConfigAccountIndexById = getConfigAccountIndexById;
+function isConfigAccountValid(account) {
+    if (!account || typeof account !== 'object') {
+        logger_1.logger.debug((0, lang_1.i18n)('config.utils.isConfigAccountValid.missingAccount'));
+        return false;
+    }
+    if (!account.accountId) {
+        logger_1.logger.debug((0, lang_1.i18n)('config.utils.isConfigAccountValid.missingAccountId'));
+        return false;
+    }
+    if (!account.authType) {
+        logger_1.logger.debug((0, lang_1.i18n)('config.utils.isConfigAccountValid.missingAuthType', {
+            accountId: account.accountId,
+        }));
+        return false;
+    }
+    let valid = false;
+    if (account.authType === auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
+        valid =
+            'personalAccessKey' in account && Boolean(account.personalAccessKey);
+        if (!valid) {
+            logger_1.logger.debug((0, lang_1.i18n)('config.utils.isConfigAccountValid.missingPersonalAccessKey', {
+                accountId: account.accountId,
+            }));
+        }
+    }
+    if (account.authType === auth_1.OAUTH_AUTH_METHOD.value) {
+        valid = 'auth' in account && Boolean(account.auth);
+        if (!valid) {
+            logger_1.logger.debug((0, lang_1.i18n)('config.utils.isConfigAccountValid.missingAuth', {
+                accountId: account.accountId,
+            }));
+        }
+    }
+    if (account.authType === auth_1.API_KEY_AUTH_METHOD.value) {
+        valid = 'apiKey' in account && Boolean(account.apiKey);
+        if (!valid) {
+            logger_1.logger.debug((0, lang_1.i18n)('config.utils.isConfigAccountValid.missingApiKey', {
+                accountId: account.accountId,
+            }));
+        }
+    }
+    return valid;
+}
+exports.isConfigAccountValid = isConfigAccountValid;

package/constants/config.d.ts

@@ -2,7 +2,9 @@ export declare const DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = "hubspot.config.yml
 export declare const ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME = "archived.hubspot.config.yml";
 export declare const HUBSPOT_CONFIGURATION_FOLDER = ".hscli";
 export declare const HUBSPOT_CONFIGURATION_FILE = "config.yml";
+export declare const HUBSPOT_STATE_FILE = "state.json";
 export declare const GLOBAL_CONFIG_PATH: string;
+export declare const STATE_FILE_PATH: string;
 export declare const DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = ".hsaccount";
 export declare const DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = "DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID";
 export declare const DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = "DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND";
@@ -11,6 +13,8 @@ export declare const HTTP_TIMEOUT = "httpTimeout";
 export declare const ENV = "env";
 export declare const HTTP_USE_LOCALHOST = "httpUseLocalhost";
 export declare const ALLOW_USAGE_TRACKING = "allowUsageTracking";
+export declare const AUTO_OPEN_BROWSER = "autoOpenBrowser";
+export declare const ALLOW_AUTO_UPDATES = "allowAutoUpdates";
 export declare const DEFAULT_ACCOUNT = "defaultAccount";
 export declare const DEFAULT_PORTAL = "defaultPortal";
 export declare const MIN_HTTP_TIMEOUT = 3000;
@@ -28,3 +32,27 @@ export declare const HUBSPOT_ACCOUNT_TYPE_STRINGS: {
     readonly APP_DEVELOPER: string;
     readonly STANDARD: string;
 };
+export declare const CONFIG_FLAGS: {
+    readonly USE_CUSTOM_OBJECT_HUBFILE: "useCustomObjectHubfile";
+    readonly HTTP_USE_LOCALHOST: "httpUseLocalhost";
+};
+export declare const ENVIRONMENT_VARIABLES: {
+    readonly HUBSPOT_API_KEY: "HUBSPOT_API_KEY";
+    readonly HUBSPOT_CLIENT_ID: "HUBSPOT_CLIENT_ID";
+    readonly HUBSPOT_CLIENT_SECRET: "HUBSPOT_CLIENT_SECRET";
+    readonly HUBSPOT_PERSONAL_ACCESS_KEY: "HUBSPOT_PERSONAL_ACCESS_KEY";
+    readonly HUBSPOT_ACCOUNT_ID: "HUBSPOT_ACCOUNT_ID";
+    readonly HUBSPOT_PORTAL_ID: "HUBSPOT_PORTAL_ID";
+    readonly HUBSPOT_REFRESH_TOKEN: "HUBSPOT_REFRESH_TOKEN";
+    readonly HUBSPOT_ENVIRONMENT: "HUBSPOT_ENVIRONMENT";
+    readonly HTTP_TIMEOUT: "HTTP_TIMEOUT";
+    readonly HTTP_USE_LOCALHOST: "HTTP_USE_LOCALHOST";
+    readonly ALLOW_USAGE_TRACKING: "ALLOW_USAGE_TRACKING";
+    readonly DEFAULT_CMS_PUBLISH_MODE: "DEFUALT_CMS_PUBLISH_MODE";
+    readonly USE_ENVIRONMENT_HUBSPOT_CONFIG: "USE_ENVIRONMENT_HUBSPOT_CONFIG";
+    readonly HUBSPOT_CONFIG_PATH: "HUBSPOT_CONFIG_PATH";
+};
+export declare const ACCOUNT_IDENTIFIERS: {
+    readonly ACCOUNT_ID: "accountId";
+    readonly NAME: "name";
+};

package/constants/config.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HUBSPOT_ACCOUNT_TYPE_STRINGS = exports.HUBSPOT_ACCOUNT_TYPES = exports.MIN_HTTP_TIMEOUT = exports.DEFAULT_PORTAL = exports.DEFAULT_ACCOUNT = exports.ALLOW_USAGE_TRACKING = exports.HTTP_USE_LOCALHOST = exports.ENV = exports.HTTP_TIMEOUT = exports.DEFAULT_CMS_PUBLISH_MODE = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = exports.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = exports.GLOBAL_CONFIG_PATH = exports.HUBSPOT_CONFIGURATION_FILE = exports.HUBSPOT_CONFIGURATION_FOLDER = exports.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME = exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = void 0;
+exports.ACCOUNT_IDENTIFIERS = exports.ENVIRONMENT_VARIABLES = exports.CONFIG_FLAGS = exports.HUBSPOT_ACCOUNT_TYPE_STRINGS = exports.HUBSPOT_ACCOUNT_TYPES = exports.MIN_HTTP_TIMEOUT = exports.DEFAULT_PORTAL = exports.DEFAULT_ACCOUNT = exports.ALLOW_AUTO_UPDATES = exports.AUTO_OPEN_BROWSER = exports.ALLOW_USAGE_TRACKING = exports.HTTP_USE_LOCALHOST = exports.ENV = exports.HTTP_TIMEOUT = exports.DEFAULT_CMS_PUBLISH_MODE = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = exports.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = exports.STATE_FILE_PATH = exports.GLOBAL_CONFIG_PATH = exports.HUBSPOT_STATE_FILE = exports.HUBSPOT_CONFIGURATION_FILE = exports.HUBSPOT_CONFIGURATION_FOLDER = exports.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME = exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = void 0;
 const lang_1 = require("../utils/lang");
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
@@ -11,7 +11,9 @@ exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = 'hubspot.config.yml';
 exports.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME = 'archived.hubspot.config.yml';
 exports.HUBSPOT_CONFIGURATION_FOLDER = '.hscli';
 exports.HUBSPOT_CONFIGURATION_FILE = 'config.yml';
+exports.HUBSPOT_STATE_FILE = 'state.json';
 exports.GLOBAL_CONFIG_PATH = path_1.default.join(os_1.default.homedir(), exports.HUBSPOT_CONFIGURATION_FOLDER, exports.HUBSPOT_CONFIGURATION_FILE);
+exports.STATE_FILE_PATH = path_1.default.join(os_1.default.homedir(), exports.HUBSPOT_CONFIGURATION_FOLDER, exports.HUBSPOT_STATE_FILE);
 exports.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = '.hsaccount';
 exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = 'DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID';
 exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = 'DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND';
@@ -20,6 +22,8 @@ exports.HTTP_TIMEOUT = 'httpTimeout';
 exports.ENV = 'env';
 exports.HTTP_USE_LOCALHOST = 'httpUseLocalhost';
 exports.ALLOW_USAGE_TRACKING = 'allowUsageTracking';
+exports.AUTO_OPEN_BROWSER = 'autoOpenBrowser';
+exports.ALLOW_AUTO_UPDATES = 'allowAutoUpdates';
 exports.DEFAULT_ACCOUNT = 'defaultAccount';
 exports.DEFAULT_PORTAL = 'defaultPortal';
 exports.MIN_HTTP_TIMEOUT = 3000;
@@ -37,3 +41,27 @@ exports.HUBSPOT_ACCOUNT_TYPE_STRINGS = {
     APP_DEVELOPER: (0, lang_1.i18n)('lib.accountTypes.appDeveloper'),
     STANDARD: (0, lang_1.i18n)('lib.accountTypes.standard'),
 };
+exports.CONFIG_FLAGS = {
+    USE_CUSTOM_OBJECT_HUBFILE: 'useCustomObjectHubfile',
+    HTTP_USE_LOCALHOST: 'httpUseLocalhost',
+};
+exports.ENVIRONMENT_VARIABLES = {
+    HUBSPOT_API_KEY: 'HUBSPOT_API_KEY',
+    HUBSPOT_CLIENT_ID: 'HUBSPOT_CLIENT_ID',
+    HUBSPOT_CLIENT_SECRET: 'HUBSPOT_CLIENT_SECRET',
+    HUBSPOT_PERSONAL_ACCESS_KEY: 'HUBSPOT_PERSONAL_ACCESS_KEY',
+    HUBSPOT_ACCOUNT_ID: 'HUBSPOT_ACCOUNT_ID',
+    HUBSPOT_PORTAL_ID: 'HUBSPOT_PORTAL_ID',
+    HUBSPOT_REFRESH_TOKEN: 'HUBSPOT_REFRESH_TOKEN',
+    HUBSPOT_ENVIRONMENT: 'HUBSPOT_ENVIRONMENT',
+    HTTP_TIMEOUT: 'HTTP_TIMEOUT',
+    HTTP_USE_LOCALHOST: 'HTTP_USE_LOCALHOST',
+    ALLOW_USAGE_TRACKING: 'ALLOW_USAGE_TRACKING',
+    DEFAULT_CMS_PUBLISH_MODE: 'DEFUALT_CMS_PUBLISH_MODE',
+    USE_ENVIRONMENT_HUBSPOT_CONFIG: 'USE_ENVIRONMENT_HUBSPOT_CONFIG',
+    HUBSPOT_CONFIG_PATH: 'HUBSPOT_CONFIG_PATH',
+};
+exports.ACCOUNT_IDENTIFIERS = {
+    ACCOUNT_ID: 'accountId',
+    NAME: 'name',
+};

package/constants/environments.d.ts

@@ -2,14 +2,3 @@ export declare const ENVIRONMENTS: {
     readonly PROD: "prod";
     readonly QA: "qa";
 };
-export declare const ENVIRONMENT_VARIABLES: {
-    readonly HUBSPOT_API_KEY: "HUBSPOT_API_KEY";
-    readonly HUBSPOT_CLIENT_ID: "HUBSPOT_CLIENT_ID";
-    readonly HUBSPOT_CLIENT_SECRET: "HUBSPOT_CLIENT_SECRET";
-    readonly HUBSPOT_PERSONAL_ACCESS_KEY: "HUBSPOT_PERSONAL_ACCESS_KEY";
-    readonly HUBSPOT_ACCOUNT_ID: "HUBSPOT_ACCOUNT_ID";
-    readonly HUBSPOT_PORTAL_ID: "HUBSPOT_PORTAL_ID";
-    readonly HUBSPOT_REFRESH_TOKEN: "HUBSPOT_REFRESH_TOKEN";
-    readonly HUBSPOT_ENVIRONMENT: "HUBSPOT_ENVIRONMENT";
-    readonly HTTP_TIMEOUT: "HTTP_TIMEOUT";
-};

package/constants/environments.js

@@ -1,18 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENVIRONMENT_VARIABLES = exports.ENVIRONMENTS = void 0;
+exports.ENVIRONMENTS = void 0;
 exports.ENVIRONMENTS = {
     PROD: 'prod',
     QA: 'qa',
 };
-exports.ENVIRONMENT_VARIABLES = {
-    HUBSPOT_API_KEY: 'HUBSPOT_API_KEY',
-    HUBSPOT_CLIENT_ID: 'HUBSPOT_CLIENT_ID',
-    HUBSPOT_CLIENT_SECRET: 'HUBSPOT_CLIENT_SECRET',
-    HUBSPOT_PERSONAL_ACCESS_KEY: 'HUBSPOT_PERSONAL_ACCESS_KEY',
-    HUBSPOT_ACCOUNT_ID: 'HUBSPOT_ACCOUNT_ID',
-    HUBSPOT_PORTAL_ID: 'HUBSPOT_PORTAL_ID',
-    HUBSPOT_REFRESH_TOKEN: 'HUBSPOT_REFRESH_TOKEN',
-    HUBSPOT_ENVIRONMENT: 'HUBSPOT_ENVIRONMENT',
-    HTTP_TIMEOUT: 'HTTP_TIMEOUT',
-};

package/http/getAxiosConfig.js

@@ -41,7 +41,13 @@ const DEFAULT_TRANSITIONAL = {
 };
 function getAxiosConfig(options) {
     const { env, localHostOverride, headers, ...rest } = options;
-    const config = (0, config_1.getAndLoadConfigIfNeeded)();
+    let config;
+    try {
+        config = (0, config_1.getConfig)();
+    }
+    catch (e) {
+        config = null;
+    }
     let httpTimeout = 15000;
     let httpUseLocalhost = false;
     if (config && config.httpTimeout) {

package/http/index.js

@@ -39,6 +39,7 @@ const oauth_1 = require("../lib/oauth");
 const logger_1 = require("../lib/logger");
 const lang_1 = require("../utils/lang");
 const HubSpotHttpError_1 = require("../models/HubSpotHttpError");
+const auth_1 = require("../constants/auth");
 const localDevAuth_1 = require("../api/localDevAuth");
 const util = __importStar(require("util"));
 const i18nKey = 'http.index';
@@ -82,11 +83,11 @@ function addUserAgentHeader(key, value) {
     getAxiosConfig_1.USER_AGENTS[key] = value;
 }
 exports.addUserAgentHeader = addUserAgentHeader;
-async function withOauth(accountId, accountConfig, axiosConfig) {
+async function withOauth(account, axiosConfig) {
     const { headers } = axiosConfig;
-    const oauth = (0, oauth_1.getOauthManager)(accountId, accountConfig);
+    const oauth = (0, oauth_1.getOauthManager)(account);
     if (!oauth) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.withOauth`, { accountId }));
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.withOauth`, { accountId: account.accountId }));
     }
     const accessToken = await oauth.accessToken();
     return {
@@ -119,26 +120,29 @@ function withPortalId(portalId, axiosConfig) {
     };
 }
 async function withAuth(accountId, options) {
-    const accountConfig = (0, config_1.getAccountConfig)(accountId);
-    if (!accountConfig) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.withAuth`, { accountId }));
-    }
-    const { env, authType, apiKey } = accountConfig;
+    const account = (0, config_1.getConfigAccountById)(accountId);
+    const { env, authType } = account;
     const axiosConfig = withPortalId(accountId, (0, getAxiosConfig_1.getAxiosConfig)({ env, ...options }));
-    if (authType === 'personalaccesskey') {
+    if (authType === auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
         return withPersonalAccessKey(accountId, axiosConfig);
     }
-    if (authType === 'oauth2') {
-        return withOauth(accountId, accountConfig, axiosConfig);
+    if (authType === auth_1.OAUTH_AUTH_METHOD.value) {
+        return withOauth(account, axiosConfig);
     }
-    const { params } = axiosConfig;
-    return {
-        ...axiosConfig,
-        params: {
-            ...params,
-            hapikey: apiKey,
-        },
-    };
+    if (authType === auth_1.API_KEY_AUTH_METHOD.value) {
+        const { params } = axiosConfig;
+        return {
+            ...axiosConfig,
+            params: {
+                ...params,
+                hapikey: account.apiKey,
+            },
+        };
+    }
+    throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidAuthType`, {
+        accountId,
+        authType,
+    }));
 }
 async function getRequest(accountId, options) {
     const { params, ...rest } = options;