Skip to content

Commit 1d96622

Browse files
authored
Fix FirebaseApp overwriting FirebaseError name field (#1911)
* use appName to avoid naming conflict with FirebaseError * remove warning msg when creating a FirebaseError * [AUTOMATED]: Prettier Code Styling * revert
1 parent 7043422 commit 1d96622

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

packages/app/src/errors.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ export const enum AppError {
2828

2929
const ERRORS: ErrorMap<AppError> = {
3030
[AppError.NO_APP]:
31-
"No Firebase App '{$name}' has been created - " +
31+
"No Firebase App '{$appName}' has been created - " +
3232
'call Firebase App.initializeApp()',
33-
[AppError.BAD_APP_NAME]: "Illegal App name: '{$name}",
34-
[AppError.DUPLICATE_APP]: "Firebase App named '{$name}' already exists",
35-
[AppError.APP_DELETED]: "Firebase App named '{$name}' already deleted",
33+
[AppError.BAD_APP_NAME]: "Illegal App name: '{$appName}",
34+
[AppError.DUPLICATE_APP]: "Firebase App named '{$appName}' already exists",
35+
[AppError.APP_DELETED]: "Firebase App named '{$appName}' already deleted",
3636
[AppError.DUPLICATE_SERVICE]:
37-
"Firebase service named '{$name}' already registered",
37+
"Firebase service named '{$appName}' already registered",
3838
[AppError.INVALID_APP_ARGUMENT]:
39-
'firebase.{$name}() takes either no argument or a ' +
39+
'firebase.{$appName}() takes either no argument or a ' +
4040
'Firebase App instance.'
4141
};
4242

43-
type ErrorParams = { [key in AppError]: { name: string } };
43+
type ErrorParams = { [key in AppError]: { appName: string } };
4444

4545
export const ERROR_FACTORY = new ErrorFactory<AppError, ErrorParams>(
4646
'app',

packages/app/src/firebaseApp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export class FirebaseAppImpl implements FirebaseApp {
203203
*/
204204
private checkDestroyed_(): void {
205205
if (this.isDeleted_) {
206-
throw ERROR_FACTORY.create(AppError.APP_DELETED, { name: this.name_ });
206+
throw ERROR_FACTORY.create(AppError.APP_DELETED, { appName: this.name_ });
207207
}
208208
}
209209
}

packages/app/src/firebaseNamespaceCore.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export function createFirebaseNamespaceCore(
104104
function app(name?: string): FirebaseApp {
105105
name = name || DEFAULT_ENTRY_NAME;
106106
if (!contains(apps, name)) {
107-
throw ERROR_FACTORY.create(AppError.NO_APP, { name });
107+
throw ERROR_FACTORY.create(AppError.NO_APP, { appName: name });
108108
}
109109
return apps[name];
110110
}
@@ -137,11 +137,13 @@ export function createFirebaseNamespaceCore(
137137
const { name } = config;
138138

139139
if (typeof name !== 'string' || !name) {
140-
throw ERROR_FACTORY.create(AppError.BAD_APP_NAME, { name: String(name) });
140+
throw ERROR_FACTORY.create(AppError.BAD_APP_NAME, {
141+
appName: String(name)
142+
});
141143
}
142144

143145
if (contains(apps, name)) {
144-
throw ERROR_FACTORY.create(AppError.DUPLICATE_APP, { name });
146+
throw ERROR_FACTORY.create(AppError.DUPLICATE_APP, { appName: name });
145147
}
146148

147149
const app = new firebaseAppImpl(
@@ -180,7 +182,7 @@ export function createFirebaseNamespaceCore(
180182
): FirebaseServiceNamespace<FirebaseService> {
181183
// Cannot re-register a service that already exists
182184
if (factories[name]) {
183-
throw ERROR_FACTORY.create(AppError.DUPLICATE_SERVICE, { name });
185+
throw ERROR_FACTORY.create(AppError.DUPLICATE_SERVICE, { appName: name });
184186
}
185187

186188
// Capture the service factory for later service instantiation
@@ -203,7 +205,7 @@ export function createFirebaseNamespaceCore(
203205
// Invalid argument.
204206
// This happens in the following case: firebase.storage('gs:/')
205207
throw ERROR_FACTORY.create(AppError.INVALID_APP_ARGUMENT, {
206-
name
208+
appName: name
207209
});
208210
}
209211

packages/app/src/lite/firebaseAppLite.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ export class FirebaseAppLiteImpl implements FirebaseApp {
168168
*/
169169
private checkDestroyed_(): void {
170170
if (this.isDeleted_) {
171-
throw ERROR_FACTORY.create(AppError.APP_DELETED, { name: this.name_ });
171+
throw ERROR_FACTORY.create(AppError.APP_DELETED, { appName: this.name_ });
172172
}
173173
}
174174
}

0 commit comments

Comments
 (0)