@hubspot/cli 7.10.0-beta.1 → 7.10.0-experimental.0

package/lib/middleware/gitMiddleware.js

@@ -1,15 +1,19 @@
-import { getConfigPath, configFileExists } from '@hubspot/local-dev-lib/config';
+import { getConfigFilePath, globalConfigFileExists, } from '@hubspot/local-dev-lib/config';
 import { checkAndWarnGitInclusion } from '../ui/git.js';
+import { debugError } from '../errorHandlers/index.js';
 export function checkAndWarnGitInclusionMiddleware(argv) {
     // Skip this when no command is provided
     if (argv._.length) {
         // Skip if using global config
-        if (configFileExists(true)) {
+        if (globalConfigFileExists()) {
             return;
         }
-        const configPath = getConfigPath();
-        if (configPath) {
+        try {
+            const configPath = getConfigFilePath();
             checkAndWarnGitInclusion(configPath);
         }
+        catch (error) {
+            debugError(error);
+        }
     }
 }

package/lib/oauth.d.ts

@@ -1,2 +1,2 @@
-import { OAuth2ManagerAccountConfig } from '@hubspot/local-dev-lib/types/Accounts';
-export declare function authenticateWithOauth(accountConfig: OAuth2ManagerAccountConfig): Promise<void>;
+import { OAuthConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
+export declare function authenticateWithOauth(accountConfig: OAuthConfigAccount): Promise<void>;

package/lib/oauth.js

@@ -1,8 +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 { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { addOauthToAccountConfig } from '@hubspot/local-dev-lib/oauth';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { uiLogger } from './ui/logger.js';
@@ -14,15 +13,15 @@ import { EXIT_CODES } from './enums/exitCodes.js';
 const PORT = 3000;
 const redirectUri = `http://localhost:${PORT}/oauth-callback`;
 function buildAuthUrl(oauthManager) {
-    const { env: accountEnv, clientId, scopes: accountScopes, } = oauthManager.account;
+    const { env: accountEnv, auth } = oauthManager.account;
     const env = accountEnv || ENVIRONMENTS.PROD;
-    const scopes = accountScopes || DEFAULT_OAUTH_SCOPES;
-    if (!clientId) {
+    const scopes = auth.scopes.length > 0 ? auth.scopes : DEFAULT_OAUTH_SCOPES;
+    if (!auth.clientId) {
         uiLogger.error(lib.oauth.missingClientId);
         process.exit(EXIT_CODES.ERROR);
     }
     return (`${getHubSpotWebsiteOrigin(env)}/oauth/${oauthManager.account.accountId}/authorize` +
-        `?client_id=${encodeURIComponent(clientId)}` + // app's client ID
+        `?client_id=${encodeURIComponent(auth.clientId)}` + // app's client ID
         `&scope=${encodeURIComponent(scopes.join(' '))}` + // scopes being requested by the app
         `&redirect_uri=${encodeURIComponent(redirectUri)}` // where to send the user after the consent page
     );
@@ -45,8 +44,8 @@ async function authorize(oauthManager) {
             if (req.query.code) {
                 const authCodeProof = {
                     grant_type: 'authorization_code',
-                    client_id: oauthManager.account.clientId,
-                    client_secret: oauthManager.account.clientSecret,
+                    client_id: oauthManager.account.auth.clientId,
+                    client_secret: oauthManager.account.auth.clientSecret,
                     redirect_uri: redirectUri,
                     code: req.query.code,
                 };
@@ -82,8 +81,7 @@ async function authorize(oauthManager) {
     });
 }
 function setupOauth(accountConfig) {
-    const accountId = getAccountIdentifier(accountConfig);
-    const config = getAccountConfig(accountId);
+    const config = getConfigAccountById(accountConfig.accountId);
     return new OAuth2Manager({
         ...accountConfig,
         env: accountConfig.env || config?.env || ENVIRONMENTS.PROD,

package/lib/projects/__tests__/AppDevModeInterface.test.js

@@ -12,7 +12,7 @@ vi.mock('@hubspot/ui-extensions-dev-server', () => {
 });
 import { fetchAppInstallationData } from '@hubspot/local-dev-lib/api/localDevAuth';
 import { fetchAppMetadataByUid, fetchPublicAppProductionInstallCounts, installStaticAuthAppOnTestAccount, } from '@hubspot/local-dev-lib/api/appsDev';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import AppDevModeInterface from '../localDev/AppDevModeInterface.js';
 import LocalDevState from '../localDev/LocalDevState.js';
 import LocalDevLogger from '../localDev/LocalDevLogger.js';
@@ -121,7 +121,7 @@ describe('AppDevModeInterface', () => {
                 previouslyAuthorizedScopeGroups: [],
             },
         });
-        getAccountConfig.mockReturnValue({
+        getConfigAccountById.mockReturnValue({
             parentAccountId: 12345,
         });
         isDeveloperTestAccount.mockReturnValue(true);
@@ -290,13 +290,14 @@ describe('AppDevModeInterface', () => {
         });
         it('should handle app reinstallation', async () => {
             // Set up conditions for non-automatic installation
-            getAccountConfig.mockReturnValue(null);
             fetchAppInstallationData.mockResolvedValue({
                 data: {
                     isInstalledWithScopeGroups: false,
                     previouslyAuthorizedScopeGroups: ['old-scope'],
                 },
             });
+            // Make it not automatically installable by making it not a test account
+            isDeveloperTestAccount.mockReturnValue(false);
             await appDevModeInterface.setup();
             expect(installAppBrowserPrompt).toHaveBeenCalledWith('http://static-install-url', true);
         });
@@ -308,7 +309,7 @@ describe('AppDevModeInterface', () => {
         });
         it('should exit if user declines auto-install', async () => {
             // Set up conditions for automatic installation
-            getAccountConfig.mockReturnValue({
+            getConfigAccountById.mockReturnValue({
                 parentAccountId: 12345, // matches targetProjectAccountId
             });
             isDeveloperTestAccount.mockReturnValue(true);
@@ -375,6 +376,15 @@ describe('AppDevModeInterface', () => {
                 data: { uniquePortalInstallCount: 5 },
             });
             getStaticAuthAppInstallUrl.mockReturnValue('http://static-install-url');
+            getConfigAccountById.mockReturnValue({
+                parentAccountId: 12345,
+            });
+            isDeveloperTestAccount.mockReturnValue(true);
+            isSandbox.mockReturnValue(false);
+            installAppAutoPrompt.mockResolvedValue(true);
+            confirmPrompt.mockResolvedValue(true);
+            installStaticAuthAppOnTestAccount.mockResolvedValue(undefined);
+            isServerRunningAtUrl.mockResolvedValue(true);
             installAppBrowserPrompt.mockImplementation(async () => {
                 const addListenerCall = mockLocalDevState.addListener.mock.calls.find(call => call[0] === 'devServerMessage');
                 if (addListenerCall) {
@@ -387,8 +397,8 @@ describe('AppDevModeInterface', () => {
             mockLocalDevState.getAppDataByUid = vi.fn().mockReturnValue(mockAppData);
             mockLocalDevState.setAppDataForUid = vi.fn();
             mockLocalDevState.addListener = vi.fn();
-            // Target account config is missing
-            getAccountConfig.mockReturnValue(null);
+            // Target account config is missing - make it not a test account so isAutomaticallyInstallable returns false
+            isDeveloperTestAccount.mockReturnValue(false);
             // App is not installed
             fetchAppInstallationData.mockResolvedValue({
                 data: {
@@ -401,6 +411,7 @@ describe('AppDevModeInterface', () => {
                 localDevState: mockLocalDevState,
                 localDevLogger: mockLocalDevLogger,
             });
+            // Remove the spy to see if that's causing the timeout
             await newAppDevModeInterface.setup();
             expect(installAppBrowserPrompt).toHaveBeenCalled();
         });

package/lib/projects/__tests__/DevServerManager.test.js

@@ -28,6 +28,7 @@ vi.mock('@hubspot/local-dev-lib/config', () => ({
     getAccountId: vi.fn().mockReturnValue(123),
     hasLocalStateFlag: vi.fn().mockReturnValue(false),
     getConfigDefaultAccount: vi.fn().mockReturnValue({ accountId: 123 }),
+    globalConfigFileExists: vi.fn().mockReturnValue(true),
 }));
 vi.mock('@hubspot/local-dev-lib/urls', () => ({
     getHubSpotApiOrigin: vi.fn().mockReturnValue('https://api.hubspot.com'),

package/lib/projects/__tests__/LocalDevProcess.test.js

@@ -26,6 +26,7 @@ vi.mock('../deploy');
 vi.mock('../config');
 vi.mock('@hubspot/local-dev-lib/api/projects');
 vi.mock('@hubspot/local-dev-lib/errors/index');
+vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../localDev/LocalDevLogger');
 vi.mock('../localDev/DevServerManager');
 // Tests for LocalDevProcess and LocalDevState

package/lib/projects/__tests__/components.test.js

@@ -341,7 +341,7 @@ describe('lib/projects/components', () => {
             // The differentiator is appended with a hyphen, so the final UID has a hyphen before the number
             expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/path/to/component1.meta.json', JSON.stringify({
                 type: 'card',
-                uid: 'card_collision_project-2',
+                uid: 'card_collision_project_2',
             }, null, 2));
         });
         it('falls back to original uid when coerceToValidUid returns null', () => {

package/lib/projects/__tests__/deploy.test.js

@@ -8,6 +8,7 @@ import { pollDeployStatus } from '../pollProjectBuildAndDeploy.js';
 // Mock external dependencies
 vi.mock('../../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/projects');
+vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../pollProjectBuildAndDeploy.js');
 const mockUiLogger = vi.mocked(uiLogger);
 const mockDeployProject = vi.mocked(deployProject);