@hubspot/local-dev-lib 0.2.1-experimental.1 → 0.2.2-experimental.0

package/config/migrate.js

@@ -0,0 +1,150 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeExistingConfigs = exports.mergeConfigProperties = exports.migrateConfig = exports.getConfigPath = exports.getConfig = void 0;
+const config_DEPRECATED = __importStar(require("./config_DEPRECATED"));
+const CLIConfiguration_1 = require("./CLIConfiguration");
+const index_1 = require("./index");
+const configFile_1 = require("./configFile");
+const config_1 = require("../constants/config");
+const lang_1 = require("../utils/lang");
+const i18nKey = 'config.migrate';
+function getConfig(useHiddenConfig, configPath) {
+    if (useHiddenConfig) {
+        return CLIConfiguration_1.CLIConfiguration.config;
+    }
+    return config_DEPRECATED.loadConfig(configPath);
+}
+exports.getConfig = getConfig;
+function getConfigPath(configPath, useHiddenConfig = false) {
+    if (useHiddenConfig) {
+        return (0, configFile_1.getConfigFilePath)();
+    }
+    return config_DEPRECATED.getConfigPath(configPath);
+}
+exports.getConfigPath = getConfigPath;
+function writeGlobalConfigFile(updatedConfig, isMigrating = false) {
+    const updatedConfigJson = JSON.stringify(updatedConfig);
+    if (isMigrating) {
+        (0, index_1.createEmptyConfigFile)({}, true);
+    }
+    (0, index_1.loadConfig)('');
+    try {
+        (0, index_1.writeConfig)({ source: updatedConfigJson });
+        config_DEPRECATED.deleteConfigFile();
+    }
+    catch (error) {
+        (0, index_1.deleteEmptyConfigFile)();
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.writeConfig`, { configPath: config_1.GLOBAL_CONFIG_PATH }), { cause: error });
+    }
+}
+function migrateConfig(deprecatedConfig) {
+    if (!deprecatedConfig) {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.noDeprecatedConfig`));
+    }
+    const { defaultPortal, portals, ...rest } = deprecatedConfig;
+    const updatedConfig = {
+        ...rest,
+        defaultAccount: defaultPortal,
+        accounts: portals
+            .filter(({ portalId }) => portalId !== undefined)
+            .map(({ portalId, ...rest }) => ({
+            ...rest,
+            accountId: portalId,
+        })),
+    };
+    writeGlobalConfigFile(updatedConfig, true);
+}
+exports.migrateConfig = migrateConfig;
+function mergeConfigProperties(globalConfig, deprecatedConfig, force) {
+    const propertiesToCheck = [
+        config_1.DEFAULT_CMS_PUBLISH_MODE,
+        config_1.HTTP_TIMEOUT,
+        config_1.ENV,
+        config_1.HTTP_USE_LOCALHOST,
+    ];
+    const conflicts = [];
+    propertiesToCheck.forEach(prop => {
+        if (prop in globalConfig && prop in deprecatedConfig) {
+            if (force || globalConfig[prop] === deprecatedConfig[prop]) {
+                // @ts-expect-error Cannot reconcile CLIConfig_NEW and CLIConfig_DEPRECATED types
+                globalConfig[prop] = deprecatedConfig[prop];
+            }
+            else {
+                conflicts.push({
+                    property: prop,
+                    oldValue: deprecatedConfig[prop],
+                    newValue: globalConfig[prop],
+                });
+            }
+        }
+    });
+    if (config_1.DEFAULT_ACCOUNT in globalConfig &&
+        config_1.DEFAULT_PORTAL in deprecatedConfig &&
+        globalConfig.defaultAccount !== deprecatedConfig.defaultPortal) {
+        conflicts.push({
+            property: config_1.DEFAULT_ACCOUNT,
+            oldValue: deprecatedConfig.defaultPortal,
+            newValue: globalConfig.defaultAccount,
+        });
+    }
+    else if (config_1.DEFAULT_PORTAL in deprecatedConfig) {
+        globalConfig.defaultAccount = deprecatedConfig.defaultPortal;
+    }
+    return { initialConfig: globalConfig, conflicts };
+}
+exports.mergeConfigProperties = mergeConfigProperties;
+function mergeAccounts(globalConfig, deprecatedConfig) {
+    let existingAccountIds = [];
+    const skippedAccountIds = [];
+    if (globalConfig.accounts && deprecatedConfig.portals) {
+        existingAccountIds = globalConfig.accounts.map(account => account.accountId);
+        const newAccounts = deprecatedConfig.portals
+            .filter(portal => {
+            const isExisting = existingAccountIds.includes(portal.portalId);
+            if (isExisting) {
+                skippedAccountIds.push(portal.portalId);
+            }
+            return !isExisting;
+        })
+            .map(({ portalId, ...rest }) => ({
+            ...rest,
+            accountId: portalId,
+        }));
+        if (newAccounts.length > 0) {
+            globalConfig.accounts.push(...newAccounts);
+        }
+    }
+    return {
+        finalConfig: globalConfig,
+        skippedAccountIds,
+    };
+}
+function mergeExistingConfigs(globalConfig, deprecatedConfig) {
+    const { finalConfig, skippedAccountIds } = mergeAccounts(globalConfig, deprecatedConfig);
+    writeGlobalConfigFile(finalConfig);
+    return { finalConfig, skippedAccountIds };
+}
+exports.mergeExistingConfigs = mergeExistingConfigs;

package/constants/config.d.ts

@@ -1,9 +1,16 @@
 export declare const DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = "hubspot.config.yml";
 export declare const HUBSPOT_CONFIGURATION_FOLDER = ".hscli";
 export declare const HUBSPOT_CONFIGURATION_FILE = "config.yml";
+export declare const GLOBAL_CONFIG_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";
+export declare const DEFAULT_CMS_PUBLISH_MODE = "defaultCmsPublishMode";
+export declare const HTTP_TIMEOUT = "httpTimeout";
+export declare const ENV = "env";
+export declare const HTTP_USE_LOCALHOST = "httpUseLocalhost";
+export declare const DEFAULT_ACCOUNT = "defaultAccount";
+export declare const DEFAULT_PORTAL = "defaultPortal";
 export declare const MIN_HTTP_TIMEOUT = 3000;
 export declare const HUBSPOT_ACCOUNT_TYPES: {
     readonly DEVELOPMENT_SANDBOX: "DEVELOPMENT_SANDBOX";
@@ -19,27 +26,3 @@ 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

@@ -1,13 +1,25 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ACCOUNT_IDENTIFIERS = exports.ENVIRONMENT_VARIABLES = exports.CONFIG_FLAGS = exports.HUBSPOT_ACCOUNT_TYPE_STRINGS = exports.HUBSPOT_ACCOUNT_TYPES = exports.MIN_HTTP_TIMEOUT = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = exports.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = exports.HUBSPOT_CONFIGURATION_FILE = exports.HUBSPOT_CONFIGURATION_FOLDER = exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = void 0;
+exports.HUBSPOT_ACCOUNT_TYPE_STRINGS = exports.HUBSPOT_ACCOUNT_TYPES = exports.MIN_HTTP_TIMEOUT = exports.DEFAULT_PORTAL = exports.DEFAULT_ACCOUNT = 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.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"));
 exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = 'hubspot.config.yml';
 exports.HUBSPOT_CONFIGURATION_FOLDER = '.hscli';
 exports.HUBSPOT_CONFIGURATION_FILE = 'config.yml';
+exports.GLOBAL_CONFIG_PATH = path_1.default.join(os_1.default.homedir(), exports.HUBSPOT_CONFIGURATION_FOLDER, exports.HUBSPOT_CONFIGURATION_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';
+exports.DEFAULT_CMS_PUBLISH_MODE = 'defaultCmsPublishMode';
+exports.HTTP_TIMEOUT = 'httpTimeout';
+exports.ENV = 'env';
+exports.HTTP_USE_LOCALHOST = 'httpUseLocalhost';
+exports.DEFAULT_ACCOUNT = 'defaultAccount';
+exports.DEFAULT_PORTAL = 'defaultPortal';
 exports.MIN_HTTP_TIMEOUT = 3000;
 exports.HUBSPOT_ACCOUNT_TYPES = {
     DEVELOPMENT_SANDBOX: 'DEVELOPMENT_SANDBOX',
@@ -23,27 +35,3 @@ 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,3 +2,14 @@ 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,7 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENVIRONMENTS = void 0;
+exports.ENVIRONMENT_VARIABLES = 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,13 +41,7 @@ const DEFAULT_TRANSITIONAL = {
 };
 function getAxiosConfig(options) {
     const { env, localHostOverride, headers, ...rest } = options;
-    let config;
-    try {
-        config = (0, config_1.getConfig)();
-    }
-    catch (e) {
-        config = null;
-    }
+    const config = (0, config_1.getAndLoadConfigIfNeeded)();
     let httpTimeout = 15000;
     let httpUseLocalhost = false;
     if (config && config.httpTimeout) {

package/http/index.js

@@ -16,7 +16,6 @@ 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 i18nKey = 'http.index';
 axios_1.default.interceptors.response.use(undefined, error => {
     // Wrap all axios errors in our own Error class.  Attach the error
@@ -27,11 +26,11 @@ function addUserAgentHeader(key, value) {
     getAxiosConfig_1.USER_AGENTS[key] = value;
 }
 exports.addUserAgentHeader = addUserAgentHeader;
-async function withOauth(account, axiosConfig) {
+async function withOauth(accountId, accountConfig, axiosConfig) {
     const { headers } = axiosConfig;
-    const oauth = (0, oauth_1.getOauthManager)(account);
+    const oauth = (0, oauth_1.getOauthManager)(accountId, accountConfig);
     if (!oauth) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.withOauth`, { accountId: account.accountId }));
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.withOauth`, { accountId }));
     }
     const accessToken = await oauth.accessToken();
     return {
@@ -64,29 +63,26 @@ function withPortalId(portalId, axiosConfig) {
     };
 }
 async function withAuth(accountId, options) {
-    const account = (0, config_1.getConfigAccountById)(accountId);
-    const { env, authType } = account;
+    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 axiosConfig = withPortalId(accountId, (0, getAxiosConfig_1.getAxiosConfig)({ env, ...options }));
-    if (authType === auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
+    if (authType === 'personalaccesskey') {
         return withPersonalAccessKey(accountId, axiosConfig);
     }
-    if (authType === auth_1.OAUTH_AUTH_METHOD.value) {
-        return withOauth(account, axiosConfig);
-    }
-    if (authType === auth_1.API_KEY_AUTH_METHOD.value) {
-        const { params } = axiosConfig;
-        return {
-            ...axiosConfig,
-            params: {
-                ...params,
-                hapikey: account.apiKey,
-            },
-        };
+    if (authType === 'oauth2') {
+        return withOauth(accountId, accountConfig, axiosConfig);
     }
-    throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidAuthType`, {
-        accountId,
-        authType,
-    }));
+    const { params } = axiosConfig;
+    return {
+        ...axiosConfig,
+        params: {
+            ...params,
+            hapikey: apiKey,
+        },
+    };
 }
 async function getRequest(accountId, options) {
     const { params, ...rest } = options;

package/lang/en.json

@@ -74,8 +74,7 @@
     "personalAccessKey": {
       "errors": {
         "accountNotFound": "Account with id {{ accountId }} does not exist.",
-        "invalidPersonalAccessKey": "Error while retrieving new access token: {{ errorMessage }}",
-        "invalidAuthType": "Error fetching access token: account {{ accountId }} uses an auth type other than personalaccesskey"
+        "invalidPersonalAccessKey": "Error while retrieving new access token: {{ errorMessage }}"
       }
     },
     "cms": {
@@ -233,74 +232,90 @@
     }
   },
   "config": {
-    "getDefaultConfigFilePath": {
-      "error": "Error getting config file path: no config file found"
-    },
-    "getConfig": "Reading config from {{ path }}",
-    "isConfigValid": {
-      "missingAccounts": "Invalid config: no accounts found",
-      "duplicateAccountIds": "Invalid config: multiple accounts with accountId: {{ accountId }}",
-      "duplicateAccountNames": "Invalid config: multiple accounts with name: {{ accountName }}",
-      "invalidAccountName": "Invalid config: account name {{ accountName }} contains spaces"
-    },
-    "getConfigAccountById": {
-      "error": "Error getting config account: no account with id {{ accountId }} exists in config"
-    },
-    "getConfigAccountByName": {
-      "error": "Error getting config account: no account with name {{ accountName }} exists in config"
-    },
-    "getConfigDefaultAccount": {
-      "fieldMissingError": "Error getting config default account: no default account field found in config",
-      "accountMissingError": "Error getting config default account: default account is set to {{ defaultAccount }} but no account with that id exists in config"
-    },
-    "addConfigAccount": {
-      "invalidAccount": "Error adding config account: account is invalid",
-      "duplicateAccount": "Error adding config account: account with id {{ accountId }} already exists in config"
-    },
-    "updateConfigAccount": {
-      "invalidAccount": "Error updating config account: account is invalid",
-      "accountNotFound": "Error updating config account: account with id {{ accountId }} not found in config"
-    },
-    "setConfigAccountAsDefault": {
-      "accountNotFound": "Error setting config default account: account with id {{ accountId }} not found in config"
-    },
-    "renameConfigAccount": {
-      "accountNotFound": "Error renaming config account: account with name {{ currentName }} not found in config",
-      "duplicateAccount": "Error renaming config account: account with name {{ newName}} already exists in config"
-    },
-    "removeAccountFromConfig": {
-      "accountNotFound": "Error removing config account: account with id {{ accountId }} not found in config"
-    },
-    "updateHttpTimeout": {
-      "invalidTimeout": "Error updating config http timeout: timeout must be greater than {{ minTimeout }}"
-    },
-    "updateDefaultCmsPublishMode": {
-      "invalidCmsPublishMode": "Error updating config default CMS publish mode: CMS publish can only be set to 'draft' or 'publish'"
-    },
-    "utils": {
-      "isConfigAccountValid": {
-        "missingAccount": "Invalid config: at least one account in config is missing data",
-        "missingAuthType": "Invalid config: account {{ accountId }} has no authType",
-        "missingAccountId": "Invalid config: at least one account in config is missing accountId",
-        "missingApiKey": "Invalid config: account {{ accountId }} has authType of apikey but is missing the apiKey field",
-        "missingAuth": "Invalid config: account {{ accountId }} has authtype of oauth2 but is missing auth data",
-        "missingPersonalAccessKey": "Invalid config: account {{ accountId }} has authType of personalAccessKey but is missing the personalAccessKey field"
+    "cliConfiguration": {
+      "errors": {
+        "noConfigLoaded": "No config loaded."
       },
-      "getConfigPathEnvironmentVariables": {
-        "invalidEnvironmentVariables": "Error loading config: USE_ENVIRONMENT_HUBSPOT_CONFIG and HUBSPOT_CONFIG_PATH cannot both be set simultaneously"
+      "load": {
+        "configFromEnv": "Loaded config from environment variables for {{ accountId }}",
+        "configFromFile": "Loaded config from configuration file.",
+        "empty": "The config file was empty. Initializing an empty config."
       },
-      "parseConfig": {
-        "error": "An error occurred parsing the config file."
+      "validate": {
+        "noConfig": "Valiation failed: No config was found.",
+        "noConfigAccounts": "Valiation failed: config.accounts[] is not defined.",
+        "emptyAccountConfig": "Valiation failed: config.accounts[] has an empty entry.",
+        "noAccountId": "Valiation failed: config.accounts[] has an entry missing accountId.",
+        "duplicateAccountIds": "Valiation failed: config.accounts[] has multiple entries with {{ accountId }}.",
+        "duplicateAccountNames": "Valiation failed: config.accounts[] has multiple entries with {{ accountName }}.",
+        "nameContainsSpaces": "Valiation failed: config.name {{ accountName }} cannot contain spaces."
       },
-      "buildConfigFromEnvironment": {
-        "missingAccountId": "Error loading config from environment: HUBSPOT_ACCOUNT_ID not set",
-        "invalidAuthType": "Error loading config from environment: auth is invalid. Use HUBSPOT_CLIENT_ID, HUBSPOT_CLIENT_SECRET, and HUBSPOT_REFRESH_TOKEN to authenticate with Oauth2, PERSONAL_ACCESS_KEY to authenticate with Personal Access Key, or API_KEY to authenticate with API Key."
-      }
-    },
-    "defaultAccountOverride": {
-      "getDefaultAccountOverrideAccountId": {
+      "updateAccount": {
+        "noConfigToUpdate": "No config to update.",
+        "updating": "Updating account config for {{ accountId }}",
+        "addingConfigEntry": "Adding account config entry for {{ accountId }}",
+        "errors": {
+          "accountIdRequired": "An accountId is required to update the config"
+        }
+      },
+      "updateDefaultAccount": {
+        "errors": {
+          "invalidInput": "A 'defaultAccount' with value of number or string is required to update the config."
+        }
+      },
+      "getCWDAccountOverride": {
         "errorHeader": "Error in {{ hsAccountFile }}",
         "readFileError": "Error reading account override file."
+      },
+      "renameAccount": {
+        "errors": {
+          "invalidName": "Cannot find account with identifier {{ currentName }}"
+        }
+      },
+      "removeAccountFromConfig": {
+        "deleting": "Deleting config for {{ accountId }}",
+        "errors": {
+          "invalidId": "Unable to find account for {{ nameOrId }}."
+        }
+      },
+      "updateDefaultCmsPublishMode": {
+        "errors": {
+          "invalidCmsPublishMode": "The CMS publish mode {{ defaultCmsPublishMode }} is invalid. Valid values are {{ validCmsPublishModes }}."
+        }
+      },
+      "updateHttpTimeout": {
+        "errors": {
+          "invalidTimeout": "The value {{ timeout }} is invalid. The value must be a number greater than {{ minTimeout }}."
+        }
+      },
+      "updateAllowUsageTracking": {
+        "errors": {
+          "invalidInput": "Unable to update allowUsageTracking. The value {{ isEnabled }} is invalid. The value must be a boolean."
+        }
+      }
+    },
+    "configFile": {
+      "errorReading": "Config file could not be read: {{ configPath }}",
+      "writeSuccess": "Successfully wrote updated config data to {{ configPath }}",
+      "errorLoading": "A configuration file could not be found at {{ configPath }}.",
+      "errors": {
+        "parsing": "Config file could not be parsed"
+      }
+    },
+    "configUtils": {
+      "unknownType": "Unknown auth type {{ type }}"
+    },
+    "environment": {
+      "loadConfig": {
+        "missingAccountId": "Unable to load config from environment variables: Missing accountId",
+        "missingEnv": "Unable to load config from environment variables: Missing env",
+        "unknownAuthType": "Unable to load config from environment variables: Unknown auth type"
+      }
+    },
+    "migrate": {
+      "errors": {
+        "writeConfig": "Unable to write global configuration file at {{ configPath }}.",
+        "noDeprecatedConfig": "No deprecated configuration file found. Skipping migration to global config."
       }
     }
   },
@@ -352,8 +367,7 @@
       },
       "errors": {
         "withOauth": "Oauth manager for account {{ accountId }} not found.",
-        "withAuth": "Account with id {{ accountId }} not found.",
-        "invalidAuthType": "Error authenticating HTTP request: account {{ accountId }} has an invalid auth type {{ authType }}"
+        "withAuth": "Account with id {{ accountId }} not found."
       }
     }
   },

package/lib/archive.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { CopySourceToDestOptions } from '../types/Archive';
 export declare function extractZipArchive(zip: Buffer, name: string, dest: string, { sourceDir, includesRootDir, hideLogs }?: CopySourceToDestOptions): Promise<boolean>;

package/lib/cms/themes.js

@@ -28,9 +28,7 @@ function getThemePreviewUrl(filePath, accountId) {
     const themeName = getThemeNameFromPath(filePath);
     if (!themeName)
         return;
-    const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getConfigAccountEnvironment)(accountId) === 'qa'
-        ? environments_1.ENVIRONMENTS.QA
-        : environments_1.ENVIRONMENTS.PROD);
+    const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getEnv)(accountId) === 'qa' ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD);
     return `${baseUrl}/theme-previewer/${accountId}/edit/${encodeURIComponent(themeName)}`;
 }
 exports.getThemePreviewUrl = getThemePreviewUrl;

package/lib/environment.d.ts

@@ -1,2 +1,2 @@
 import { Environment } from '../types/Config';
-export declare function getValidEnv(env?: string | null, maskedProductionValue?: Environment): Environment;
+export declare function getValidEnv(env?: Environment | null, maskedProductionValue?: Environment): Environment;

package/lib/github.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { GithubReleaseData, GithubRepoFile, RepoPath, CloneGithubRepoOptions } from '../types/Github';
 /**
  * @deprecated Use `fetchRepoFile` instead - this util is a thin wrapper around it

package/lib/oauth.d.ts

@@ -1,4 +1,4 @@
 import { OAuth2Manager } from '../models/OAuth2Manager';
-import { OAuthConfigAccount } from '../types/Accounts';
-export declare function getOauthManager(account: OAuthConfigAccount): OAuth2Manager | undefined;
+import { FlatAccountFields } from '../types/Accounts';
+export declare function getOauthManager(accountId: number, accountConfig: FlatAccountFields): OAuth2Manager | undefined;
 export declare function addOauthToAccountConfig(oauth: OAuth2Manager): void;

package/lib/oauth.js

@@ -2,25 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addOauthToAccountConfig = exports.getOauthManager = void 0;
 const OAuth2Manager_1 = require("../models/OAuth2Manager");
+const auth_1 = require("../constants/auth");
 const logger_1 = require("./logger");
+const getAccountIdentifier_1 = require("../config/getAccountIdentifier");
 const config_1 = require("../config");
 const lang_1 = require("../utils/lang");
 const i18nKey = 'lib.oauth';
 const oauthManagers = new Map();
-function writeOauthTokenInfo(account) {
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.writeTokenInfo`, { portalId: account.accountId }));
-    (0, config_1.updateConfigAccount)(account);
+function writeOauthTokenInfo(accountConfig) {
+    const accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig);
+    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.writeTokenInfo`, { portalId: accountId || '' }));
+    (0, config_1.updateAccountConfig)(accountConfig);
+    (0, config_1.writeConfig)();
 }
-function getOauthManager(account) {
-    if (!oauthManagers.has(account.accountId)) {
-        oauthManagers.set(account.accountId, new OAuth2Manager_1.OAuth2Manager(account, () => writeOauthTokenInfo(account)));
+function getOauthManager(accountId, accountConfig) {
+    if (!oauthManagers.has(accountId)) {
+        oauthManagers.set(accountId, OAuth2Manager_1.OAuth2Manager.fromConfig(accountConfig, () => writeOauthTokenInfo(accountConfig)));
     }
-    return oauthManagers.get(account.accountId);
+    return oauthManagers.get(accountId);
 }
 exports.getOauthManager = getOauthManager;
 function addOauthToAccountConfig(oauth) {
     logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.addOauthToAccountConfig.init`));
-    (0, config_1.updateConfigAccount)(oauth.account);
+    (0, config_1.updateAccountConfig)({
+        ...oauth.account,
+        authType: auth_1.AUTH_METHODS.oauth.value,
+    });
+    (0, config_1.writeConfig)();
     logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.addOauthToAccountConfig.success`));
 }
 exports.addOauthToAccountConfig = addOauthToAccountConfig;

package/lib/personalAccessKey.d.ts

@@ -1,4 +1,4 @@
-import { PersonalAccessKeyConfigAccount, ScopeGroupAuthorization } from '../types/Accounts';
+import { CLIAccount, ScopeGroupAuthorization } from '../types/Accounts';
 import { Environment } from '../types/Config';
 import { AccessToken } from '../types/Accounts';
 export declare function getAccessToken(personalAccessKey: string, env?: Environment, accountId?: number): Promise<AccessToken>;
@@ -8,4 +8,4 @@ export declare function enabledFeaturesForPersonalAccessKey(accountId: number):
 } | undefined>;
 export declare function scopesOnAccessToken(accountId: number): Promise<Array<string>>;
 export declare function authorizedScopesForPortalAndUser(accountId: number): Promise<Array<ScopeGroupAuthorization>>;
-export declare function updateConfigWithAccessToken(token: AccessToken, personalAccessKey: string, env?: Environment, name?: string, makeDefault?: boolean): Promise<PersonalAccessKeyConfigAccount>;
+export declare function updateConfigWithAccessToken(token: AccessToken, personalAccessKey: string, env?: Environment, name?: string, makeDefault?: boolean): Promise<CLIAccount | null>;