Skip to content

Compat and @exp class for Database #4705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 2, 2021
Merged

Compat and @exp class for Database #4705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab6d226
Add events to database@exp
schmidt-sebastian Mar 31, 2021
038dea4
Update Index import once again
schmidt-sebastian Mar 31, 2021
d7391dc
Compat and @exp class for Database
schmidt-sebastian Mar 31, 2021
3bebafc
Merge
schmidt-sebastian Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/database/.idea/runConfigurations/All_Tests.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions packages/database/exp/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ import { _registerComponent, registerVersion } from '@firebase/app-exp';
import { Component, ComponentType } from '@firebase/component';

import { version } from '../package.json';
import { FirebaseDatabase } from '../src/exp/Database';
import {
FirebaseDatabase,
repoManagerDatabaseFromApp
} from '../src/exp/Database';

export {
enableLogging,
Expand Down Expand Up @@ -79,7 +82,7 @@ function registerDatabase(): void {
(container, { instanceIdentifier: url }) => {
const app = container.getProvider('app-exp').getImmediate()!;
const authProvider = container.getProvider('auth-internal');
return new FirebaseDatabase(app, authProvider, url);
return repoManagerDatabaseFromApp(app, authProvider, url);
},
ComponentType.PUBLIC
).setMultipleInstances(true)
Expand Down
9 changes: 6 additions & 3 deletions packages/database/index.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ import { CONSTANTS, isNodeSdk } from '@firebase/util';
import { Client } from 'faye-websocket';

import { name, version } from './package.json';
import { Database, repoManagerDatabaseFromApp } from './src/api/Database';
import { Database } from './src/api/Database';
import * as INTERNAL from './src/api/internal';
import { DataSnapshot, Query, Reference } from './src/api/Reference';
import * as TEST_ACCESS from './src/api/test_access';
import { enableLogging } from './src/core/util/util';
import { setSDKVersion } from './src/core/version';
import { repoManagerDatabaseFromApp } from './src/exp/Database';
import { setWebSocketImpl } from './src/realtime/WebSocketConnection';

setWebSocketImpl(Client);
Expand Down Expand Up @@ -86,8 +87,10 @@ export function registerDatabase(instance: FirebaseNamespace) {
// getImmediate for FirebaseApp will always succeed
const app = container.getProvider('app').getImmediate();
const authProvider = container.getProvider('auth-internal');

return repoManagerDatabaseFromApp(app, authProvider, url, undefined);
return new Database(
repoManagerDatabaseFromApp(app, authProvider, url),
app
);
},
ComponentType.PUBLIC
)
Expand Down
9 changes: 6 additions & 3 deletions packages/database/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ import * as types from '@firebase/database-types';
import { isNodeSdk } from '@firebase/util';

import { name, version } from './package.json';
import { Database, repoManagerDatabaseFromApp } from './src/api/Database';
import { Database } from './src/api/Database';
import * as INTERNAL from './src/api/internal';
import { DataSnapshot, Query, Reference } from './src/api/Reference';
import * as TEST_ACCESS from './src/api/test_access';
import { enableLogging } from './src/core/util/util';
import { setSDKVersion } from './src/core/version';
import { repoManagerDatabaseFromApp } from './src/exp/Database';

const ServerValue = Database.ServerValue;

Expand All @@ -46,8 +47,10 @@ export function registerDatabase(instance: FirebaseNamespace) {
// getImmediate for FirebaseApp will always succeed
const app = container.getProvider('app').getImmediate();
const authProvider = container.getProvider('auth-internal');

return repoManagerDatabaseFromApp(app, authProvider, url, undefined);
return new Database(
repoManagerDatabaseFromApp(app, authProvider, url),
app
);
},
ComponentType.PUBLIC
)
Expand Down
Loading