@hubspot/cli 8.18.0-beta.0 → 8.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1 @@
1
+ export declare function getConfigCredentials(): string[];
@@ -0,0 +1,25 @@
1
+ import { getAllConfigAccounts } from '@hubspot/local-dev-lib/config';
2
+ import { API_KEY_AUTH_METHOD, OAUTH_AUTH_METHOD, PERSONAL_ACCESS_KEY_AUTH_METHOD, } from '@hubspot/local-dev-lib/constants/auth';
3
+ function getAccountCredentials(account) {
4
+ if (account.authType === API_KEY_AUTH_METHOD.value) {
5
+ return [account.apiKey];
6
+ }
7
+ const { accessToken, refreshToken } = account.auth?.tokenInfo ?? {};
8
+ if (account.authType === PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
9
+ return [account.personalAccessKey, accessToken, refreshToken];
10
+ }
11
+ if (account.authType === OAUTH_AUTH_METHOD.value) {
12
+ return [account.auth.clientSecret, accessToken, refreshToken];
13
+ }
14
+ return [accessToken, refreshToken];
15
+ }
16
+ export function getConfigCredentials() {
17
+ try {
18
+ return getAllConfigAccounts()
19
+ .flatMap(getAccountCredentials)
20
+ .filter((credential) => Boolean(credential));
21
+ }
22
+ catch {
23
+ return [];
24
+ }
25
+ }
package/lib/feedback.js CHANGED
@@ -1,24 +1,8 @@
1
- import { getAllConfigAccounts } from '@hubspot/local-dev-lib/config';
2
- import { API_KEY_AUTH_METHOD, OAUTH_AUTH_METHOD, PERSONAL_ACCESS_KEY_AUTH_METHOD, } from '@hubspot/local-dev-lib/constants/auth';
3
1
  import { sendFeedback } from '../api/feedback.js';
2
+ import { getConfigCredentials } from './accountCredentials.js';
4
3
  import { pkg } from './jsonLoader.js';
5
- function getAccountCredentials(account) {
6
- if (account.authType === API_KEY_AUTH_METHOD.value) {
7
- return [account.apiKey];
8
- }
9
- const { accessToken, refreshToken } = account.auth?.tokenInfo ?? {};
10
- if (account.authType === PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
11
- return [account.personalAccessKey, accessToken, refreshToken];
12
- }
13
- if (account.authType === OAUTH_AUTH_METHOD.value) {
14
- return [account.auth.clientSecret, accessToken, refreshToken];
15
- }
16
- return [accessToken, refreshToken];
17
- }
18
4
  export function containsAccountCredentials(feedback) {
19
- return getAllConfigAccounts()
20
- .flatMap(getAccountCredentials)
21
- .some(credential => credential && feedback.includes(credential));
5
+ return getConfigCredentials().some(credential => feedback.includes(credential));
22
6
  }
23
7
  export async function submitFeedback(accountId, feedback, source) {
24
8
  await sendFeedback(accountId, {
@@ -12,7 +12,11 @@ type MockErrorResponse = {
12
12
  };
13
13
  };
14
14
  export declare function mockHubSpotHttpResponse<T>(data?: any): HubSpotPromise<T>;
15
- export declare function mockHubSpotHttpError(message: string, response: MockErrorResponse): HubSpotHttpError;
15
+ type MockErrorRequestConfig = {
16
+ url?: string;
17
+ data?: string;
18
+ };
19
+ export declare function mockHubSpotHttpError(message: string, response: MockErrorResponse, config?: MockErrorRequestConfig): HubSpotHttpError;
16
20
  export declare function stubColorEnv(): void;
17
21
  export declare const MOCK_SANDBOX_TARGET: AccountTargetCandidate;
18
22
  export declare const MOCK_PRODUCTION_TARGET: AccountTargetCandidate;
package/lib/testUtils.js CHANGED
@@ -13,9 +13,9 @@ export function mockHubSpotHttpResponse(data) {
13
13
  },
14
14
  });
15
15
  }
16
- export function mockHubSpotHttpError(message, response) {
16
+ export function mockHubSpotHttpError(message, response, config) {
17
17
  return new HubSpotHttpError(message, {
18
- cause: { isAxiosError: true, response },
18
+ cause: { isAxiosError: true, response, config },
19
19
  });
20
20
  }
21
21
  // Stubs the color-detection env to a color-capable interactive baseline.
@@ -1,11 +1,10 @@
1
1
  import z from 'zod';
2
2
  import { Tool } from '../../Tool.js';
3
3
  import { formatErrorTextContents, formatTextContents, } from '../../utils/content.js';
4
+ import { getToolErrorMessage } from '../../utils/errors.js';
4
5
  import { absoluteCurrentWorkingDirectory, docUrl } from './constants.js';
5
6
  import { http } from '@hubspot/local-dev-lib/http/unauthed';
6
- import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
7
7
  import { setupHubSpotConfig } from '../../utils/config.js';
8
- import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
9
8
  const offset = z
10
9
  .number()
11
10
  .int()
@@ -82,10 +81,7 @@ export class DocFetchTool extends Tool {
82
81
  message: 'Handler caught error',
83
82
  error: error instanceof Error ? error.message : String(error),
84
83
  });
85
- if (isHubSpotHttpError(error)) {
86
- return formatErrorTextContents(error.toString());
87
- }
88
- const errorMessage = `Error fetching documentation: ${getErrorMessage(error)}`;
84
+ const errorMessage = `Error fetching documentation: ${getToolErrorMessage(error)}`;
89
85
  return formatErrorTextContents(errorMessage);
90
86
  }
91
87
  }
@@ -2,11 +2,10 @@ import { http } from '@hubspot/local-dev-lib/http';
2
2
  import z from 'zod';
3
3
  import { Tool } from '../../Tool.js';
4
4
  import { formatTextContents } from '../../utils/content.js';
5
+ import { getToolErrorMessage } from '../../utils/errors.js';
5
6
  import { absoluteCurrentWorkingDirectory, account, docsSearchQuery, } from './constants.js';
6
- import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
7
7
  import { setupHubSpotConfig } from '../../utils/config.js';
8
8
  import { resolveAccountId } from './resolveAccount.js';
9
- import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
10
9
  const docsSearchLimit = z
11
10
  .number()
12
11
  .int()
@@ -80,11 +79,7 @@ export class DocsSearchTool extends Tool {
80
79
  message: 'Handler caught error',
81
80
  error: error instanceof Error ? error.message : String(error),
82
81
  });
83
- if (isHubSpotHttpError(error)) {
84
- // Handle different status codes
85
- return formatTextContents(error.toString());
86
- }
87
- const errorMessage = `Error searching documentation: ${getErrorMessage(error)}`;
82
+ const errorMessage = `Error searching documentation: ${getToolErrorMessage(error)}`;
88
83
  return formatTextContents(errorMessage);
89
84
  }
90
85
  }
@@ -2,11 +2,10 @@ import { Tool } from '../../Tool.js';
2
2
  import { z } from 'zod';
3
3
  import { http } from '@hubspot/local-dev-lib/http';
4
4
  import { formatTextContents } from '../../utils/content.js';
5
- import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
5
+ import { getToolErrorMessage } from '../../utils/errors.js';
6
6
  import { absoluteCurrentWorkingDirectory, absoluteProjectPath, account, } from './constants.js';
7
7
  import { setupHubSpotConfig } from '../../utils/config.js';
8
8
  import { resolveAccountId } from './resolveAccount.js';
9
- import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
10
9
  import { elicitSelection } from '../../utils/elicitSelection.js';
11
10
  import { getApps } from './apps.js';
12
11
  const inputSchema = {
@@ -83,11 +82,7 @@ export class GetApiUsagePatternsByAppIdTool extends Tool {
83
82
  message: 'Handler caught error',
84
83
  error: error instanceof Error ? error.message : String(error),
85
84
  });
86
- if (isHubSpotHttpError(error)) {
87
- // Handle HubSpot-specific HTTP errors
88
- return formatTextContents(error.toString());
89
- }
90
- return formatTextContents(getErrorMessage(error));
85
+ return formatTextContents(getToolErrorMessage(error));
91
86
  }
92
87
  }
93
88
  register() {
@@ -1,11 +1,10 @@
1
1
  import { Tool } from '../../Tool.js';
2
2
  import { z } from 'zod';
3
3
  import { formatTextContents } from '../../utils/content.js';
4
- import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
4
+ import { getToolErrorMessage } from '../../utils/errors.js';
5
5
  import { absoluteCurrentWorkingDirectory, absoluteProjectPath, account, } from './constants.js';
6
6
  import { setupHubSpotConfig } from '../../utils/config.js';
7
7
  import { resolveAccountId } from './resolveAccount.js';
8
- import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
9
8
  import { getApps } from './apps.js';
10
9
  const inputSchema = {
11
10
  absoluteCurrentWorkingDirectory,
@@ -39,11 +38,7 @@ export class GetApplicationInfoTool extends Tool {
39
38
  message: 'Handler caught error',
40
39
  error: error instanceof Error ? error.message : String(error),
41
40
  });
42
- if (isHubSpotHttpError(error)) {
43
- // Handle HubSpot-specific HTTP errors
44
- return formatTextContents(error.toString());
45
- }
46
- return formatTextContents(getErrorMessage(error));
41
+ return formatTextContents(getToolErrorMessage(error));
47
42
  }
48
43
  }
49
44
  register() {
@@ -1,7 +1,7 @@
1
1
  import { Tool } from '../../Tool.js';
2
2
  import { z } from 'zod';
3
3
  import { formatTextContents } from '../../utils/content.js';
4
- import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
4
+ import { getToolErrorMessage } from '../../utils/errors.js';
5
5
  import { http } from '@hubspot/local-dev-lib/http';
6
6
  import { getProjectConfig } from '../../../lib/projects/config.js';
7
7
  import { absoluteCurrentWorkingDirectory, absoluteProjectPath, account, } from './constants.js';
@@ -104,17 +104,7 @@ export class GetBuildLogsTool extends Tool {
104
104
  message: 'Handler caught error',
105
105
  error: error instanceof Error ? error.message : String(error),
106
106
  });
107
- let errorMessage;
108
- if (isHubSpotHttpError(error)) {
109
- errorMessage = error.toString();
110
- }
111
- else if (error instanceof Error) {
112
- errorMessage = error.message;
113
- }
114
- else {
115
- errorMessage = String(error);
116
- }
117
- return formatTextContents(absoluteCurrentWorkingDirectory, errorMessage);
107
+ return formatTextContents(absoluteCurrentWorkingDirectory, getToolErrorMessage(error));
118
108
  }
119
109
  }
120
110
  register() {
@@ -1,7 +1,7 @@
1
1
  import { Tool } from '../../Tool.js';
2
2
  import { z } from 'zod';
3
3
  import { formatTextContents } from '../../utils/content.js';
4
- import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
4
+ import { getToolErrorMessage } from '../../utils/errors.js';
5
5
  import { fetchProjectBuilds, getBuildStatus, } from '@hubspot/local-dev-lib/api/projects';
6
6
  import { getProjectConfig } from '../../../lib/projects/config.js';
7
7
  import moment from 'moment';
@@ -145,17 +145,7 @@ export class GetBuildStatusTool extends Tool {
145
145
  message: 'Handler caught error',
146
146
  error: error instanceof Error ? error.message : String(error),
147
147
  });
148
- let errorMessage;
149
- if (isHubSpotHttpError(error)) {
150
- errorMessage = error.toString();
151
- }
152
- else if (error instanceof Error) {
153
- errorMessage = error.message;
154
- }
155
- else {
156
- errorMessage = String(error);
157
- }
158
- return formatTextContents(absoluteCurrentWorkingDirectory, errorMessage);
148
+ return formatTextContents(absoluteCurrentWorkingDirectory, getToolErrorMessage(error));
159
149
  }
160
150
  }
161
151
  register() {
@@ -2,8 +2,8 @@ import { http } from '@hubspot/local-dev-lib/http/unauthed';
2
2
  import z from 'zod';
3
3
  import { Tool } from '../../Tool.js';
4
4
  import { formatTextContents } from '../../utils/content.js';
5
+ import { getToolErrorMessage } from '../../utils/errors.js';
5
6
  import { absoluteCurrentWorkingDirectory, knowledgeSearchQuery, } from './constants.js';
6
- import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
7
7
  import { setupHubSpotConfig } from '../../utils/config.js';
8
8
  import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
9
9
  const knowledgeSearchLimit = z
@@ -61,10 +61,7 @@ export class KnowledgeSearchTool extends Tool {
61
61
  message: 'Handler caught error',
62
62
  error: getErrorMessage(error),
63
63
  });
64
- if (isHubSpotHttpError(error)) {
65
- return formatTextContents(error.toString());
66
- }
67
- const errorMessage = `Error searching the knowledge base: ${getErrorMessage(error)}`;
64
+ const errorMessage = `Error searching the knowledge base: ${getToolErrorMessage(error)}`;
68
65
  return formatTextContents(errorMessage);
69
66
  }
70
67
  }
@@ -1,6 +1,7 @@
1
1
  import z from 'zod';
2
2
  import { Tool } from '../../Tool.js';
3
3
  import { formatTextContents } from '../../utils/content.js';
4
+ import { getToolErrorMessage } from '../../utils/errors.js';
4
5
  import { setupHubSpotConfig } from '../../utils/config.js';
5
6
  import { absoluteCurrentWorkingDirectory, account } from './constants.js';
6
7
  import { resolveAccountId } from './resolveAccount.js';
@@ -53,7 +54,7 @@ export class SubmitFeedbackTool extends Tool {
53
54
  message: 'Handler caught error',
54
55
  error: getErrorMessage(error),
55
56
  });
56
- return formatTextContents(`Error sending feedback: ${getErrorMessage(error)}`);
57
+ return formatTextContents(`Error sending feedback: ${getToolErrorMessage(error)}`);
57
58
  }
58
59
  }
59
60
  register() {
@@ -0,0 +1 @@
1
+ export declare function getToolErrorMessage(error: unknown): string;
@@ -0,0 +1,9 @@
1
+ import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
2
+ import { getErrorMessage } from '../../lib/errorHandlers/index.js';
3
+ import { getConfigCredentials } from '../../lib/accountCredentials.js';
4
+ export function getToolErrorMessage(error) {
5
+ const message = isHubSpotHttpError(error)
6
+ ? error.toString()
7
+ : getErrorMessage(error);
8
+ return getConfigCredentials().reduce((redactedMessage, credential) => redactedMessage.replaceAll(credential, '[redacted]'), message);
9
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hubspot/cli",
3
- "version": "8.18.0-beta.0",
3
+ "version": "8.18.0",
4
4
  "description": "The official CLI for developing on HubSpot",
5
5
  "license": "Apache-2.0",
6
6
  "repository": "https://github.com/HubSpot/hubspot-cli",