Remove serverResponse field in favor of customData

Author: hsubox76

packages/firebase/index.d.ts

@@ -7620,12 +7620,7 @@ declare namespace firebase.storage {
   /**
    * An error returned by the Firebase Storage SDK.
    */
-  interface FirebaseStorageError {
-    name: string;
-    code: string;
-    message: string;
-    serverResponse: null | string;
-  }
+  interface FirebaseStorageError extends FirebaseError {}
 
   interface StorageObserver<T> {
     next?: NextFn<T> | null;

packages/storage-types/index.d.ts

@@ -16,7 +16,7 @@
  */
 
 import { FirebaseApp } from '@firebase/app-types';
-import { CompleteFn, NextFn, Unsubscribe } from '@firebase/util';
+import { CompleteFn, FirebaseError, NextFn, Unsubscribe } from '@firebase/util';
 
 export interface FullMetadata extends UploadMetadata {
   bucket: string;
@@ -85,12 +85,7 @@ export interface UploadMetadata extends SettableMetadata {
   md5Hash?: string | null;
 }
 
-export interface FirebaseStorageError {
-  name: string;
-  code: string;
-  message: string;
-  serverResponse: null | string;
-}
+export interface FirebaseStorageError extends FirebaseError {}
 
 export interface StorageObserver<T> {
   next?: NextFn<T> | null;

packages/storage/src/implementation/error.ts

@@ -1,3 +1,4 @@
+import { FirebaseError } from '@firebase/util';
 /**
  * @license
  * Copyright 2017 Google LLC
@@ -16,53 +17,35 @@
  */
 import { CONFIG_STORAGE_BUCKET_KEY } from './constants';
 
-export class FirebaseStorageError implements Error {
-  private code_: string;
-  private message_: string;
-  private serverResponse_: string | null;
-  private name_: string;
+export class FirebaseStorageError extends FirebaseError {
+  customData: { serverResponse: string | null };
 
   constructor(code: Code, message: string) {
-    this.code_ = prependCode(code);
-    this.message_ = 'Firebase Storage: ' + message;
-    this.serverResponse_ = null;
-    this.name_ = 'FirebaseError';
-  }
-
-  codeProp(): string {
-    return this.code;
+    super(prependCode(code), 'Firebase Storage: ' + message);
+    // Without this, `instanceof FirebaseStorageError`, in tests for example,
+    // returns false.
+    Object.setPrototypeOf(this, FirebaseStorageError.prototype);
+    this.customData = { serverResponse: null };
   }
 
   codeEquals(code: Code): boolean {
-    return prependCode(code) === this.codeProp();
-  }
-
-  serverResponseProp(): string | null {
-    return this.serverResponse_;
-  }
-
-  setServerResponseProp(serverResponse: string | null): void {
-    this.serverResponse_ = serverResponse;
-  }
-
-  get name(): string {
-    return this.name_;
-  }
-
-  get code(): string {
-    return this.code_;
+    return prependCode(code) === this.code;
   }
 
   get message(): string {
-    if (this.serverResponse_) {
-      return this.message_ + '\n' + this.serverResponse_;
+    if (this.customData.serverResponse) {
+      return this.message + '\n' + this.customData.serverResponse;
     } else {
-      return this.message_;
+      return this.message;
     }
   }
 
   get serverResponse(): null | string {
-    return this.serverResponse_;
+    return this.customData.serverResponse;
+  }
+
+  set serverResponse(serverResponse: string | null) {
+    this.customData.serverResponse = serverResponse;
   }
 }
 

packages/storage/src/implementation/request.ts

@@ -188,7 +188,7 @@ class NetworkRequest<T> implements Request<T> {
       } else {
         if (xhr !== null) {
           const err = unknown();
-          err.setServerResponseProp(xhr.getResponseText());
+          err.serverResponse = xhr.getResponseText();
           if (self.errorCallback_) {
             reject(self.errorCallback_(xhr, err));
           } else {

packages/storage/src/implementation/requests.ts

@@ -114,7 +114,7 @@ export function sharedErrorHandler(
         }
       }
     }
-    newErr.setServerResponseProp(err.serverResponseProp());
+    newErr.serverResponse = err.serverResponse;
     return newErr;
   }
   return errorHandler;
@@ -133,7 +133,7 @@ export function objectErrorHandler(
     if (xhr.getStatus() === 404) {
       newErr = objectNotFound(location.path);
     }
-    newErr.setServerResponseProp(err.serverResponseProp());
+    newErr.serverResponse = err.serverResponse;
     return newErr;
   }
   return errorHandler;