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

package/lang/en.json

@@ -75,7 +75,8 @@
     "personalAccessKey": {
       "errors": {
         "accountNotFound": "Account with id {{ accountId }} does not exist.",
-        "invalidPersonalAccessKey": "Error while retrieving new access token: {{ errorMessage }}"
+        "invalidPersonalAccessKey": "Error while retrieving new access token: {{ errorMessage }}",
+        "invalidAuthType": "Error fetching access token: account {{ accountId }} uses an auth type other than personalaccesskey"
       }
     },
     "crm": {
@@ -242,73 +243,89 @@
     }
   },
   "config": {
-    "cliConfiguration": {
-      "errors": {
-        "noConfigLoaded": "No config loaded."
-      },
-      "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."
-      },
-      "validate": {
-        "noConfig": "Validation failed: No config was found.",
-        "noConfigAccounts": "Validation failed: config.accounts[] is not defined.",
-        "emptyAccountConfig": "Validation failed: config.accounts[] has an empty entry.",
-        "noAccountId": "Validation failed: config.accounts[] has an entry missing accountId.",
-        "duplicateAccountIds": "Validation failed: config.accounts[] has multiple entries with {{ accountId }}.",
-        "duplicateAccountNames": "Validation failed: config.accounts[] has multiple entries with {{ accountName }}.",
-        "nameContainsSpaces": "Validation failed: config.name {{ accountName }} cannot contain spaces."
+    "getDefaultConfigFilePath": {
+      "error": "Attempted to get config file path, but no config file was found."
+    },
+    "getConfig": {
+      "reading": "Reading config from {{ path }}",
+      "error": "No config file found.",
+      "errorWithPath": "No config file found at {{ 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": "No account with id {{ accountId }} exists in config"
+    },
+    "getConfigAccountByName": {
+      "error": "No account with name {{ accountName }} exists in config"
+    },
+    "getConfigDefaultAccount": {
+      "fieldMissingError": "Attempted to get default account, but no default account was found in config",
+      "accountMissingError": "Default account is set to {{ defaultAccount }}, but no account with that id exists in config"
+    },
+    "addConfigAccount": {
+      "invalidAccount": "Attempting to add account, but account is invalid",
+      "duplicateAccount": "Attempting to add account, but account with id {{ accountId }} already exists in config"
+    },
+    "updateConfigAccount": {
+      "invalidAccount": "Attempting to update account {{ name }}, but account is invalid",
+      "accountNotFound": "Attempting to update account with id {{ id }}, but that account was not found in config"
+    },
+    "setConfigAccountAsDefault": {
+      "accountNotFound": "Attempted to set account with id {{ accountId }} as default, but that account was not found in config"
+    },
+    "renameConfigAccount": {
+      "accountNotFound": "Attempted to rename account with name {{ currentName }}, but that account was not found in config",
+      "duplicateAccount": "Attempted to rename account {{ currentName }} to {{ newName }}, but an account with that name already exists in config"
+    },
+    "removeAccountFromConfig": {
+      "accountNotFound": "Attempted to remove account with id {{ accountId }}, but that account was not found in config"
+    },
+    "updateHttpTimeout": {
+      "invalidTimeout": "HTTP timeout must be greater than {{ minTimeout }}. Received {{ timeout }}"
+    },
+    "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"
       },
-      "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"
-        }
+      "getConfigPathEnvironmentVariables": {
+        "invalidEnvironmentVariables": "USE_ENVIRONMENT_HUBSPOT_CONFIG and HUBSPOT_CONFIG_PATH cannot both be set simultaneously"
       },
-      "updateDefaultAccount": {
-        "errors": {
-          "invalidInput": "A 'defaultAccount' with value of number or string is required to update the config."
-        }
+      "parseConfig": {
+        "error": "File could not be parsed. Confirm that your config file {{ configPath }} is valid YAML."
       },
-      "getCWDAccountOverride": {
+      "buildConfigFromEnvironment": {
+        "missingAccountId": "HUBSPOT_ACCOUNT_ID is required, but not currently set",
+        "invalidAuthType": "Auth type 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": {
         "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."
-        }
-      },
-      "updateAutoOpenBrowser": {
-        "errors": {
-          "invalidInput": "Unable to update autoOpenBrowser. The value {{ isEnabled }} is invalid. The value must be a boolean."
-        }
       }
     },
+    "updateAllowUsageTracking": {
+      "invalidInput": "Unable to update allowUsageTracking. The value {{ isAllowed }} is invalid. The value must be a boolean."
+    },
+    "updateAllowAutoUpdates": {
+      "invalidInput": "Unable to update allowAutoUpdates. The value {{ isEnabled }} is invalid. The value must be a boolean."
+    },
+    "updateAutoOpenBrowser": {
+      "invalidInput": "Unable to update autoOpenBrowser. 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 }}",
@@ -327,9 +344,6 @@
         }
       },
       "getCurrentState": {
-        "debug": {
-          "emptyStateFile": "State file is empty, using default state"
-        },
         "errors": {
           "errorReading": "Error reading CLI state, using defaults: {{ error }}"
         }
@@ -363,6 +377,9 @@
         "missingRefreshToken": "The account {{ accountId }} has not been authenticated with Oauth2",
         "auth": "Error while retrieving new token: {{ token }}"
       }
+    },
+    "HubSpotConfigError": {
+      "baseMessage": "An error occurred while {{ operation }} your HubSpot config {{ configType }}: {{ message }}"
     }
   },
   "utils": {
@@ -402,7 +419,8 @@
       },
       "errors": {
         "withOauth": "Oauth manager for account {{ accountId }} not found.",
-        "withAuth": "Account with id {{ accountId }} not found."
+        "withAuth": "Account with id {{ accountId }} not found.",
+        "invalidAuthType": "Error authenticating HTTP request: account {{ accountId }} has an invalid auth type {{ authType }}"
       }
     }
   },

package/lib/cms/themes.js

@@ -28,7 +28,9 @@ function getThemePreviewUrl(filePath, accountId) {
     const themeName = getThemeNameFromPath(filePath);
     if (!themeName)
         return;
-    const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getEnv)(accountId) === 'qa' ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD);
+    const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getConfigAccountEnvironment)(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?: Environment | null, maskedProductionValue?: Environment): Environment;
+export declare function getValidEnv(env?: string | null, maskedProductionValue?: Environment): Environment;

package/lib/oauth.d.ts

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

package/lib/oauth.js

@@ -2,33 +2,25 @@
 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(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 writeOauthTokenInfo(account) {
+    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.writeTokenInfo`, { portalId: account.accountId }));
+    (0, config_1.updateConfigAccount)(account);
 }
-function getOauthManager(accountId, accountConfig) {
-    if (!oauthManagers.has(accountId)) {
-        oauthManagers.set(accountId, OAuth2Manager_1.OAuth2Manager.fromConfig(accountConfig, () => writeOauthTokenInfo(accountConfig)));
+function getOauthManager(account) {
+    if (!oauthManagers.has(account.accountId)) {
+        oauthManagers.set(account.accountId, new OAuth2Manager_1.OAuth2Manager(account, () => writeOauthTokenInfo(account)));
     }
-    return oauthManagers.get(accountId);
+    return oauthManagers.get(account.accountId);
 }
 exports.getOauthManager = getOauthManager;
 function addOauthToAccountConfig(oauth) {
     logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.addOauthToAccountConfig.init`));
-    (0, config_1.updateAccountConfig)({
-        ...oauth.account,
-        authType: auth_1.AUTH_METHODS.oauth.value,
-    });
-    (0, config_1.writeConfig)();
+    (0, config_1.updateConfigAccount)(oauth.account);
     logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.addOauthToAccountConfig.success`));
 }
 exports.addOauthToAccountConfig = addOauthToAccountConfig;

package/lib/personalAccessKey.d.ts

@@ -1,4 +1,4 @@
-import { CLIAccount, ScopeGroupAuthorization } from '../types/Accounts';
+import { PersonalAccessKeyConfigAccount, 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<CLIAccount | null>;
+export declare function updateConfigWithAccessToken(token: AccessToken, personalAccessKey: string, env?: Environment, name?: string, makeDefault?: boolean): Promise<PersonalAccessKeyConfigAccount>;

package/lib/personalAccessKey.js

@@ -13,7 +13,6 @@ const config_1 = require("../config");
 const config_2 = require("../constants/config");
 const developerTestAccounts_1 = require("../api/developerTestAccounts");
 const logger_1 = require("./logger");
-const CLIConfiguration_1 = require("../config/CLIConfiguration");
 const lang_1 = require("../utils/lang");
 const errors_1 = require("../errors");
 const i18nKey = 'lib.personalAccessKey';
@@ -36,30 +35,30 @@ async function getAccessToken(personalAccessKey, env = environments_1.ENVIRONMEN
     };
 }
 exports.getAccessToken = getAccessToken;
-async function refreshAccessToken(personalAccessKey, env = environments_1.ENVIRONMENTS.PROD, accountId) {
+async function refreshAccessToken(account) {
+    const { personalAccessKey, env, accountId } = account;
     const accessTokenResponse = await getAccessToken(personalAccessKey, env, accountId);
     const { accessToken, expiresAt } = accessTokenResponse;
-    const config = (0, config_1.getAccountConfig)(accountId);
-    (0, config_1.updateAccountConfig)({
-        env,
-        ...config,
-        accountId,
-        tokenInfo: {
-            accessToken,
-            expiresAt: expiresAt,
+    (0, config_1.updateConfigAccount)({
+        ...account,
+        auth: {
+            tokenInfo: {
+                accessToken,
+                expiresAt: expiresAt,
+            },
         },
     });
-    (0, config_1.writeConfig)();
     return accessTokenResponse;
 }
-async function getNewAccessToken(accountId, personalAccessKey, expiresAt, env) {
-    const key = getRefreshKey(personalAccessKey, expiresAt);
+async function getNewAccessToken(account) {
+    const { personalAccessKey, auth } = account;
+    const key = getRefreshKey(personalAccessKey, auth.tokenInfo.expiresAt);
     if (refreshRequests.has(key)) {
         return refreshRequests.get(key);
     }
     let accessTokenResponse;
     try {
-        const refreshAccessPromise = refreshAccessToken(personalAccessKey, env, accountId);
+        const refreshAccessPromise = refreshAccessToken(account);
         if (key) {
             refreshRequests.set(key, refreshAccessPromise);
         }
@@ -74,28 +73,37 @@ async function getNewAccessToken(accountId, personalAccessKey, expiresAt, env) {
     return accessTokenResponse;
 }
 async function getNewAccessTokenByAccountId(accountId) {
-    const account = (0, config_1.getAccountConfig)(accountId);
+    const account = (0, config_1.getConfigAccountById)(accountId);
     if (!account) {
         throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.accountNotFound`, { accountId }));
     }
-    const { auth, personalAccessKey, env } = account;
-    const accessTokenResponse = await getNewAccessToken(accountId, personalAccessKey, auth?.tokenInfo?.expiresAt, env);
+    if (account.authType !== auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidAuthType`, {
+            accountId,
+        }));
+    }
+    const accessTokenResponse = await getNewAccessToken(account);
     return accessTokenResponse;
 }
 async function accessTokenForPersonalAccessKey(accountId, forceRefresh = false) {
-    const account = (0, config_1.getAccountConfig)(accountId);
+    const account = (0, config_1.getConfigAccountById)(accountId);
     if (!account) {
         throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.accountNotFound`, { accountId }));
     }
-    const { auth, personalAccessKey, env } = account;
+    if (account.authType !== auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidAuthType`, {
+            accountId,
+        }));
+    }
+    const { auth } = account;
     const authTokenInfo = auth && auth.tokenInfo;
     const authDataExists = authTokenInfo && auth?.tokenInfo?.accessToken;
     if (!authDataExists ||
         forceRefresh ||
         (0, moment_1.default)().add(5, 'minutes').isAfter((0, moment_1.default)(authTokenInfo.expiresAt))) {
-        return getNewAccessToken(accountId, personalAccessKey, authTokenInfo && authTokenInfo.expiresAt, env).then(tokenInfo => tokenInfo.accessToken);
+        return getNewAccessToken(account).then(tokenInfo => tokenInfo.accessToken);
     }
-    return auth?.tokenInfo?.accessToken;
+    return auth.tokenInfo?.accessToken;
 }
 exports.accessTokenForPersonalAccessKey = accessTokenForPersonalAccessKey;
 async function enabledFeaturesForPersonalAccessKey(accountId) {
@@ -113,7 +121,10 @@ async function authorizedScopesForPortalAndUser(accountId) {
 exports.authorizedScopesForPortalAndUser = authorizedScopesForPortalAndUser;
 async function updateConfigWithAccessToken(token, personalAccessKey, env, name, makeDefault = false) {
     const { portalId, accessToken, expiresAt, accountType } = token;
-    const accountEnv = env || (0, config_1.getEnv)(name);
+    const account = name
+        ? (0, config_1.getConfigAccountByName)(name)
+        : (0, config_1.getConfigDefaultAccount)();
+    const accountEnv = env || account.env;
     let parentAccountId;
     try {
         if (accountType === config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
@@ -146,21 +157,19 @@ async function updateConfigWithAccessToken(token, personalAccessKey, env, name,
         }
         logger_1.logger.debug(err);
     }
-    const updatedAccount = (0, config_1.updateAccountConfig)({
+    const updatedAccount = {
         accountId: portalId,
         accountType,
         personalAccessKey,
-        name,
+        name: name || account.name,
         authType: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-        tokenInfo: { accessToken, expiresAt },
+        auth: { tokenInfo: { accessToken, expiresAt } },
         parentAccountId,
         env: accountEnv,
-    });
-    if (!CLIConfiguration_1.CLIConfiguration.isActive()) {
-        (0, config_1.writeConfig)();
-    }
+    };
+    (0, config_1.updateConfigAccount)(updatedAccount);
     if (makeDefault && name) {
-        (0, config_1.updateDefaultAccount)(name);
+        (0, config_1.setConfigAccountAsDefault)(name);
     }
     return updatedAccount;
 }

package/lib/trackUsage.js

@@ -11,6 +11,7 @@ const http_1 = require("../http");
 const config_1 = require("../config");
 const fileMapper_1 = require("../api/fileMapper");
 const lang_1 = require("../utils/lang");
+const environment_1 = require("./environment");
 const i18nKey = 'lib.trackUsage';
 async function trackUsage(eventName, eventClass, meta = {}, accountId) {
     const usageEvent = {
@@ -35,8 +36,8 @@ async function trackUsage(eventName, eventClass, meta = {}, accountId) {
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.invalidEvent`, { eventName }));
     }
     const path = `${fileMapper_1.FILE_MAPPER_API_PATH}/${analyticsEndpoint}`;
-    const accountConfig = accountId && (0, config_1.getAccountConfig)(accountId);
-    if (accountConfig && accountConfig.authType === 'personalaccesskey') {
+    const account = accountId && (0, config_1.getConfigAccountById)(accountId);
+    if (account && account.authType === 'personalaccesskey') {
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.sendingEventAuthenticated`));
         try {
             await http_1.http.post(accountId, {
@@ -50,7 +51,9 @@ async function trackUsage(eventName, eventClass, meta = {}, accountId) {
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.retryingEventUnauthenticated`));
         }
     }
-    const env = (0, config_1.getEnv)(accountId);
+    const env = accountId
+        ? (0, config_1.getConfigAccountEnvironment)(accountId)
+        : (0, environment_1.getValidEnv)();
     const axiosConfig = (0, getAxiosConfig_1.getAxiosConfig)({
         env,
         url: path,

package/models/HubSpotConfigError.d.ts

@@ -0,0 +1,6 @@
+import { HubSpotConfigErrorType, HubSpotConfigOperation } from '../types/Config';
+export declare class HubSpotConfigError extends Error {
+    type: HubSpotConfigErrorType;
+    operation: HubSpotConfigOperation;
+    constructor(message: string, type: HubSpotConfigErrorType, operation: HubSpotConfigOperation, options?: ErrorOptions);
+}

package/models/HubSpotConfigError.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HubSpotConfigError = void 0;
+const config_1 = require("../constants/config");
+const lang_1 = require("../utils/lang");
+const NAME = 'HubSpotConfigError';
+function isEnvironmentError(type) {
+    return type === config_1.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_ENVIRONMENT_VARIABLES;
+}
+class HubSpotConfigError extends Error {
+    type;
+    operation;
+    constructor(message, type, operation, options) {
+        const configType = isEnvironmentError(type)
+            ? 'environment variables'
+            : 'file';
+        const operationText = operation === config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE ? 'writing to' : 'reading';
+        const withBaseMessage = (0, lang_1.i18n)('models.HubSpotConfigError.baseMessage', {
+            configType,
+            message,
+            operation: operationText,
+        });
+        super(withBaseMessage, options);
+        this.name = NAME;
+        this.type = type;
+        this.operation = operation;
+    }
+}
+exports.HubSpotConfigError = HubSpotConfigError;

package/models/OAuth2Manager.d.ts

@@ -1,12 +1,11 @@
-import { FlatAccountFields, OAuth2ManagerAccountConfig, WriteTokenInfoFunction, RefreshTokenResponse, ExchangeProof } from '../types/Accounts';
+import { OAuthConfigAccount, WriteTokenInfoFunction, RefreshTokenResponse, ExchangeProof } from '../types/Accounts';
 export declare class OAuth2Manager {
-    account: OAuth2ManagerAccountConfig;
+    account: OAuthConfigAccount;
     writeTokenInfo?: WriteTokenInfoFunction;
     refreshTokenRequest: Promise<RefreshTokenResponse> | null;
-    constructor(account: OAuth2ManagerAccountConfig, writeTokenInfo?: WriteTokenInfoFunction);
+    constructor(account: OAuthConfigAccount, writeTokenInfo?: WriteTokenInfoFunction);
     accessToken(): Promise<string | undefined>;
     fetchAccessToken(exchangeProof: ExchangeProof): Promise<void>;
     exchangeForTokens(exchangeProof: ExchangeProof): Promise<void>;
     refreshAccessToken(): Promise<void>;
-    static fromConfig(accountConfig: FlatAccountFields, writeTokenInfo: WriteTokenInfoFunction): OAuth2Manager;
 }

package/models/OAuth2Manager.js

@@ -9,8 +9,6 @@ const moment_1 = __importDefault(require("moment"));
 const urls_1 = require("../lib/urls");
 const environment_1 = require("../lib/environment");
 const logger_1 = require("../lib/logger");
-const getAccountIdentifier_1 = require("../config/getAccountIdentifier");
-const auth_1 = require("../constants/auth");
 const lang_1 = require("../utils/lang");
 const i18nKey = 'models.OAuth2Manager';
 class OAuth2Manager {
@@ -26,23 +24,23 @@ class OAuth2Manager {
         }
     }
     async accessToken() {
-        if (!this.account.tokenInfo?.refreshToken) {
+        if (!this.account.auth.tokenInfo.refreshToken) {
             throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.missingRefreshToken`, {
-                accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
+                accountId: this.account.accountId,
             }));
         }
-        if (!this.account.tokenInfo?.accessToken ||
+        if (!this.account.auth.tokenInfo.accessToken ||
             (0, moment_1.default)()
                 .add(5, 'minutes')
-                .isAfter((0, moment_1.default)(new Date(this.account.tokenInfo.expiresAt || '')))) {
+                .isAfter((0, moment_1.default)(new Date(this.account.auth.tokenInfo.expiresAt || '')))) {
             await this.refreshAccessToken();
         }
-        return this.account.tokenInfo.accessToken;
+        return this.account.auth.tokenInfo.accessToken;
     }
     async fetchAccessToken(exchangeProof) {
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.fetchingAccessToken`, {
-            accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
-            clientId: this.account.clientId || '',
+            accountId: this.account.accountId,
+            clientId: this.account.auth.clientId,
         }));
         try {
             const { data } = await (0, axios_1.default)({
@@ -53,20 +51,20 @@ class OAuth2Manager {
             });
             this.refreshTokenRequest = data;
             const { refresh_token: refreshToken, access_token: accessToken, expires_in: expiresIn, } = data;
-            if (!this.account.tokenInfo) {
-                this.account.tokenInfo = {};
+            if (!this.account.auth.tokenInfo) {
+                this.account.auth.tokenInfo = {};
             }
-            this.account.tokenInfo.refreshToken = refreshToken;
-            this.account.tokenInfo.accessToken = accessToken;
-            this.account.tokenInfo.expiresAt = (0, moment_1.default)()
+            this.account.auth.tokenInfo.refreshToken = refreshToken;
+            this.account.auth.tokenInfo.accessToken = accessToken;
+            this.account.auth.tokenInfo.expiresAt = (0, moment_1.default)()
                 .add(Math.round(parseInt(expiresIn) * 0.75), 'seconds')
                 .toString();
             if (this.writeTokenInfo) {
                 logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.updatingTokenInfo`, {
-                    accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
-                    clientId: this.account.clientId || '',
+                    accountId: this.account.accountId,
+                    clientId: this.account.auth.clientId,
                 }));
-                this.writeTokenInfo(this.account.tokenInfo);
+                this.writeTokenInfo(this.account.auth.tokenInfo);
             }
         }
         finally {
@@ -76,8 +74,8 @@ class OAuth2Manager {
     async exchangeForTokens(exchangeProof) {
         if (this.refreshTokenRequest) {
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.refreshingAccessToken`, {
-                accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
-                clientId: this.account.clientId || '',
+                accountId: this.account.accountId,
+                clientId: this.account.auth.clientId,
             }));
             await this.refreshTokenRequest;
         }
@@ -88,18 +86,11 @@ class OAuth2Manager {
     async refreshAccessToken() {
         const refreshTokenProof = {
             grant_type: 'refresh_token',
-            client_id: this.account.clientId,
-            client_secret: this.account.clientSecret,
-            refresh_token: this.account.tokenInfo?.refreshToken,
+            client_id: this.account.auth.clientId,
+            client_secret: this.account.auth.clientSecret,
+            refresh_token: this.account.auth.tokenInfo.refreshToken,
         };
         await this.exchangeForTokens(refreshTokenProof);
     }
-    static fromConfig(accountConfig, writeTokenInfo) {
-        return new OAuth2Manager({
-            ...accountConfig,
-            authType: auth_1.AUTH_METHODS.oauth.value,
-            ...(accountConfig.auth || {}),
-        }, writeTokenInfo);
-    }
 }
 exports.OAuth2Manager = OAuth2Manager;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.4.3-experimental.0",
+    "version": "0.5.0-experimental.1",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "repository": {
         "type": "git",
@@ -50,7 +50,7 @@
         "./errors/*": "./errors/*.js",
         "./http": "./http/index.js",
         "./http/*": "./http/*.js",
-        "./config/getAccountIdentifier": "./config/getAccountIdentifier.js",
+        "./config/defaultAccountOverride": "./config/defaultAccountOverride.js",
         "./config/migrate": "./config/migrate.js",
         "./config/state": "./config/state.js",
         "./config": "./config/index.js",