fix: Removed last of the stringified response bodies in response messages

Author: jonathanedey

src/app-check/app-check-api-client-internal.ts

@@ -185,7 +185,7 @@ export class AppCheckApiClient {
     if (error.status && error.status in APP_CHECK_ERROR_CODE_MAPPING) {
       code = APP_CHECK_ERROR_CODE_MAPPING[error.status];
     }
-    const message = error.message || `Unknown server error: ${response.text}`;
+    const message = error.message || 'Unknown server error';
     return new FirebaseAppCheckError({ code, message, httpResponse: toHttpResponse(response), cause: err });
   }
 

src/app-check/token-generator.ts

@@ -25,6 +25,7 @@ import {
 } from './app-check-api-client-internal';
 import { AppCheckTokenOptions } from './app-check-api';
 import { RequestResponseError } from '../utils/api-request';
+import { toHttpResponse } from '../utils/error';
 
 const ONE_MINUTE_IN_SECONDS = 60;
 const ONE_MINUTE_IN_MILLIS = ONE_MINUTE_IN_SECONDS * 1000;
@@ -157,7 +158,7 @@ export function appCheckErrorFromCryptoSignerError(err: Error): Error {
     const errorResponse = httpError.response.data;
     if (errorResponse?.error) {
       const status = errorResponse.error.status;
-      const description = errorResponse.error.message || JSON.stringify(httpError.response);
+      const description = errorResponse.error.message || 'Unknown server error';
 
       let code: AppCheckErrorCode = 'unknown-error';
       if (status && status in APP_CHECK_ERROR_CODE_MAPPING) {
@@ -166,12 +167,14 @@ export function appCheckErrorFromCryptoSignerError(err: Error): Error {
       return new FirebaseAppCheckError({
         code,
         message: `Error returned from server while signing a custom token: ${description}`,
+        httpResponse: toHttpResponse(httpError.response),
         cause: err
       });
     }
     return new FirebaseAppCheckError({
       code: 'internal-error',
-      message: 'Error returned from server: ' + JSON.stringify(errorResponse) + '.',
+      message: 'Error returned from server.',
+      httpResponse: toHttpResponse(httpError.response),
       cause: err
     });
   }

src/data-connect/data-connect-api-client-internal.ts

@@ -413,7 +413,7 @@ export class DataConnectApiClient {
     if (error.status && error.status in DATA_CONNECT_ERROR_CODE_MAPPING) {
       code = DATA_CONNECT_ERROR_CODE_MAPPING[error.status];
     }
-    const message = error.message || `Unknown server error: ${response.text}`;
+    const message = error.message || 'Unknown server error';
     return new FirebaseDataConnectError({
       code,
       message,

src/extensions/extensions-api-client-internal.ts

@@ -92,7 +92,7 @@ export class ExtensionsApiClient {
       });
     }
     const error = response.data?.error;
-    const message = error?.message || `Unknown server error: ${response.text}`;
+    const message = error?.message || 'Unknown server error';
     switch (error.code) {
     case 403:
       return new FirebaseExtensionsError({

src/firestore/firestore-internal.ts

@@ -165,8 +165,8 @@ function initFirestore(app: App, databaseId: string, firestoreSettings?: Firesto
     throw new FirebaseFirestoreError({
       code: 'missing-dependencies',
       message: 'Failed to import the Cloud Firestore client library for Node.js. '
-        + 'Make sure to install the "@google-cloud/firestore" npm package. '
-        + `Original error: ${err}`,
+        + 'Make sure to install the "@google-cloud/firestore" npm package.',
+      cause: err as Error,
     });
   }
 

src/functions/functions-api-client-internal.ts

@@ -397,7 +397,7 @@ export class FunctionsApiClient {
     if (error.status && error.status in FUNCTIONS_ERROR_CODE_MAPPING) {
       code = FUNCTIONS_ERROR_CODE_MAPPING[error.status];
     }
-    const message = error.message || `Unknown server error: ${response.text}`;
+    const message = error.message || 'Unknown server error';
     return new FirebaseFunctionsError({ code, message, httpResponse: toHttpResponse(response), cause: err });
   }
 }

src/installations/installations-request-handler.ts

@@ -17,7 +17,7 @@
 
 import { App } from '../app/index';
 import { FirebaseApp } from '../app/firebase-app';
-import { FirebaseInstallationsError, InstallationsClientErrorCode } from '../utils/error';
+import { FirebaseInstallationsError, InstallationsClientErrorCode, toHttpResponse } from '../utils/error';
 import {
   ApiSettings, AuthorizedHttpClient, HttpRequestConfig, RequestResponseError,
 } from '../utils/api-request';
@@ -33,7 +33,7 @@ const FIREBASE_IID_PATH = '/v1/';
 const FIREBASE_IID_TIMEOUT = 10000;
 
 /** HTTP error codes raised by the backend server. */
-const ERROR_CODES: {[key: number]: string} = {
+const ERROR_CODES: { [key: number]: string; } = {
   400: 'Malformed installation ID argument.',
   401: 'Request not authorized.',
   403: 'Project does not match installation ID or the client does not have sufficient privileges.',
@@ -100,7 +100,12 @@ export class FirebaseInstallationsRequestHandler {
           const template: string = ERROR_CODES[response.status];
           const message: string = template ?
             `Installation ID "${apiSettings.getEndpoint()}": ${template}` : errorMessage;
-          throw new FirebaseInstallationsError(InstallationsClientErrorCode.API_ERROR, message);
+          throw new FirebaseInstallationsError({
+            ...InstallationsClientErrorCode.API_ERROR,
+            message,
+            httpResponse: toHttpResponse(response),
+            cause: err,
+          });
         }
         // In case of timeouts and other network errors, the HttpClient returns a
         // FirebaseError wrapped in the response. Simply throw it here.

src/machine-learning/machine-learning-api-client.ts

@@ -401,7 +401,7 @@ export class MachineLearningApiClient {
     if (error.status && error.status in ERROR_CODE_MAPPING) {
       code = ERROR_CODE_MAPPING[error.status];
     }
-    const message = error.message || `Unknown server error: ${response.text}`;
+    const message = error.message || 'Unknown server error';
     return new FirebaseMachineLearningError({
       code,
       message,

src/project-management/project-management-api-request-internal.ts

@@ -19,7 +19,7 @@ import { FirebaseApp } from '../app/firebase-app';
 import {
   AuthorizedHttpClient, RequestResponseError, HttpMethod, HttpRequestConfig, ExponentialBackoffPoller,
 } from '../utils/api-request';
-import { FirebaseProjectManagementError, ProjectManagementErrorCode } from '../utils/error';
+import { FirebaseProjectManagementError, ProjectManagementErrorCode, HttpResponse, toHttpResponse } from '../utils/error';
 import { getSdkVersion } from '../utils/index';
 import * as validator from '../utils/validator';
 import { ShaCertificate } from './android-app';
@@ -68,7 +68,7 @@ export class ProjectManagementRequestHandler {
     `https://${PROJECT_MANAGEMENT_HOST_AND_PORT}${PROJECT_MANAGEMENT_BETA_PATH}`;
   private readonly httpClient: AuthorizedHttpClient;
 
-  private static wrapAndRethrowHttpError(errStatusCode: number, errText?: string): void {
+  private static wrapAndRethrowHttpError(errStatusCode: number, errText?: string, httpResponse?: HttpResponse): void {
     let errorCode: ProjectManagementErrorCode;
     let errorMessage: string;
 
@@ -111,7 +111,12 @@ export class ProjectManagementRequestHandler {
     }
     throw new FirebaseProjectManagementError({
       code: errorCode,
-      message: `${errorMessage} Status code: ${errStatusCode}. Raw server response: "${errText}".`
+      message: errorMessage,
+      httpResponse: httpResponse || {
+        status: errStatusCode,
+        headers: {},
+        data: errText,
+      },
     });
   }
 
@@ -332,7 +337,7 @@ export class ProjectManagementRequestHandler {
       .catch((err) => {
         if (err instanceof RequestResponseError) {
           ProjectManagementRequestHandler.wrapAndRethrowHttpError(
-            err.response.status, err.response.text);
+            err.response.status, err.response.text, toHttpResponse(err.response));
         }
         throw err;
       });

src/remote-config/remote-config-api-client-internal.ts

@@ -270,7 +270,7 @@ export class RemoteConfigApiClient {
     if (error.status && error.status in ERROR_CODE_MAPPING) {
       code = ERROR_CODE_MAPPING[error.status];
     }
-    const message = error.message || `Unknown server error: ${response.text}`;
+    const message = error.message || 'Unknown server error';
     return new FirebaseRemoteConfigError({ code, message, httpResponse: toHttpResponse(response), cause: err });
   }