@hubspot/local-dev-lib 0.2.3 → 0.3.0

package/lib/github.js

@@ -3,20 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadGithubRepoContents = exports.cloneGithubRepo = exports.fetchReleaseData = exports.fetchFileFromRepository = void 0;
+exports.listGithubRepoContents = exports.downloadGithubRepoContents = exports.cloneGithubRepo = exports.fetchReleaseData = exports.fetchFileFromRepository = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const logger_1 = require("../utils/logger");
 const standardErrors_1 = require("../errors/standardErrors");
 const archive_1 = require("./archive");
+const logger_1 = require("./logging/logger");
 const github_1 = require("../api/github");
+const lang_1 = require("../utils/lang");
 const i18nKey = 'lib.github';
-const cloneGithubRepoCallbackKeys = ['success'];
 async function fetchFileFromRepository(repoPath, filePath, ref) {
     try {
-        (0, logger_1.debug)(`${i18nKey}.fetchFileFromRepository.fetching`, {
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.fetchFileFromRepository.fetching`, {
             path: `${repoPath}/${ref}/${filePath}`,
-        });
+        }));
         const { data } = await (0, github_1.fetchRepoFile)(repoPath, filePath, ref);
         return data;
     }
@@ -53,24 +53,23 @@ async function downloadGithubRepoZip(repoPath, isRelease = false, options = {})
             const releaseData = await fetchReleaseData(repoPath, tag);
             zipUrl = releaseData.zipball_url;
             const { name } = releaseData;
-            (0, logger_1.debug)(`${i18nKey}.downloadGithubRepoZip.fetchingName`, { name });
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.downloadGithubRepoZip.fetchingName`, { name }));
         }
         else {
             // If downloading a repository, manually construct the zip url. This url supports both branches and tags as refs
-            (0, logger_1.debug)(`${i18nKey}.downloadGithubRepoZip.fetching`, { repoPath });
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.downloadGithubRepoZip.fetching`, { repoPath }));
             const ref = branch || tag;
             zipUrl = `https://api.github.com/repos/${repoPath}/zipball${ref ? `/${ref}` : ''}`;
         }
         const { data } = await (0, github_1.fetchRepoAsZip)(zipUrl);
-        (0, logger_1.debug)(`${i18nKey}.downloadGithubRepoZip.completed`);
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.downloadGithubRepoZip.completed`));
         return data;
     }
     catch (err) {
         (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.downloadGithubRepoZip.errors.fetchFail`, {}, err);
     }
 }
-async function cloneGithubRepo(repoPath, dest, options = {}, logCallbacks) {
-    const logger = (0, logger_1.makeTypedLogger)(logCallbacks);
+async function cloneGithubRepo(repoPath, dest, options = {}) {
     const { tag, isRelease, branch, sourceDir, type } = options;
     const zip = await downloadGithubRepoZip(repoPath, isRelease, {
         tag,
@@ -79,10 +78,10 @@ async function cloneGithubRepo(repoPath, dest, options = {}, logCallbacks) {
     const repoName = repoPath.split('/')[1];
     const success = await (0, archive_1.extractZipArchive)(zip, repoName, dest, { sourceDir });
     if (success) {
-        logger('success', `${i18nKey}.cloneGithubRepo.success`, {
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.cloneGithubRepo.success`, {
             type: type || '',
             dest,
-        });
+        }));
     }
     return success;
 }
@@ -105,11 +104,11 @@ async function downloadGithubRepoContents(repoPath, contentPath, dest, ref, filt
             if (filter && !filter(contentPiecePath, downloadPath)) {
                 return Promise.resolve();
             }
-            (0, logger_1.debug)(`${i18nKey}.downloadGithubRepoContents.downloading`, {
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.downloadGithubRepoContents.downloading`, {
                 contentPiecePath,
                 downloadUrl: download_url,
                 downloadPath,
-            });
+            }));
             if (contentPieceType === 'dir') {
                 const { data: innerDirContent } = await (0, github_1.fetchRepoContents)(repoPath, contentPiecePath, ref);
                 await Promise.all(innerDirContent.map(downloadContent));
@@ -139,3 +138,25 @@ async function downloadGithubRepoContents(repoPath, contentPath, dest, ref, filt
     }
 }
 exports.downloadGithubRepoContents = downloadGithubRepoContents;
+// Lists content from a public repository at the specified path
+async function listGithubRepoContents(repoPath, contentPath, fileFilter) {
+    try {
+        const { data: contentsResp } = await (0, github_1.fetchRepoContents)(repoPath, contentPath);
+        const filteredFiles = fileFilter && fileFilter != undefined
+            ? contentsResp.filter(item => item.type === fileFilter)
+            : contentsResp;
+        return filteredFiles;
+    }
+    catch (e) {
+        const error = e;
+        if (error?.response?.data?.message) {
+            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.downloadGithubRepoContents.errors.fetchFail`, {
+                errorMessage: error.response.data.message,
+            });
+        }
+        else {
+            (0, standardErrors_1.throwError)(error);
+        }
+    }
+}
+exports.listGithubRepoContents = listGithubRepoContents;

package/lib/oauth.d.ts

@@ -1,7 +1,4 @@
 import OAuth2Manager from '../models/OAuth2Manager';
 import { FlatAccountFields } from '../types/Accounts';
-import { LogCallbacksArg } from '../types/LogCallbacks';
-declare const addOauthToAccountConfigCallbackKeys: readonly ["init", "success"];
 export declare function getOauthManager(accountId: number, accountConfig: FlatAccountFields): OAuth2Manager | undefined;
-export declare function addOauthToAccountConfig(oauth: OAuth2Manager, logCallbacks: LogCallbacksArg<typeof addOauthToAccountConfigCallbackKeys>): void;
-export {};
+export declare function addOauthToAccountConfig(oauth: OAuth2Manager): void;

package/lib/oauth.js

@@ -7,16 +7,15 @@ exports.addOauthToAccountConfig = exports.getOauthManager = void 0;
 const OAuth2Manager_1 = __importDefault(require("../models/OAuth2Manager"));
 const auth_1 = require("../constants/auth");
 const standardErrors_1 = require("../errors/standardErrors");
-const logger_1 = require("../utils/logger");
-const logger_2 = require("../utils/logger");
+const logger_1 = require("./logging/logger");
 const getAccountIdentifier_1 = require("../utils/getAccountIdentifier");
 const config_1 = require("../config");
+const lang_1 = require("../utils/lang");
 const i18nKey = 'lib.oauth';
-const addOauthToAccountConfigCallbackKeys = ['init', 'success'];
 const oauthManagers = new Map();
 function writeOauthTokenInfo(accountConfig) {
     const accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig);
-    (0, logger_1.debug)(`${i18nKey}.writeTokenInfo`, { portalId: accountId || '' });
+    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.writeTokenInfo`, { portalId: accountId || '' }));
     (0, config_1.updateAccountConfig)(accountConfig);
     (0, config_1.writeConfig)();
 }
@@ -27,16 +26,15 @@ function getOauthManager(accountId, accountConfig) {
     return oauthManagers.get(accountId);
 }
 exports.getOauthManager = getOauthManager;
-function addOauthToAccountConfig(oauth, logCallbacks) {
-    const logger = (0, logger_2.makeTypedLogger)(logCallbacks);
-    logger('init', `${i18nKey}.addOauthToAccountConfig.init`);
+function addOauthToAccountConfig(oauth) {
+    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.addOauthToAccountConfig.init`));
     try {
         (0, config_1.updateAccountConfig)({
-            ...oauth.toObj(),
+            ...oauth.account,
             authType: auth_1.AUTH_METHODS.oauth.value,
         });
         (0, config_1.writeConfig)();
-        logger('success', `${i18nKey}.addOauthToAccountConfig.success`);
+        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.addOauthToAccountConfig.success`));
     }
     catch (err) {
         (0, standardErrors_1.throwError)(err);

package/lib/personalAccessKey.js

@@ -11,6 +11,7 @@ const standardErrors_1 = require("../errors/standardErrors");
 const localDevAuth_1 = require("../api/localDevAuth");
 const sandboxHubs_1 = require("../api/sandboxHubs");
 const config_1 = require("../config");
+const config_2 = require("../constants/config");
 const i18nKey = 'lib.personalAccessKey';
 const refreshRequests = new Map();
 function getRefreshKey(personalAccessKey, expiration) {
@@ -101,11 +102,26 @@ async function updateConfigWithAccessToken(token, personalAccessKey, env, name,
     catch (err) {
         // Ignore error, returns 404 if account is not a sandbox
     }
+    let accountType = config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD;
     let sandboxAccountType = null;
-    let parentAccountId = null;
+    let parentAccountId;
     if (hubInfo) {
         if (hubInfo.type !== undefined) {
-            sandboxAccountType = hubInfo.type === null ? 'STANDARD' : hubInfo.type;
+            const sandboxHubType = hubInfo.type ? hubInfo.type.toUpperCase() : null;
+            switch (sandboxHubType) {
+                case 'DEVELOPER':
+                    accountType = config_2.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_SANDBOX;
+                    sandboxAccountType = 'DEVELOPER';
+                    break;
+                case 'STANDARD':
+                    accountType = config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
+                    sandboxAccountType = 'STANDARD';
+                    break;
+                default:
+                    accountType = config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
+                    sandboxAccountType = 'STANDARD';
+                    break;
+            }
         }
         if (hubInfo.parentHubId) {
             parentAccountId = hubInfo.parentHubId;
@@ -113,6 +129,7 @@ async function updateConfigWithAccessToken(token, personalAccessKey, env, name,
     }
     const updatedConfig = (0, config_1.updateAccountConfig)({
         accountId: portalId,
+        accountType,
         personalAccessKey,
         name,
         authType: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,

package/lib/sandboxes.d.ts

@@ -1,5 +1,5 @@
 import { InitiateSyncResponse, Sandbox, SandboxType, SyncTask, Task, Usage } from '../types/Sandbox';
-export declare function createSandbox(accountId: number, name: string, type: string): Promise<{
+export declare function createSandbox(accountId: number, name: string, type: 1 | 2): Promise<{
     name: string;
     sandbox: Sandbox;
     personalAccessKey: string;

package/lib/sandboxes.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchTypes = exports.fetchTaskStatus = exports.initiateSync = exports.getSandboxUsageLimits = exports.deleteSandbox = exports.createSandbox = void 0;
 const sandboxHubs_1 = require("../api/sandboxHubs");
 const sandboxSync_1 = require("../api/sandboxSync");
-const standardErrors_1 = require("../errors/standardErrors");
-const i18nKey = 'lib.sandboxes';
+const apiErrors_1 = require("../errors/apiErrors");
 async function createSandbox(accountId, name, type) {
     try {
         const resp = await (0, sandboxHubs_1.createSandbox)(accountId, name, type);
@@ -14,7 +13,7 @@ async function createSandbox(accountId, name, type) {
         };
     }
     catch (err) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.createSandbox`, {}, err);
+        (0, apiErrors_1.throwApiError)(err);
     }
 }
 exports.createSandbox = createSandbox;
@@ -23,7 +22,7 @@ async function deleteSandbox(parentAccountId, sandboxAccountId) {
         await (0, sandboxHubs_1.deleteSandbox)(parentAccountId, sandboxAccountId);
     }
     catch (err) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.deleteSandbox`, {}, err);
+        (0, apiErrors_1.throwApiError)(err);
     }
     return {
         parentAccountId,
@@ -37,7 +36,7 @@ async function getSandboxUsageLimits(parentAccountId) {
         return resp && resp.usage;
     }
     catch (err) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.getSandboxUsageLimits`, {}, err);
+        (0, apiErrors_1.throwApiError)(err);
     }
 }
 exports.getSandboxUsageLimits = getSandboxUsageLimits;
@@ -46,7 +45,7 @@ async function initiateSync(fromHubId, toHubId, tasks, sandboxHubId) {
         return await (0, sandboxSync_1.initiateSync)(fromHubId, toHubId, tasks, sandboxHubId);
     }
     catch (err) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.initiateSync`, {}, err);
+        (0, apiErrors_1.throwApiError)(err);
     }
 }
 exports.initiateSync = initiateSync;
@@ -55,7 +54,7 @@ async function fetchTaskStatus(accountId, taskId) {
         return await (0, sandboxSync_1.fetchTaskStatus)(accountId, taskId);
     }
     catch (err) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.fetchTaskStatus`, {}, err);
+        (0, apiErrors_1.throwApiError)(err);
     }
 }
 exports.fetchTaskStatus = fetchTaskStatus;
@@ -65,7 +64,7 @@ async function fetchTypes(accountId, toHubId) {
         return resp && resp.results;
     }
     catch (err) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.fetchTypes`, {}, err);
+        (0, apiErrors_1.throwApiError)(err);
     }
 }
 exports.fetchTypes = fetchTypes;

package/lib/trackUsage.js

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackUsage = void 0;
 const axios_1 = __importDefault(require("axios"));
 const getAxiosConfig_1 = require("../http/getAxiosConfig");
-const logger_1 = require("../utils/logger");
+const logger_1 = require("./logging/logger");
 const http_1 = __importDefault(require("../http"));
 const config_1 = require("../config");
 const fileMapper_1 = require("../api/fileMapper");
+const lang_1 = require("../utils/lang");
 const i18nKey = 'lib.trackUsage';
 async function trackUsage(eventName, eventClass, meta = {}, accountId) {
     const usageEvent = {
@@ -31,12 +32,12 @@ async function trackUsage(eventName, eventClass, meta = {}, accountId) {
             analyticsEndpoint = 'vscode-extension-usage';
             break;
         default:
-            (0, logger_1.debug)(`${i18nKey}.invalidEvent`, { eventName });
+            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') {
-        (0, logger_1.debug)(`${i18nKey}.sendingEventAuthenticated`);
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.sendingEventAuthenticated`));
         return http_1.default.post(accountId, {
             url: `${path}/authenticated`,
             data: usageEvent,
@@ -50,7 +51,7 @@ async function trackUsage(eventName, eventClass, meta = {}, accountId) {
         data: usageEvent,
         resolveWithFullResponse: true,
     });
-    (0, logger_1.debug)(`${i18nKey}.sendingEventUnauthenticated`);
+    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.sendingEventUnauthenticated`));
     (0, axios_1.default)({ ...axiosConfig, method: 'post' });
 }
 exports.trackUsage = trackUsage;

package/models/OAuth2Manager.d.ts

@@ -1,4 +1,16 @@
-import { FlatAccountFields, OAuthAccount, TokenInfo } from '../types/Accounts';
+import { FlatAccountFields, TokenInfo } from '../types/Accounts';
+import { Environment } from '../types/Config';
+type OAuth2ManagerAccountConfig = {
+    name?: string;
+    accountId?: number;
+    clientId?: string;
+    clientSecret?: string;
+    scopes?: Array<string>;
+    env?: Environment;
+    environment?: Environment;
+    tokenInfo?: TokenInfo;
+    authType?: 'oauth2';
+};
 type WriteTokenInfoFunction = (tokenInfo: TokenInfo) => void;
 type RefreshTokenResponse = {
     refresh_token: string;
@@ -12,23 +24,14 @@ type ExchangeProof = {
     refresh_token?: string;
 };
 declare class OAuth2Manager {
-    account: OAuthAccount;
-    writeTokenInfo: WriteTokenInfoFunction;
+    account: OAuth2ManagerAccountConfig;
+    writeTokenInfo?: WriteTokenInfoFunction;
     refreshTokenRequest: Promise<RefreshTokenResponse> | null;
-    constructor(account: OAuthAccount, writeTokenInfo: WriteTokenInfoFunction);
+    constructor(account: OAuth2ManagerAccountConfig, writeTokenInfo?: WriteTokenInfoFunction);
     accessToken(): Promise<string | undefined>;
     fetchAccessToken(exchangeProof: ExchangeProof): Promise<void>;
     exchangeForTokens(exchangeProof: ExchangeProof): Promise<void>;
     refreshAccessToken(): Promise<void>;
-    toObj(): {
-        env: import("../types/Config").Environment;
-        clientSecret: string | undefined;
-        clientId: string | undefined;
-        scopes: string[] | undefined;
-        tokenInfo: TokenInfo | undefined;
-        name: string | undefined;
-        accountId: number;
-    };
     static fromConfig(accountConfig: FlatAccountFields, writeTokenInfo: WriteTokenInfoFunction): OAuth2Manager;
 }
 export default OAuth2Manager;

package/models/OAuth2Manager.js

@@ -7,10 +7,11 @@ const axios_1 = __importDefault(require("axios"));
 const moment_1 = __importDefault(require("moment"));
 const urls_1 = require("../lib/urls");
 const environment_1 = require("../lib/environment");
-const logger_1 = require("../utils/logger");
+const logger_1 = require("../lib/logging/logger");
 const getAccountIdentifier_1 = require("../utils/getAccountIdentifier");
 const auth_1 = require("../constants/auth");
 const standardErrors_1 = require("../errors/standardErrors");
+const lang_1 = require("../utils/lang");
 const i18nKey = 'models.OAuth2Manager';
 class OAuth2Manager {
     account;
@@ -25,45 +26,47 @@ class OAuth2Manager {
         }
     }
     async accessToken() {
-        if (!this.account.auth.tokenInfo?.refreshToken) {
+        if (!this.account.tokenInfo?.refreshToken) {
             (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.missingRefreshToken`, {
                 accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
             });
         }
-        if (!this.account.auth.tokenInfo?.accessToken ||
+        if (!this.account.tokenInfo?.accessToken ||
             (0, moment_1.default)()
                 .add(5, 'minutes')
-                .isAfter((0, moment_1.default)(this.account.auth?.tokenInfo.expiresAt))) {
+                .isAfter((0, moment_1.default)(new Date(this.account.tokenInfo.expiresAt || '')))) {
             await this.refreshAccessToken();
         }
-        return this.account.auth?.tokenInfo.accessToken;
+        return this.account.tokenInfo.accessToken;
     }
     async fetchAccessToken(exchangeProof) {
-        (0, logger_1.debug)(`${i18nKey}.fetchingAccessToken`, {
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.fetchingAccessToken`, {
             accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
-            clientId: this.account.auth.clientId || '',
-        });
+            clientId: this.account.clientId || '',
+        }));
         try {
-            const { data } = await axios_1.default.post(`${(0, urls_1.getHubSpotApiOrigin)((0, environment_1.getValidEnv)(this.account.env))}/oauth/v1/token`, {
-                form: exchangeProof,
-                json: true,
+            const { data } = await (0, axios_1.default)({
+                url: `${(0, urls_1.getHubSpotApiOrigin)((0, environment_1.getValidEnv)(this.account.env))}/oauth/v1/token`,
+                method: 'post',
+                data: exchangeProof,
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
             });
             this.refreshTokenRequest = data;
             const { refresh_token: refreshToken, access_token: accessToken, expires_in: expiresIn, } = data;
-            if (!this.account.auth.tokenInfo) {
-                this.account.auth.tokenInfo = {};
+            if (!this.account.tokenInfo) {
+                this.account.tokenInfo = {};
             }
-            this.account.auth.tokenInfo.refreshToken = refreshToken;
-            this.account.auth.tokenInfo.accessToken = accessToken;
-            this.account.auth.tokenInfo.expiresAt = (0, moment_1.default)()
+            this.account.tokenInfo.refreshToken = refreshToken;
+            this.account.tokenInfo.accessToken = accessToken;
+            this.account.tokenInfo.expiresAt = (0, moment_1.default)()
                 .add(Math.round(parseInt(expiresIn) * 0.75), 'seconds')
                 .toString();
             if (this.writeTokenInfo) {
-                (0, logger_1.debug)(`${i18nKey}.updatingTokenInfo`, {
+                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.updatingTokenInfo`, {
                     accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
-                    clientId: this.account.auth.clientId || '',
-                });
-                this.writeTokenInfo(this.account.auth.tokenInfo);
+                    clientId: this.account.clientId || '',
+                }));
+                this.writeTokenInfo(this.account.tokenInfo);
             }
             this.refreshTokenRequest = null;
         }
@@ -75,10 +78,10 @@ class OAuth2Manager {
     async exchangeForTokens(exchangeProof) {
         try {
             if (this.refreshTokenRequest) {
-                (0, logger_1.debug)(`${i18nKey}.refreshingAccessToken`, {
+                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.refreshingAccessToken`, {
                     accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
-                    clientId: this.account.auth.clientId || '',
-                });
+                    clientId: this.account.clientId || '',
+                }));
                 await this.refreshTokenRequest;
             }
             else {
@@ -100,28 +103,17 @@ class OAuth2Manager {
     async refreshAccessToken() {
         const refreshTokenProof = {
             grant_type: 'refresh_token',
-            client_id: this.account.auth.clientId,
-            client_secret: this.account.auth.clientSecret,
-            refresh_token: this.account.auth.tokenInfo?.refreshToken,
+            client_id: this.account.clientId,
+            client_secret: this.account.clientSecret,
+            refresh_token: this.account.tokenInfo?.refreshToken,
         };
         await this.exchangeForTokens(refreshTokenProof);
     }
-    toObj() {
-        return {
-            env: this.account.env,
-            clientSecret: this.account.auth.clientSecret,
-            clientId: this.account.auth.clientId,
-            scopes: this.account.auth.scopes,
-            tokenInfo: this.account.auth.tokenInfo,
-            name: this.account.name,
-            accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
-        };
-    }
     static fromConfig(accountConfig, writeTokenInfo) {
         return new OAuth2Manager({
             ...accountConfig,
             authType: auth_1.AUTH_METHODS.oauth.value,
-            auth: accountConfig.auth || {},
+            ...(accountConfig.auth || {}),
         }, writeTokenInfo);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.2.3",
+    "version": "0.3.0",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "main": "lib/index.js",
     "repository": {
@@ -54,7 +54,8 @@
         "./http": "./http/index.js",
         "./config": "./config/index.js",
         "./constants/*": "./constants/*.js",
-        "./logger": "./lib/logging/logger.js"
+        "./logger": "./lib/logging/logger.js",
+        "./models/*": "./models/*.js"
     },
     "dependencies": {
         "address": "^2.0.1",

package/types/Accounts.d.ts

@@ -1,9 +1,12 @@
+import { HUBSPOT_ACCOUNT_TYPES } from '../constants/config';
 import { Mode } from './Files';
 import { Environment } from './Config';
+import { ValueOf } from './Utils';
 export type AuthType = 'personalaccesskey' | 'apikey' | 'oauth2';
 export interface CLIAccount_NEW {
     name?: string;
     accountId: number;
+    accountType?: AccountType;
     defaultMode?: Mode;
     env: Environment;
     authType?: AuthType;
@@ -20,6 +23,7 @@ export interface CLIAccount_DEPRECATED {
     portalId?: number;
     defaultMode?: Mode;
     env: Environment;
+    accountType?: AccountType;
     authType?: AuthType;
     auth?: {
         tokenInfo?: TokenInfo;
@@ -30,6 +34,7 @@ export interface CLIAccount_DEPRECATED {
     personalAccessKey?: string;
 }
 export type CLIAccount = CLIAccount_NEW | CLIAccount_DEPRECATED;
+export type AccountType = ValueOf<typeof HUBSPOT_ACCOUNT_TYPES>;
 export type TokenInfo = {
     accessToken?: string;
     expiresAt?: string;

package/types/Sandbox.d.ts

@@ -6,9 +6,9 @@ type User = {
     userId: number;
     firstName: string;
     lastName: string;
-    gdprDeleted: boolean;
-    removed: boolean;
-    deactivated: boolean;
+    gdprDeleted?: boolean;
+    removed?: boolean;
+    deactivated?: boolean;
 };
 type TaskError = {
     message: string;
@@ -80,15 +80,15 @@ export type Sandbox = {
     sandboxHubId: number;
     parentHubId: number;
     createdAt: string;
-    updatedAt: string | null;
-    archivedAt: string | null;
+    updatedAt?: string | null;
+    archivedAt?: string | null;
     type: string;
     archived: boolean;
     name: string;
     domain: string;
     createdByUser: User;
-    updatedByUser: User | null;
-    lastSync: {
+    updatedByUser?: User | null;
+    lastSync?: {
         id: string;
         parentHubId: number;
         sandboxHubId: number;
@@ -105,10 +105,10 @@ export type Sandbox = {
         completedAt: string;
         tasks: Array<Task>;
     };
-    currentUserHasAccess: boolean | null;
-    currentUserHasSuperAdminAccess: boolean | null;
-    requestAccessFrom: User | null;
-    superAdminsInSandbox: number | null;
+    currentUserHasAccess?: boolean;
+    currentUserHasSuperAdminAccess?: boolean;
+    requestAccessFrom?: User | null;
+    superAdminsInSandbox?: number;
 };
 export type SandboxResponse = {
     sandbox: Sandbox;
@@ -154,10 +154,11 @@ export type InitiateSyncResponse = {
 export type SandboxType = {
     name: string;
     dependsOn: Array<string>;
-    pushToParentEnabled: boolean;
+    pushToProductionEnabled: boolean;
     isBeta: boolean;
     diffEnabled: boolean;
     groupType: string;
+    syncMandatory: boolean;
 };
 export type FetchTypesResponse = {
     results: Array<SandboxType>;

package/utils/PortManagerServer.js

@@ -8,7 +8,7 @@ const cors_1 = __importDefault(require("cors"));
 const detectPort_1 = require("./detectPort");
 const ports_1 = require("../constants/ports");
 const standardErrors_1 = require("../errors/standardErrors");
-const logger_1 = require("./logger");
+const logger_1 = require("../lib/logging/logger");
 const lang_1 = require("./lang");
 const i18nKey = 'utils.PortManagerServer';
 class PortManagerServer {
@@ -47,9 +47,9 @@ class PortManagerServer {
     listen() {
         return new Promise((resolve, reject) => {
             const server = this.app.listen(ports_1.PORT_MANAGER_SERVER_PORT, () => {
-                (0, logger_1.debug)(`${i18nKey}.started`, {
+                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.started`, {
                     port: ports_1.PORT_MANAGER_SERVER_PORT,
-                });
+                }));
                 resolve(server);
             }).on('error', (err) => {
                 reject(err);
@@ -67,14 +67,14 @@ class PortManagerServer {
         this.app.post('/close', this.closeServer);
     }
     setPort(instanceId, port) {
-        (0, logger_1.debug)(`${i18nKey}.setPort`, { instanceId, port });
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.setPort`, { instanceId, port }));
         this.serverPortMap[instanceId] = port;
     }
     deletePort(instanceId) {
-        (0, logger_1.debug)(`${i18nKey}.deletedPort`, {
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.deletedPort`, {
             instanceId,
             port: this.serverPortMap[instanceId],
-        });
+        }));
         delete this.serverPortMap[instanceId];
     }
     send404(res, instanceId) {
@@ -148,7 +148,7 @@ class PortManagerServer {
     };
     closeServer = (req, res) => {
         if (this.server) {
-            (0, logger_1.debug)(`${i18nKey}.close`);
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.close`));
             res.sendStatus(200);
             this.server.close();
             this.reset();

package/types/LogCallbacks.d.ts

@@ -1,7 +0,0 @@
-import { InterpolationData } from './Lang';
-export type LogCallbacks<T extends string> = {
-    [key in T]?: (interpolationData?: InterpolationData) => void;
-};
-export type LogCallbacksArg<T extends readonly string[]> = {
-    [key in T[number]]?: () => void;
-};

package/types/LogCallbacks.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });