Skip to content

Commit a4ad828

Browse files
committed
Revert "add FIREBASE_DATABASE_EMULATOR_HOST_VAR (#596)"
This reverts commit e963005.
1 parent 5f76da7 commit a4ad828

File tree

3 files changed

+0
-33
lines changed

3 files changed

+0
-33
lines changed

src/database/database.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@ import {Database} from '@firebase/database';
99
import * as validator from '../utils/validator';
1010
import { AuthorizedHttpClient, HttpRequestConfig, HttpError } from '../utils/api-request';
1111

12-
/**
13-
* This variable is redefined in the firebase-js-sdk. Before modifying this
14-
* definition, please consult the definition in firebase-js-sdk and ensure that
15-
* they are consistent.
16-
*
17-
* https://github.com/firebase/firebase-js-sdk
18-
*/
19-
export const FIREBASE_DATABASE_EMULATOR_HOST_VAR = 'FIREBASE_DATABASE_EMULATOR_HOST';
2012

2113
/**
2214
* Internals of a Database instance.
@@ -111,10 +103,6 @@ export class DatabaseService implements FirebaseServiceInterface {
111103
} else if (typeof this.appInternal.options.databaseURL !== 'undefined') {
112104
return this.appInternal.options.databaseURL;
113105
}
114-
const dbEmulatorUrl = process.env[FIREBASE_DATABASE_EMULATOR_HOST_VAR];
115-
if (dbEmulatorUrl) {
116-
return 'http://' + dbEmulatorUrl;
117-
}
118106
throw new FirebaseDatabaseError({
119107
code: 'invalid-argument',
120108
message: 'Can\'t determine Firebase Database URL.',

test/unit/firebase-app.spec.ts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import {Database} from '@firebase/database';
4141
import {InstanceId} from '../../src/instance-id/instance-id';
4242
import {ProjectManagement} from '../../src/project-management/project-management';
4343
import { FirebaseAppError, AppErrorCodes } from '../../src/utils/error';
44-
import { FIREBASE_DATABASE_EMULATOR_HOST_VAR } from '../../src/database/database';
4544

4645
chai.should();
4746
chai.use(sinonChai);
@@ -435,29 +434,12 @@ describe('FirebaseApp', () => {
435434
});
436435

437436
it('should throw when databaseURL is not set', () => {
438-
delete process.env[FIREBASE_DATABASE_EMULATOR_HOST_VAR];
439437
const app = firebaseNamespace.initializeApp(mocks.appOptionsNoDatabaseUrl, mocks.appName);
440438
expect(() => {
441439
app.database();
442440
}).to.throw('Can\'t determine Firebase Database URL.');
443441
});
444442

445-
it('should use FIREBASE_DATABASE_EMULATOR_HOST when databaseURL not set', () => {
446-
const url = 'localhost.com:9000?ns=test';
447-
process.env[FIREBASE_DATABASE_EMULATOR_HOST_VAR] = url;
448-
const app = firebaseNamespace.initializeApp(mocks.appOptionsNoDatabaseUrl, mocks.appName);
449-
const db: Database = app.database();
450-
expect(db.ref().toString()).to.equal('http://localhost.com:9000/');
451-
});
452-
453-
it('should prefer databaseURL when FIREBASE_DATABASE_EMULATOR_HOST set', () => {
454-
const url = 'localhost.com:9000?ns=test';
455-
process.env[FIREBASE_DATABASE_EMULATOR_HOST_VAR] = url;
456-
const app = firebaseNamespace.initializeApp(mocks.appOptions, mocks.appName);
457-
const db: Database = app.database();
458-
expect(db.ref().toString()).to.equal('https://databasename.firebaseio.com/');
459-
});
460-
461443
it('should return a cached version of Database on subsequent calls', () => {
462444
const app = firebaseNamespace.initializeApp(mocks.appOptions, mocks.appName);
463445
const db1: Database = app.database();

test/unit/firebase.spec.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ import * as mocks from '../resources/mocks';
2929
import * as firebaseAdmin from '../../src/index';
3030
import {ApplicationDefaultCredential, CertCredential, RefreshTokenCredential} from '../../src/auth/credential';
3131

32-
import {FIREBASE_DATABASE_EMULATOR_HOST_VAR} from '../../src/database/database';
33-
3432
chai.should();
3533
chai.use(chaiAsPromised);
3634

@@ -170,7 +168,6 @@ describe('Firebase', () => {
170168
});
171169

172170
it('should throw given no databaseURL key when initializing the app', () => {
173-
delete process.env[FIREBASE_DATABASE_EMULATOR_HOST_VAR];
174171
firebaseAdmin.initializeApp(mocks.appOptionsNoDatabaseUrl);
175172

176173
expect(() => {

0 commit comments

Comments
 (0)