Fix circular dependencies [DPGDXFE-1017] (#369)

* Fix circular dependencies

* Add circular deps precommit check and fix linting

* Remove authorizedScopesForPortalAndUser

* Remove prepare script

* Remove prepare script

* undo experimental version

Author: camden11

.husky/pre-commit

@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npm run lint
+yarn lint
+yarn circular-deps

api/developerTestAccounts.ts

@@ -1,9 +1,5 @@
-import { httpClient } from '../http/client.js';
 import { http } from '../http/index.js';
-import { getAxiosConfig } from '../http/getAxiosConfig.js';
-import { ENVIRONMENTS } from '../constants/environments.js';
 import {
-  DeveloperTestAccount,
   CreateDeveloperTestAccountResponse,
   FetchDeveloperTestAccountsResponse,
   DeveloperTestAccountConfig,
@@ -13,7 +9,6 @@ import {
   GenerateDeveloperTestAccountPersonalAccessKeyResponse,
 } from '../types/developerTestAccounts.js';
 import { SANDBOX_TIMEOUT } from '../constants/api.js';
-import { Environment } from '../types/Config.js';
 import { HubSpotPromise } from '../types/Http.js';
 
 const TEST_ACCOUNTS_API_PATH = 'integrators/test-portals/v2';
@@ -70,27 +65,6 @@ export function deleteDeveloperTestAccount(
   });
 }
 
-export function fetchDeveloperTestAccountData(
-  accessToken: string,
-  accountId: number,
-  env: Environment = ENVIRONMENTS.PROD
-): HubSpotPromise<DeveloperTestAccount> {
-  const axiosConfig = getAxiosConfig({
-    env,
-    url: `${TEST_ACCOUNTS_API_PATH}/self`,
-    params: { portalId: accountId },
-  });
-  const reqWithToken = {
-    ...axiosConfig,
-    headers: {
-      ...axiosConfig.headers,
-      Authorization: `Bearer ${accessToken}`,
-    },
-  };
-
-  return httpClient<DeveloperTestAccount>(reqWithToken);
-}
-
 export function installOauthAppIntoDeveloperTestAccount(
   accountId: number,
   testAccountId: number,

api/fileMapper.ts

@@ -4,11 +4,10 @@ import contentDisposition from 'content-disposition';
 import { AxiosResponse } from 'axios';
 import { http } from '../http/index.js';
 import { getCwd } from '../lib/path.js';
+import { FILE_MAPPER_API_PATH } from '../constants/endpoints.js';
 import { FileMapperNode, FileMapperOptions, FileTree } from '../types/Files.js';
 import { HubSpotPromise } from '../types/Http.js';
 
-export const FILE_MAPPER_API_PATH = 'content/filemapper/v1';
-
 export function createFileMapperNodeFromStreamResponse(
   filePath: string,
   response: Partial<AxiosResponse>

api/fireAlarm.ts

@@ -1,9 +1,8 @@
 import { http } from '../http/index.js';
+import { FIREALARM_API_AUTH_PATH } from '../constants/endpoints.js';
 import { FireAlarm } from '../types/FireAlarm.js';
 import { HubSpotPromise } from '../types/Http.js';
 
-export const FIREALARM_API_AUTH_PATH = 'firealarm/v4/alarm';
-
 export function fetchFireAlarms(
   accountId: number
 ): HubSpotPromise<Array<FireAlarm>> {

api/localDevAuth.ts

@@ -1,42 +1,13 @@
-import { getAxiosConfig } from '../http/getAxiosConfig.js';
 import { http } from '../http/index.js';
-import { ENVIRONMENTS } from '../constants/environments.js';
-import { Environment } from '../types/Config.js';
+import { LOCALDEVAUTH_API_AUTH_PATH } from '../constants/endpoints.js';
 import {
   ScopeData,
-  AccessTokenResponse,
   EnabledFeaturesResponse,
   ScopeAuthorizationResponse,
 } from '../types/Accounts.js';
-import { httpClient } from '../http/client.js';
 import { PublicAppInstallationData } from '../types/Apps.js';
 import { HubSpotPromise } from '../types/Http.js';
 
-const LOCALDEVAUTH_API_AUTH_PATH = 'localdevauth/v1/auth';
-
-export const LOCALDEVAUTH_ACCESS_TOKEN_PATH = `${LOCALDEVAUTH_API_AUTH_PATH}/refresh`;
-
-export function fetchAccessToken(
-  personalAccessKey: string,
-  env: Environment = ENVIRONMENTS.PROD,
-  portalId?: number
-): HubSpotPromise<AccessTokenResponse> {
-  const axiosConfig = getAxiosConfig({
-    env,
-    localHostOverride: true,
-    url: LOCALDEVAUTH_ACCESS_TOKEN_PATH,
-    data: {
-      encodedOAuthRefreshToken: personalAccessKey,
-    },
-    params: portalId ? { portalId } : {},
-  });
-
-  return httpClient<AccessTokenResponse>({
-    ...axiosConfig,
-    method: 'post',
-  });
-}
-
 export function fetchScopeData(
   accountId: number,
   scopeGroup: string

api/sandboxHubs.ts

@@ -1,13 +1,7 @@
-import { AxiosPromise } from 'axios';
-import { httpClient } from '../http/client.js';
 import { http } from '../http/index.js';
-import { getAxiosConfig } from '../http/getAxiosConfig.js';
-import { ENVIRONMENTS } from '../constants/environments.js';
 import { SANDBOX_TIMEOUT } from '../constants/api.js';
-import { Environment } from '../types/Config.js';
 import {
   SandboxPersonalAccessKey,
-  SandboxHubData,
   SandboxResponse,
   SandboxUsageLimitsResponse,
   V2Sandbox,
@@ -46,27 +40,6 @@ export function getSandboxUsageLimits(
   });
 }
 
-export function fetchSandboxHubData(
-  accessToken: string,
-  accountId: number,
-  env: Environment = ENVIRONMENTS.PROD
-): AxiosPromise<SandboxHubData> {
-  const axiosConfig = getAxiosConfig({
-    env,
-    url: `${SANDBOX_API_PATH}/self`,
-    params: { portalId: accountId },
-  });
-  const reqWithToken = {
-    ...axiosConfig,
-    headers: {
-      ...axiosConfig.headers,
-      Authorization: `Bearer ${accessToken}`,
-    },
-  };
-
-  return httpClient<SandboxHubData>(reqWithToken);
-}
-
 export function createV2Sandbox(
   accountId: number,
   name: string,

config/__tests__/defaultAccountOverride.test.ts

@@ -5,20 +5,14 @@ import {
   getDefaultAccountOverrideAccountId,
   getDefaultAccountOverrideFilePath,
 } from '../defaultAccountOverride';
-import * as config from '../index';
 import { PersonalAccessKeyConfigAccount } from '../../types/Accounts';
 import { PERSONAL_ACCESS_KEY_AUTH_METHOD } from '../../constants/auth';
 
 vi.mock('fs-extra');
 vi.mock('findup-sync');
-vi.mock('../index');
 
 const mockFs = fs as Mocked<typeof fs>;
 const mockFindup = findup as MockedFunction<typeof findup>;
-const mockGetAllConfigAccounts =
-  config.getAllConfigAccounts as MockedFunction<
-    typeof config.getAllConfigAccounts
-  >;
 
 const PAK_ACCOUNT: PersonalAccessKeyConfigAccount = {
   name: 'test-account',
@@ -36,27 +30,25 @@ describe('defaultAccountOverride', () => {
   describe('getDefaultAccountOverrideAccountId()', () => {
     it('returns null when override file does not exist', () => {
       mockFindup.mockReturnValueOnce(null);
-      expect(getDefaultAccountOverrideAccountId()).toBeNull();
+      expect(getDefaultAccountOverrideAccountId([PAK_ACCOUNT])).toBeNull();
     });
 
     it('throws an error when override file exists but is not a number', () => {
       mockFindup.mockReturnValueOnce('.hsaccount');
       mockFs.readFileSync.mockReturnValueOnce('string');
-      expect(() => getDefaultAccountOverrideAccountId()).toThrow();
+      expect(() => getDefaultAccountOverrideAccountId([PAK_ACCOUNT])).toThrow();
     });
 
     it('throws an error when account specified in override file does not exist in config', () => {
       mockFindup.mockReturnValueOnce('.hsaccount');
       mockFs.readFileSync.mockReturnValueOnce('234');
-      mockGetAllConfigAccounts.mockReturnValueOnce([PAK_ACCOUNT]);
-      expect(() => getDefaultAccountOverrideAccountId()).toThrow();
+      expect(() => getDefaultAccountOverrideAccountId([PAK_ACCOUNT])).toThrow();
     });
 
     it('returns the account ID when an account with that ID exists in config', () => {
       mockFindup.mockReturnValueOnce('.hsaccount');
       mockFs.readFileSync.mockReturnValueOnce('123');
-      mockGetAllConfigAccounts.mockReturnValueOnce([PAK_ACCOUNT]);
-      expect(getDefaultAccountOverrideAccountId()).toBe(123);
+      expect(getDefaultAccountOverrideAccountId([PAK_ACCOUNT])).toBe(123);
     });
   });
 

config/__tests__/utils.test.ts

@@ -1,4 +1,12 @@
-import { vi, describe, it, expect, afterEach, MockedFunction, Mocked } from 'vitest';
+import {
+  vi,
+  describe,
+  it,
+  expect,
+  afterEach,
+  MockedFunction,
+  Mocked,
+} from 'vitest';
 import fs from 'fs-extra';
 import {
   getLocalConfigDefaultFilePath,

config/defaultAccountOverride.ts

@@ -9,11 +9,13 @@ import {
 } from '../constants/config.js';
 import { i18n } from '../utils/lang.js';
 import { FileSystemError } from '../models/FileSystemError.js';
-import { getAllConfigAccounts } from './index.js';
+import { HubSpotConfigAccount } from '../types/Accounts.js';
 
 const i18nKey = 'config.defaultAccountOverride';
 
-export function getDefaultAccountOverrideAccountId(): number | null {
+export function getDefaultAccountOverrideAccountId(
+  accounts: Array<HubSpotConfigAccount>
+): number | null {
   const defaultAccountOverrideFilePath = getDefaultAccountOverrideFilePath();
 
   if (!defaultAccountOverrideFilePath) {
@@ -47,8 +49,6 @@ export function getDefaultAccountOverrideAccountId(): number | null {
     );
   }
 
-  const accounts = getAllConfigAccounts();
-
   const account = accounts?.find(account => account.accountId === accountId);
   if (!account) {
     throw new Error(

config/index.ts

@@ -32,7 +32,7 @@ import {
   doesConfigFileExistAtPath,
 } from './utils.js';
 import { CMS_PUBLISH_MODE } from '../constants/files.js';
-import { Environment } from '../types/Config.js';
+import { Environment } from '../types/Accounts.js';
 import { i18n } from '../utils/lang.js';
 import { getDefaultAccountOverrideAccountId } from './defaultAccountOverride.js';
 import { getValidEnv } from '../lib/environment.js';
@@ -269,7 +269,7 @@ export function getConfigDefaultAccount(): HubSpotConfigAccount {
   const globalConfigPath = getGlobalConfigFilePath();
   if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
     const defaultAccountOverrideAccountId =
-      getDefaultAccountOverrideAccountId();
+      getDefaultAccountOverrideAccountId(accounts);
     defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
   }
 
@@ -311,7 +311,7 @@ export function getConfigDefaultAccountIfExists():
   const globalConfigPath = getGlobalConfigFilePath();
   if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
     const defaultAccountOverrideAccountId =
-      getDefaultAccountOverrideAccountId();
+      getDefaultAccountOverrideAccountId(accounts);
     defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
   }