@hubspot/cli 7.10.0 → 7.10.1-experimental.0

package/lib/__tests__/commonOpts.test.js

@@ -1,9 +1,8 @@
 import { CMS_PUBLISH_MODE, DEFAULT_CMS_PUBLISH_MODE, } from '@hubspot/local-dev-lib/constants/files';
-import { getAndLoadConfigIfNeeded, getAccountConfig, loadConfigFromEnvironment, } from '@hubspot/local-dev-lib/config';
+import { getConfig, getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { getCmsPublishMode } from '../commonOpts.js';
-const mockedGetAccountConfig = getAccountConfig;
-const mockedGetAndLoadConfigIfNeeded = getAndLoadConfigIfNeeded;
-const mockedLoadConfigFromEnvironment = loadConfigFromEnvironment;
+const mockedGetConfigAccountById = getConfigAccountById;
+const mockedGetConfig = getConfig;
 function buildArguments(args) {
     return {
         _: [],
@@ -42,8 +41,8 @@ describe('lib/commonOpts', () => {
         describe('cms publish mode option precedence', () => {
             describe('1. --cmsPublishMode', () => {
                 it('should return the cms publish mode specified by the command option if present.', () => {
-                    mockedGetAndLoadConfigIfNeeded.mockReturnValue(configWithDefaultCmsPublishMode);
-                    mockedGetAccountConfig.mockReturnValue(devAccountConfig);
+                    mockedGetConfig.mockReturnValue(configWithDefaultCmsPublishMode);
+                    mockedGetConfigAccountById.mockReturnValue(devAccountConfig);
                     expect(getCmsPublishMode(buildArguments({
                         cmsPublishMode: CMS_PUBLISH_MODE.draft,
                     }))).toBe(CMS_PUBLISH_MODE.draft);
@@ -54,9 +53,8 @@ describe('lib/commonOpts', () => {
             });
             describe('2. hubspot.config.yml -> config.accounts[x].defaultCmsPublishMode', () => {
                 it('should return the defaultCmsPublishMode specified by the account specific config if present.', () => {
-                    mockedGetAndLoadConfigIfNeeded.mockReturnValue(configWithDefaultCmsPublishMode);
-                    mockedGetAccountConfig.mockReturnValue(devAccountConfig);
-                    mockedLoadConfigFromEnvironment.mockReturnValue(undefined);
+                    mockedGetConfig.mockReturnValue(configWithDefaultCmsPublishMode);
+                    mockedGetConfigAccountById.mockReturnValue(devAccountConfig);
                     expect(getCmsPublishMode(buildArguments({
                         account: accounts.DEV,
                     }))).toBe(CMS_PUBLISH_MODE.draft);
@@ -64,9 +62,8 @@ describe('lib/commonOpts', () => {
             });
             describe('3. hubspot.config.yml -> config.defaultCmsPublishMode', () => {
                 it('should return the defaultCmsPublishMode specified by the config if present.', () => {
-                    mockedGetAndLoadConfigIfNeeded.mockReturnValue(configWithDefaultCmsPublishMode);
-                    mockedGetAccountConfig.mockReturnValue(prodAccountConfig);
-                    mockedLoadConfigFromEnvironment.mockReturnValue(undefined);
+                    mockedGetConfig.mockReturnValue(configWithDefaultCmsPublishMode);
+                    mockedGetConfigAccountById.mockReturnValue(prodAccountConfig);
                     expect(getCmsPublishMode(buildArguments({
                         account: accounts.PROD,
                     }))).toBe(CMS_PUBLISH_MODE.draft);
@@ -74,7 +71,6 @@ describe('lib/commonOpts', () => {
             });
             describe('4. DEFAULT_CMS_PUBLISH_MODE', () => {
                 it('should return the defaultCmsPubishMode specified by the config if present.', () => {
-                    mockedLoadConfigFromEnvironment.mockReturnValue(undefined);
                     expect(getCmsPublishMode(buildArguments({
                         account: 'xxxxx',
                     }))).toBe(DEFAULT_CMS_PUBLISH_MODE);

package/lib/__tests__/developerTestAccounts.test.js

@@ -1,16 +1,18 @@
-import { getAccountId, getConfigAccounts } from '@hubspot/local-dev-lib/config';
+import { getAllConfigAccounts, getConfigAccountIfExists, getConfigAccountById, } from '@hubspot/local-dev-lib/config';
 import { uiLogger } from '../ui/logger.js';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { fetchDeveloperTestAccounts } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { mockHubSpotHttpError } from '../testUtils.js';
 import * as errorHandlers from '../errorHandlers/index.js';
 import { getHasDevTestAccounts, handleDeveloperTestAccountCreateError, validateDevTestAccountUsageLimits, } from '../developerTestAccounts.js';
+import { logError } from '../errorHandlers/index.js';
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/developerTestAccounts');
 vi.mock('../errorHandlers');
-const mockedGetAccountId = getAccountId;
-const mockedGetConfigAccounts = getConfigAccounts;
+const mockedGetConfigAccountIfExists = getConfigAccountIfExists;
+const mockedGetAllConfigAccounts = getAllConfigAccounts;
+const mockedGetConfigAccountById = getConfigAccountById;
 const mockedFetchDeveloperTestAccounts = fetchDeveloperTestAccounts;
 const APP_DEVELOPER_ACCOUNT_1 = {
     name: 'app-developer-1',
@@ -33,41 +35,43 @@ const accounts = [
         parentAccountId: APP_DEVELOPER_ACCOUNT_1.accountId,
         accountType: HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST,
         env: 'prod',
+        authType: 'personalaccesskey',
     },
 ];
 describe('lib/developerTestAccounts', () => {
     describe('getHasDevTestAccounts()', () => {
         it('should return true if there are developer test accounts associated with the account', () => {
-            mockedGetAccountId.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1.accountId);
-            mockedGetConfigAccounts.mockReturnValueOnce(accounts);
+            mockedGetAllConfigAccounts.mockReturnValueOnce(accounts);
             const result = getHasDevTestAccounts(APP_DEVELOPER_ACCOUNT_1);
             expect(result).toBe(true);
         });
         it('should return false if there are no developer test accounts associated with the account', () => {
-            mockedGetAccountId.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_2.accountId);
-            mockedGetConfigAccounts.mockReturnValueOnce(accounts);
+            mockedGetConfigAccountIfExists.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_2);
+            mockedGetAllConfigAccounts.mockReturnValueOnce(accounts);
             const result = getHasDevTestAccounts(APP_DEVELOPER_ACCOUNT_2);
             expect(result).toBe(false);
         });
         it('should return false if there are no accounts configured', () => {
-            mockedGetAccountId.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1.accountId);
-            mockedGetConfigAccounts.mockReturnValueOnce(undefined);
+            mockedGetConfigAccountIfExists.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1);
+            mockedGetAllConfigAccounts.mockReturnValueOnce(undefined);
             const result = getHasDevTestAccounts(APP_DEVELOPER_ACCOUNT_1);
             expect(result).toBe(false);
         });
     });
     describe('validateDevTestAccountUsageLimits()', () => {
         afterEach(() => {
-            mockedGetAccountId.mockRestore();
+            mockedGetConfigAccountIfExists.mockRestore();
             mockedFetchDeveloperTestAccounts.mockRestore();
         });
         it('should return null if the account id is not found', async () => {
-            mockedGetAccountId.mockReturnValueOnce(undefined);
+            mockedFetchDeveloperTestAccounts.mockResolvedValueOnce({
+                data: null,
+            });
             const result = await validateDevTestAccountUsageLimits(APP_DEVELOPER_ACCOUNT_1);
             expect(result).toBe(null);
         });
         it('should return null if there is no developer test account data', async () => {
-            mockedGetAccountId.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1.accountId);
+            mockedGetConfigAccountIfExists.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1);
             mockedFetchDeveloperTestAccounts.mockResolvedValueOnce({
                 data: null,
             });
@@ -75,7 +79,7 @@ describe('lib/developerTestAccounts', () => {
             expect(result).toBe(null);
         });
         it('should return the test account data if the account has not reached the limit', async () => {
-            mockedGetAccountId.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1.accountId);
+            mockedGetConfigAccountIfExists.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1);
             const testAccountData = {
                 maxTestPortals: 10,
                 results: [],
@@ -87,7 +91,7 @@ describe('lib/developerTestAccounts', () => {
             expect(result).toEqual(expect.objectContaining(testAccountData));
         });
         it('should throw an error if the account has reached the limit', async () => {
-            mockedGetAccountId.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1.accountId);
+            mockedGetConfigAccountIfExists.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1);
             mockedFetchDeveloperTestAccounts.mockResolvedValueOnce({
                 data: {
                     maxTestPortals: 0,
@@ -103,6 +107,14 @@ describe('lib/developerTestAccounts', () => {
         beforeEach(() => {
             loggerErrorSpy = vi.spyOn(uiLogger, 'error');
             logErrorSpy = vi.spyOn(errorHandlers, 'logError');
+            // Mock account config for uiAccountDescription calls
+            mockedGetConfigAccountById.mockReturnValue({
+                accountId: APP_DEVELOPER_ACCOUNT_1.accountId,
+                name: 'Test Account',
+                authType: 'personalaccesskey',
+                personalAccessKey: 'test-key',
+                env: 'prod',
+            });
         });
         afterEach(() => {
             loggerErrorSpy.mockRestore();
@@ -117,7 +129,7 @@ describe('lib/developerTestAccounts', () => {
                 },
             });
             expect(() => handleDeveloperTestAccountCreateError(missingScopesError, APP_DEVELOPER_ACCOUNT_1.accountId, 'prod', 10)).toThrow('Missing scopes error');
-            expect(loggerErrorSpy).toHaveBeenCalled();
+            expect(uiLogger.error).toHaveBeenCalled();
         });
         it('should log and throw an error if the account is missing the required scopes', () => {
             const portalLimitReachedError = mockHubSpotHttpError('Portal limit reached error', {
@@ -128,7 +140,7 @@ describe('lib/developerTestAccounts', () => {
                 },
             });
             expect(() => handleDeveloperTestAccountCreateError(portalLimitReachedError, APP_DEVELOPER_ACCOUNT_1.accountId, 'prod', 10)).toThrow('Portal limit reached error');
-            expect(loggerErrorSpy).toHaveBeenCalled();
+            expect(uiLogger.error).toHaveBeenCalled();
         });
         it('should log a generic error message for an unknown error type', () => {
             const someUnknownError = mockHubSpotHttpError('Some unknown error', {
@@ -139,7 +151,7 @@ describe('lib/developerTestAccounts', () => {
                 },
             });
             expect(() => handleDeveloperTestAccountCreateError(someUnknownError, APP_DEVELOPER_ACCOUNT_1.accountId, 'prod', 10)).toThrow('Some unknown error');
-            expect(logErrorSpy).toHaveBeenCalled();
+            expect(logError).toHaveBeenCalled();
         });
     });
 });

package/lib/__tests__/importData.test.js

@@ -1,6 +1,6 @@
 import { uiLogger } from '../ui/logger.js';
 import { createImport } from '@hubspot/local-dev-lib/api/crm';
-import { getAccountConfig, getAccountId } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById, getConfigAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { handleImportData, handleTargetTestAccountSelectionFlow, } from '../importData.js';
 import { lib } from '../../lang/en.js';
 import { isDeveloperTestAccount, isStandardAccount, isAppDeveloperAccount, } from '../accountTypes.js';
@@ -13,8 +13,8 @@ vi.mock('../prompts/importDataTestAccountSelectPrompt');
 describe('lib/importData', () => {
     const mockUiLogger = vi.mocked(uiLogger);
     const mockCreateImport = vi.mocked(createImport);
-    const mockGetAccountConfig = vi.mocked(getAccountConfig);
-    const mockGetAccountId = vi.mocked(getAccountId);
+    const mockGetConfigAccountById = vi.mocked(getConfigAccountById);
+    const mockGetConfigAccountIfExists = vi.mocked(getConfigAccountIfExists);
     const mockIsDeveloperTestAccount = vi.mocked(isDeveloperTestAccount);
     const mockIsStandardAccount = vi.mocked(isStandardAccount);
     const mockIsAppDeveloperAccount = vi.mocked(isAppDeveloperAccount);
@@ -24,8 +24,8 @@ describe('lib/importData', () => {
         mockUiLogger.success.mockReset();
         mockUiLogger.error.mockReset();
         mockCreateImport.mockReset();
-        mockGetAccountConfig.mockReset();
-        mockGetAccountId.mockReset();
+        mockGetConfigAccountById.mockReset();
+        mockGetConfigAccountIfExists.mockReset();
         mockIsDeveloperTestAccount.mockReset();
         mockIsStandardAccount.mockReset();
         mockIsAppDeveloperAccount.mockReset();
@@ -56,32 +56,42 @@ describe('lib/importData', () => {
         const userProvidedAccountId = '1234';
         const derivedAccountId = 123456789;
         it('should error if the userProvidedAccountId is not the right account type', async () => {
-            mockGetAccountConfig.mockReturnValue({});
-            mockGetAccountId.mockReturnValue(1234);
+            mockGetConfigAccountIfExists.mockReturnValue({
+                accountId: 1234,
+            });
             mockIsDeveloperTestAccount.mockReturnValue(false);
             await expect(handleTargetTestAccountSelectionFlow(derivedAccountId, userProvidedAccountId)).rejects.toThrow(lib.importData.errors.notDeveloperTestAccount);
         });
         it('should error if the derivedAccountId belongs to the wrong account type', async () => {
-            mockGetAccountConfig.mockReturnValue({});
+            mockGetConfigAccountIfExists.mockReturnValue({
+                accountId: derivedAccountId,
+            });
+            mockGetConfigAccountById.mockReturnValue({
+                accountId: derivedAccountId,
+            });
             mockIsDeveloperTestAccount.mockReturnValue(false);
             mockIsStandardAccount.mockReturnValue(false);
             mockIsAppDeveloperAccount.mockReturnValue(false);
             await expect(handleTargetTestAccountSelectionFlow(derivedAccountId, undefined)).rejects.toThrow(lib.importData.errors.incorrectAccountType(derivedAccountId));
         });
         it('should return the derivedAccountId if it is a developer test account', async () => {
-            mockGetAccountConfig.mockReturnValue({});
             mockIsDeveloperTestAccount.mockReturnValue(true);
+            mockGetConfigAccountById.mockReturnValue({
+                accountId: derivedAccountId,
+            });
             const result = await handleTargetTestAccountSelectionFlow(derivedAccountId, undefined);
             expect(result).toBe(derivedAccountId);
         });
         it('should return the result of the importDataTestAccountSelectPrompt if the derivedAccountId is a standard or app developer account', async () => {
-            mockGetAccountConfig.mockReturnValue({});
             mockIsDeveloperTestAccount.mockReturnValue(false);
             mockIsStandardAccount.mockReturnValue(true);
             mockIsAppDeveloperAccount.mockReturnValue(true);
             mockImportDataTestAccountSelectPrompt.mockResolvedValue({
                 selectedAccountId: 890223,
             });
+            mockGetConfigAccountById.mockReturnValue({
+                accountId: derivedAccountId,
+            });
             const result = await handleTargetTestAccountSelectionFlow(derivedAccountId, undefined);
             expect(result).toBe(890223);
         });

package/lib/__tests__/oauth.test.js

@@ -1,7 +1,7 @@
 import express from 'express';
 import open from 'open';
 import { OAuth2Manager } from '@hubspot/local-dev-lib/models/OAuth2Manager';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { addOauthToAccountConfig } from '@hubspot/local-dev-lib/oauth';
 import { uiLogger } from '../ui/logger.js';
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
@@ -15,18 +15,22 @@ vi.mock('@hubspot/local-dev-lib/oauth');
 vi.mock('../ui/logger.js');
 const mockedExpress = express;
 const mockedOAuth2Manager = OAuth2Manager;
-const mockedGetAccountConfig = getAccountConfig;
+const mockedGetConfigAccountById = getConfigAccountById;
 describe('lib/oauth', () => {
     const mockExpressReq = {
         query: { code: 'test-auth-code' },
     };
     const mockExpressResp = { send: vi.fn() };
     const mockAccountConfig = {
+        name: 'test-account',
         accountId: 123,
-        clientId: 'test-client-id',
-        clientSecret: 'test-client-secret',
-        scopes: ['test-scope'],
+        authType: 'oauth2',
         env: ENVIRONMENTS.PROD,
+        auth: {
+            clientId: 'test-client-id',
+            clientSecret: 'test-client-secret',
+            scopes: ['test-scope'],
+        },
     };
     beforeEach(() => {
         mockedExpress.mockReturnValue({
@@ -49,7 +53,7 @@ describe('lib/oauth', () => {
                 exchangeForTokens: vi.fn().mockResolvedValue({}),
             };
             mockedOAuth2Manager.mockImplementation(() => mockOAuth2Manager);
-            mockedGetAccountConfig.mockReturnValue({
+            mockedGetConfigAccountById.mockReturnValue({
                 env: ENVIRONMENTS.PROD,
             });
             await authenticateWithOauth(mockAccountConfig);
@@ -66,7 +70,10 @@ describe('lib/oauth', () => {
         it('should handle missing clientId', async () => {
             const invalidConfig = {
                 ...mockAccountConfig,
-                clientId: undefined,
+                auth: {
+                    ...mockAccountConfig.auth,
+                    clientId: undefined,
+                },
             };
             mockedOAuth2Manager.mockImplementation(() => ({
                 account: invalidConfig,
@@ -74,6 +81,7 @@ describe('lib/oauth', () => {
             const exitSpy = vi.spyOn(process, 'exit').mockImplementation(() => {
                 throw new Error('exit');
             });
+            // @ts-expect-error Testing invalid config
             await expect(authenticateWithOauth(invalidConfig)).rejects.toThrow('exit');
             expect(uiLogger.error).toHaveBeenCalled();
             expect(exitSpy).toHaveBeenCalled();
@@ -82,7 +90,10 @@ describe('lib/oauth', () => {
         it('should use default scopes when none provided', async () => {
             const configWithoutScopes = {
                 ...mockAccountConfig,
-                scopes: undefined,
+                auth: {
+                    ...mockAccountConfig.auth,
+                    scopes: [],
+                },
             };
             const mockOAuth2Manager = {
                 account: configWithoutScopes,