Update HubSpotAuthError definition and usage

errors/HubSpotAuthError.ts

@@ -1,6 +1,23 @@
+import { StatusCodeError } from '../types/Error';
+
 export class HubSpotAuthError extends Error {
-  constructor(message: string) {
+  statusCode?: number;
+  category?: string;
+  subCategory?: string;
+  constructor(
+    message: string,
+    { cause = {} }: { cause?: Partial<StatusCodeError> }
+  ) {
     super(message);
     this.name = 'HubSpotAuthError';
+    this.statusCode = cause.statusCode;
+    this.category =
+      (cause.response && cause.response.body && cause.response.body.category) ||
+      undefined;
+    this.subCategory =
+      (cause.response &&
+        cause.response.body &&
+        cause.response.body.subCategory) ||
+      undefined;
   }
 }

errors/standardErrors.ts

@@ -53,7 +53,7 @@ export function throwTypeErrorWithMessage(
 export function throwAuthErrorWithMessage(
   identifier: string,
   interpolation?: { [key: string]: string | number },
-  cause?: BaseError
+  cause?: StatusCodeError
 ): never {
   genericThrowErrorWithMessage(
     // @ts-expect-error HubSpotAuthError is not callable

lang/en.lyaml

@@ -125,7 +125,6 @@ en:
     personalAccessKey:
       accountNotFound: "Account with id {{ accountId }} does not exist."
       invalidPersonalAccessKey: "Error while retrieving new access token: {{ errorMessage }}."
-      invalidPersonalAccessKey401: 'Error while retrieving new access token: {{ errorMessage }}. Your personal access key is invalid. Please run "hs auth personalaccesskey" to reauthenticate. See https://designers.hubspot.com/docs/personal-access-keys for more information.'
     utils:
       git:
         configIgnore: "Unable to determine if config file is properly ignored by git."

lib/personalAccessKey.ts

@@ -38,21 +38,11 @@ export async function getAccessToken(
   } catch (e) {
     const error = e as StatusCodeError;
     if (error.response) {
-      if (error.response.statusCode === 401) {
-        // Before adjusting the error message below, please verify that changes do not break regex match in cli/commands/sandbox/delete.js
-        // For future changes: if response.statusCode is passed into the new error below, sandboxes can skip the regex check and pull the statusCode instead
-        throwAuthErrorWithMessage(
-          'personalAccessKey.invalidPersonalAccessKey401',
-          { errorMessage: error.response.body.message },
-          error
-        );
-      } else {
-        throwAuthErrorWithMessage(
-          'personalAccessKey.invalidPersonalAccessKey',
-          { errorMessage: error.response.body.message },
-          error
-        );
-      }
+      throwAuthErrorWithMessage(
+        'personalAccessKey.invalidPersonalAccessKey',
+        { errorMessage: error.response.body.message },
+        error
+      );
     } else {
       throwError(e as BaseError);
     }