Skip to content

Commit

Permalink
Specify customData structure for FirebaseStorageError type
Browse files Browse the repository at this point in the history
  • Loading branch information
hsubox76 committed Oct 16, 2020
1 parent a934feb commit 8ec97ca
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 3 additions & 1 deletion packages/firebase/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7620,7 +7620,9 @@ declare namespace firebase.storage {
/**
* An error returned by the Firebase Storage SDK.
*/
interface FirebaseStorageError extends FirebaseError {}
interface FirebaseStorageError extends FirebaseError {
customData: { serverResponse: string | null };
}

interface StorageObserver<T> {
next?: NextFn<T> | null;
Expand Down
4 changes: 3 additions & 1 deletion packages/storage-types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ export interface UploadMetadata extends SettableMetadata {
md5Hash?: string | null;
}

export interface FirebaseStorageError extends FirebaseError {}
interface FirebaseStorageError extends FirebaseError {
customData: { serverResponse: string | null };
}

export interface StorageObserver<T> {
next?: NextFn<T> | null;
Expand Down
3 changes: 1 addition & 2 deletions packages/storage/src/implementation/error.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@ import { FirebaseError } from '@firebase/util';
import { CONFIG_STORAGE_BUCKET_KEY } from './constants';

export class FirebaseStorageError extends FirebaseError {
customData: { serverResponse: string | null };
customData: { serverResponse: string | null } = { serverResponse: null };

constructor(code: Code, message: string) {
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 {
Expand Down

0 comments on commit 8ec97ca

Please sign in to comment.