Merge branch 'master' into ch-delegate

Author: Feiyang1

packages-exp/auth-compat-exp/index.node.ts

@@ -24,6 +24,7 @@
 export * from './index';
 import { FetchProvider } from '@firebase/auth-exp/internal';
 import * as fetchImpl from 'node-fetch';
+import './index';
 
 FetchProvider.initialize(
   (fetchImpl.default as unknown) as typeof fetch,

packages-exp/auth-compat-exp/index.ts

@@ -98,8 +98,8 @@ function registerAuthCompat(instance: _FirebaseNamespace): void {
       container => {
         // getImmediate for FirebaseApp will always succeed
         const app = container.getProvider('app-compat').getImmediate();
-        const auth = container.getProvider('auth-exp').getImmediate();
-        return new Auth(app, auth as impl.AuthImpl);
+        const authProvider = container.getProvider('auth-exp');
+        return new Auth(app, authProvider);
       },
       ComponentType.PUBLIC
     )
@@ -136,7 +136,7 @@ function registerAuthCompat(instance: _FirebaseNamespace): void {
       .setMultipleInstances(false)
   );
 
-  instance.registerVersion('auth', version);
+  instance.registerVersion('auth-compat', version);
 }
 
 registerAuthCompat(firebase as _FirebaseNamespace);

packages-exp/auth-compat-exp/rollup.config.shared.js

@@ -65,7 +65,7 @@ export function getEs5Builds(additionalTypescriptPlugins = {}) {
       plugins: es5BuildPlugins,
       external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
       treeshake: {
-        moduleSideEffects: false
+        moduleSideEffects: true
       }
     },
     /**

packages-exp/auth-compat-exp/src/auth.test.ts

@@ -17,6 +17,7 @@
 
 import { FirebaseApp } from '@firebase/app-compat';
 import * as exp from '@firebase/auth-exp/internal';
+import { Provider } from '@firebase/component';
 import { expect, use } from 'chai';
 import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';
@@ -31,12 +32,16 @@ describe('auth compat', () => {
   context('redirect persistence key storage', () => {
     let underlyingAuth: exp.AuthImpl;
     let app: FirebaseApp;
+    let providerStub: sinon.SinonStubbedInstance<Provider<'auth-exp'>>;
+
     beforeEach(() => {
       app = { options: { apiKey: 'api-key' } } as FirebaseApp;
       underlyingAuth = new exp.AuthImpl(app, {
         apiKey: 'api-key'
       } as exp.Config);
       sinon.stub(underlyingAuth, '_initializeWithPersistence');
+
+      providerStub = sinon.createStubInstance(Provider);
     });
 
     afterEach(() => {
@@ -56,7 +61,12 @@ describe('auth compat', () => {
           ),
           '_openRedirect'
         );
-        const authCompat = new Auth(app, underlyingAuth);
+        providerStub.isInitialized.returns(true);
+        providerStub.getImmediate.returns(underlyingAuth);
+        const authCompat = new Auth(
+          app,
+          (providerStub as unknown) as Provider<'auth-exp'>
+        );
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         await authCompat.signInWithRedirect(new exp.GoogleAuthProvider());
         expect(
@@ -71,18 +81,20 @@ describe('auth compat', () => {
           'firebase:persistence:api-key:undefined',
           'none'
         );
-        new Auth(app, underlyingAuth);
+        providerStub.isInitialized.returns(false);
+        providerStub.initialize.returns(underlyingAuth);
+        new Auth(app, (providerStub as unknown) as Provider<'auth-exp'>);
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        expect(
-          underlyingAuth._initializeWithPersistence
-        ).to.have.been.calledWith(
-          [
-            exp._getInstance(exp.inMemoryPersistence),
-            exp._getInstance(exp.indexedDBLocalPersistence),
-            exp._getInstance(exp.browserLocalPersistence)
-          ],
-          CompatPopupRedirectResolver
-        );
+        expect(providerStub.initialize).to.have.been.calledWith({
+          options: {
+            popupRedirectResolver: CompatPopupRedirectResolver,
+            persistence: [
+              exp.inMemoryPersistence,
+              exp.indexedDBLocalPersistence,
+              exp.browserLocalPersistence
+            ]
+          }
+        });
       }
     });
   });

packages-exp/auth-compat-exp/src/auth.ts

@@ -18,6 +18,7 @@
 import { FirebaseApp, _FirebaseService } from '@firebase/app-compat';
 import * as exp from '@firebase/auth-exp/internal';
 import * as compat from '@firebase/auth-types';
+import { Provider } from '@firebase/component';
 import { ErrorFn, Observer, Unsubscribe } from '@firebase/util';
 
 import {
@@ -37,47 +38,55 @@ import {
 const _assert: typeof exp._assert = exp._assert;
 
 export class Auth implements compat.FirebaseAuth, _FirebaseService {
-  // private readonly auth: impl.AuthImpl;
+  readonly _delegate: exp.AuthImpl;
 
-  constructor(readonly app: FirebaseApp, readonly _delegate: exp.AuthImpl) {
-    const { apiKey } = app.options;
-    if (this._delegate._deleted) {
+  constructor(readonly app: FirebaseApp, provider: Provider<'auth-exp'>) {
+    if (provider.isInitialized()) {
+      this._delegate = provider.getImmediate() as exp.AuthImpl;
       return;
     }
 
-    // Note this is slightly different behavior: in this case, the stored
-    // persistence is checked *first* rather than last. This is because we want
-    // to prefer stored persistence type in the hierarchy.
-    const persistences = _getPersistencesFromRedirect(this._delegate);
+    const { apiKey } = app.options;
+    // TODO: platform needs to be determined using heuristics
+    _assert(apiKey, exp.AuthErrorCode.INVALID_API_KEY, {
+      appName: app.name
+    });
+
+    let persistences: exp.Persistence[] = [exp.inMemoryPersistence];
 
-    for (const persistence of [
-      exp.indexedDBLocalPersistence,
-      exp.browserLocalPersistence
-    ]) {
-      if (!persistences.includes(persistence)) {
-        persistences.push(persistence);
+    // Only deal with persistences in web environments
+    if (typeof window !== 'undefined') {
+      // Note this is slightly different behavior: in this case, the stored
+      // persistence is checked *first* rather than last. This is because we want
+      // to prefer stored persistence type in the hierarchy.
+      persistences = _getPersistencesFromRedirect(apiKey, app.name);
+
+      for (const persistence of [
+        exp.indexedDBLocalPersistence,
+        exp.browserLocalPersistence
+      ]) {
+        if (!persistences.includes(persistence)) {
+          persistences.push(persistence);
+        }
       }
     }
 
-    const hierarchy = persistences.map<exp.PersistenceInternal>(
-      exp._getInstance
-    );
-
     // TODO: platform needs to be determined using heuristics
     _assert(apiKey, exp.AuthErrorCode.INVALID_API_KEY, {
       appName: app.name
     });
 
-    this._delegate._updateErrorMap(exp.debugErrorMap);
-
     // Only use a popup/redirect resolver in browser environments
     const resolver =
       typeof window !== 'undefined' ? CompatPopupRedirectResolver : undefined;
+    this._delegate = provider.initialize({
+      options: {
+        persistence: persistences,
+        popupRedirectResolver: resolver
+      }
+    }) as exp.AuthImpl;
 
-    // This promise is intended to float; auth initialization happens in the
-    // background, meanwhile the auth object may be used by the app.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this._delegate._initializeWithPersistence(hierarchy, resolver);
+    this._delegate._updateErrorMap(exp.debugErrorMap);
   }
 
   get emulatorConfig(): compat.EmulatorConfig | null {

packages-exp/auth-compat-exp/src/persistence.ts

@@ -97,18 +97,15 @@ export async function _savePersistenceForRedirect(
 }
 
 export function _getPersistencesFromRedirect(
-  auth: exp.AuthInternal
+  apiKey: string,
+  appName: string
 ): exp.Persistence[] {
   const win = getSelfWindow();
   if (!win?.sessionStorage) {
     return [];
   }
 
-  const key = exp._persistenceKeyName(
-    PERSISTENCE_KEY,
-    auth.config.apiKey,
-    auth.name
-  );
+  const key = exp._persistenceKeyName(PERSISTENCE_KEY, apiKey, appName);
   const persistence = win.sessionStorage.getItem(key);
 
   switch (persistence) {

packages-exp/auth-compat-exp/test/integration/flows/anonymous.test.ts

@@ -19,8 +19,6 @@ import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 
 import firebase from '@firebase/app-compat';
-// eslint-disable-next-line import/no-extraneous-dependencies
-import '@firebase/auth-compat';
 import { FirebaseError } from '@firebase/util';
 import {
   cleanUpTestInstance,

packages/database/.eslintrc.js

@@ -30,7 +30,22 @@ module.exports = {
     'no-restricted-properties': 'off',
     'no-restricted-globals': 'off',
     'no-throw-literal': 'off',
-    'id-blacklist': 'off'
+    'id-blacklist': 'off',
+    'import/order': [
+      'error',
+      {
+        'groups': [
+          'builtin',
+          'external',
+          'internal',
+          'parent',
+          'sibling',
+          'index'
+        ],
+        'newlines-between': 'always',
+        'alphabetize': { 'order': 'asc', 'caseInsensitive': true }
+      }
+    ]
   },
   overrides: [
     {

packages/database/index.node.ts

@@ -17,22 +17,22 @@
 
 import { FirebaseApp, FirebaseNamespace } from '@firebase/app-types';
 import { _FirebaseNamespace } from '@firebase/app-types/private';
+import { FirebaseAuthInternal } from '@firebase/auth-interop-types';
+import { Component, ComponentType } from '@firebase/component';
+import * as types from '@firebase/database-types';
+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 { DataSnapshot } from './src/api/DataSnapshot';
+import * as INTERNAL from './src/api/internal';
 import { Query } from './src/api/Query';
 import { Reference } from './src/api/Reference';
-import { enableLogging } from './src/core/util/util';
-import * as INTERNAL from './src/api/internal';
 import * as TEST_ACCESS from './src/api/test_access';
-import * as types from '@firebase/database-types';
+import { enableLogging } from './src/core/util/util';
 import { setSDKVersion } from './src/core/version';
-import { CONSTANTS, isNodeSdk } from '@firebase/util';
 import { setWebSocketImpl } from './src/realtime/WebSocketConnection';
-import { Client } from 'faye-websocket';
-import { Component, ComponentType } from '@firebase/component';
-import { FirebaseAuthInternal } from '@firebase/auth-interop-types';
-
-import { name, version } from './package.json';
 
 setWebSocketImpl(Client);
 

packages/database/index.ts

@@ -19,19 +19,19 @@
 import firebase from '@firebase/app';
 import { FirebaseNamespace } from '@firebase/app-types';
 import { _FirebaseNamespace } from '@firebase/app-types/private';
+import { Component, ComponentType } from '@firebase/component';
+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 { DataSnapshot } from './src/api/DataSnapshot';
+import * as INTERNAL from './src/api/internal';
 import { Query } from './src/api/Query';
 import { Reference } from './src/api/Reference';
-import { enableLogging } from './src/core/util/util';
-import * as INTERNAL from './src/api/internal';
 import * as TEST_ACCESS from './src/api/test_access';
-import { isNodeSdk } from '@firebase/util';
-import * as types from '@firebase/database-types';
+import { enableLogging } from './src/core/util/util';
 import { setSDKVersion } from './src/core/version';
-import { Component, ComponentType } from '@firebase/component';
-
-import { name, version } from './package.json';
 
 const ServerValue = Database.ServerValue;
 

packages/database/src/api/DataSnapshot.ts

@@ -16,13 +16,15 @@
  */
 
 import { validateArgCount, validateCallback } from '@firebase/util';
-import { validatePathString } from '../core/util/validation';
-import { Path } from '../core/util/Path';
+
+import { ChildrenNode } from '../core/snap/ChildrenNode';
+import { Index } from '../core/snap/indexes/Index';
 import { PRIORITY_INDEX } from '../core/snap/indexes/PriorityIndex';
 import { Node } from '../core/snap/Node';
+import { Path } from '../core/util/Path';
+import { validatePathString } from '../core/util/validation';
+
 import { Reference } from './Reference';
-import { Index } from '../core/snap/indexes/Index';
-import { ChildrenNode } from '../core/snap/ChildrenNode';
 
 /**
  * Class representing a firebase data snapshot.  It wraps a SnapshotNode and

packages/database/src/api/Database.ts

@@ -14,25 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { FirebaseApp } from '@firebase/app-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { FirebaseApp as FirebaseAppExp } from '@firebase/app-exp';
-import { safeGet, validateArgCount } from '@firebase/util';
-import { fatal, log } from '../core/util/util';
-import { parseRepoInfo } from '../core/util/libs/parser';
+import { FirebaseApp } from '@firebase/app-types';
+import { FirebaseService } from '@firebase/app-types/private';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { Provider } from '@firebase/component';
-import { pathIsEmpty, newEmptyPath } from '../core/util/Path';
-import { Reference } from './Reference';
-import { Repo, repoInterrupt, repoResume, repoStart } from '../core/Repo';
-import { validateUrl } from '../core/util/validation';
-import { FirebaseService } from '@firebase/app-types/private';
-import { RepoInfo } from '../core/RepoInfo';
+import { safeGet, validateArgCount } from '@firebase/util';
+
 import {
   AuthTokenProvider,
   EmulatorAdminTokenProvider,
   FirebaseAuthTokenProvider
 } from '../core/AuthTokenProvider';
+import { Repo, repoInterrupt, repoResume, repoStart } from '../core/Repo';
+import { RepoInfo } from '../core/RepoInfo';
+import { parseRepoInfo } from '../core/util/libs/parser';
+import { pathIsEmpty, newEmptyPath } from '../core/util/Path';
+import { fatal, log } from '../core/util/util';
+import { validateUrl } from '../core/util/validation';
+
+import { Reference } from './Reference';
 
 /**
  * This variable is also defined in the firebase node.js admin SDK. Before