Refactor project structure to support node

Author: avolkovi

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

@@ -22,12 +22,22 @@
  * just use index.browser.ts
  */
 
+import * as fetch  from 'node-fetch';
+
+import { registerVersion } from '@firebase/app-exp';
+import { name, version } from './package.json';
 import { _initializeAuthForClientPlatform } from './src/core/auth/auth_impl';
 import { ClientPlatform } from './src/core/util/version';
 
+(global as any).fetch = fetch;
+(global as any).Response = fetch.Response;
+(global as any).Headers = fetch.Headers;
+
 // Core functionality shared by all clients
 export * from './src';
 
 export const initializeAuth = _initializeAuthForClientPlatform(
   ClientPlatform.NODE
 );
+
+registerVersion(name, version, 'node');

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

@@ -22,9 +22,11 @@
  * just use index.ts
  */
 
+import { registerVersion } from '@firebase/app-exp';
 import { AsyncStorage } from 'react-native';
+import { name, version } from './package.json';
 import { _initializeAuthForClientPlatform } from './src/core/auth/auth_impl';
-import { getReactNativePersistence } from './src/core/persistence/react_native';
+import { getReactNativePersistence } from './src/platform_react_native/persistence/react_native';
 import { ClientPlatform } from './src/core/util/version';
 
 // Core functionality shared by all clients
@@ -37,3 +39,5 @@ export const reactNativeLocalPersistence = getReactNativePersistence(
 export const initializeAuth = _initializeAuthForClientPlatform(
   ClientPlatform.REACT_NATIVE
 );
+
+registerVersion(name, version, 'rn');

packages-exp/auth-exp/index.ts

@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import { registerVersion } from '@firebase/app-exp';
+import { name, version } from './package.json';
 import { _initializeAuthForClientPlatform } from './src/core/auth/auth_impl';
 import { ClientPlatform } from './src/core/util/version';
 
@@ -23,35 +25,43 @@ export * from './src';
 
 // Additional DOM dependend functionality
 
-// core/persistence
+// persistence
 export {
   browserLocalPersistence,
   browserSessionPersistence
-} from './src/core/persistence/browser';
+} from './src/platform_browser/persistence/browser';
+export { indexedDBLocalPersistence } from './src/platform_browser/persistence/indexed_db';
 
-// core/strategies
+// providers
+export { PhoneAuthProvider } from './src/platform_browser/providers/phone';
+
+// strategies
 export {
   signInWithPhoneNumber,
   linkWithPhoneNumber,
   reauthenticateWithPhoneNumber,
   updatePhoneNumber
-} from './src/core/strategies/phone';
+} from './src/platform_browser/strategies/phone';
 export {
   signInWithPopup,
   linkWithPopup,
   reauthenticateWithPopup
-} from './src/core/strategies/popup';
+} from './src/platform_browser/strategies/popup';
 export {
   signInWithRedirect,
   linkWithRedirect,
   reauthenticateWithRedirect,
   getRedirectResult
-} from './src/core/strategies/redirect';
+} from './src/platform_browser/strategies/redirect';
 
-// platform_browser
 export { RecaptchaVerifier } from './src/platform_browser/recaptcha/recaptcha_verifier';
 export { browserPopupRedirectResolver } from './src/platform_browser/popup_redirect';
 
+// MFA
+export { PhoneMultiFactorGenerator } from './src/platform_browser/mfa/assertions/phone';
+
 export const initializeAuth = _initializeAuthForClientPlatform(
   ClientPlatform.BROWSER
 );
+
+registerVersion(name, version);

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

@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import { registerVersion } from '@firebase/app-exp';
+import { name, version } from './package.json';
 import { _initializeAuthForClientPlatform } from './src/core/auth/auth_impl';
 import { ClientPlatform } from './src/core/util/version';
 
@@ -24,3 +26,5 @@ export * from './src';
 export const initializeAuth = _initializeAuthForClientPlatform(
   ClientPlatform.WORKER
 );
+
+registerVersion(name, version, 'webworker');

packages-exp/auth-exp/package.json

@@ -22,12 +22,12 @@
     "build:internal": "rollup -c rollup.config.internal.js",
     "build:release": "rollup -c rollup.config.release.js && yarn api-report && yarn typings:public",
     "dev": "rollup -c -w",
-    "test": "yarn type-check && run-p lint test:browser",
+    "test": "yarn type-check && run-p lint test:browser test:node",
     "test:browser": "karma start --single-run",
     "test:browser:unit": "karma start --single-run --unit",
     "test:browser:integration": "karma start --single-run --integration",
     "test:browser:debug": "karma start --auto-watch",
-    "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha src/**/*.test.* --opts ../../config/mocha.node.opts",
+    "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'src/!(platform_browser|platform_react_native)/**/*.test.ts' --file index.node.ts --config ../../config/mocharc.node.js",
     "type-check": "tsc -p . --noEmit",
     "prepare": "yarn build",
     "typings:public": "node ./use_typings.js --public",

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

@@ -17,6 +17,7 @@
 
 import strip from '@rollup/plugin-strip';
 import typescriptPlugin from 'rollup-plugin-typescript2';
+import json from 'rollup-plugin-json';
 import typescript from 'typescript';
 import pkg from './package.json';
 
@@ -28,6 +29,7 @@ const deps = Object.keys(
  * Common plugins for all builds
  */
 const commonPlugins = [
+  json(),
   strip({
     functions: ['debugAssert.*']
   })

packages-exp/auth-exp/src/api/index.test.ts

@@ -210,7 +210,7 @@ describe('api/_performApiRequest', () => {
     let fetchStub: SinonStub;
 
     beforeEach(() => {
-      fetchStub = stub(self, 'fetch');
+      fetchStub = stub(typeof(self) !== 'undefined' ? self : global as any, 'fetch');
     });
 
     afterEach(() => {

packages-exp/auth-exp/src/core/auth/auth_impl.test.ts

@@ -15,34 +15,22 @@
  * limitations under the License.
  */
 
+import { FirebaseApp } from '@firebase/app-types-exp';
+import * as externs from '@firebase/auth-types-exp';
+import { FirebaseError } from '@firebase/util';
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';
-
-import { FirebaseApp } from '@firebase/app-types-exp';
-import * as externs from '@firebase/auth-types-exp';
-import { FirebaseError } from '@firebase/util';
-
 import { testUser } from '../../../test/helpers/mock_auth';
 import { User } from '../../model/user';
-import { browserPopupRedirectResolver } from '../../platform_browser/popup_redirect';
-import { AUTH_ERROR_FACTORY, AuthErrorCode } from '../errors';
+import { browserLocalPersistence } from '../../platform_browser/persistence/browser';
 import { Persistence } from '../persistence';
-import {
-  browserLocalPersistence,
-  browserSessionPersistence
-} from '../persistence/browser';
 import { inMemoryPersistence } from '../persistence/in_memory';
-import { PersistenceUserManager } from '../persistence/persistence_user_manager';
-import * as reload from '../user/reload';
 import { _getInstance } from '../util/instantiator';
 import * as navigator from '../util/navigator';
-import { _getClientVersion, ClientPlatform } from '../util/version';
+import { ClientPlatform } from '../util/version';
 import {
-  DEFAULT_API_HOST,
-  DEFAULT_API_SCHEME,
-  DEFAULT_TOKEN_API_HOST,
   _castAuth,
   _initializeAuthForClientPlatform
 } from './auth_impl';
@@ -288,172 +276,3 @@ describe('core/auth/auth_impl', () => {
   });
 });
 
-describe('core/auth/initializeAuth', () => {
-  afterEach(sinon.restore);
-
-  it('throws an API error if key not provided', () => {
-    expect(() =>
-      initializeAuth({
-        ...FAKE_APP,
-        options: {} // apiKey is missing
-      })
-    ).to.throw(
-      FirebaseError,
-      'Firebase: Your API key is invalid, please check you have copied it correctly. (auth/invalid-api-key).'
-    );
-  });
-
-  describe('persistence manager creation', () => {
-    let createManagerStub: sinon.SinonSpy;
-    let reloadStub: sinon.SinonStub;
-
-    beforeEach(() => {
-      createManagerStub = sinon.spy(PersistenceUserManager, 'create');
-      reloadStub = sinon
-        .stub(reload, '_reloadWithoutSaving')
-        .returns(Promise.resolve());
-    });
-
-    async function initAndWait(
-      persistence: externs.Persistence | externs.Persistence[],
-      popupRedirectResolver?: externs.PopupRedirectResolver
-    ): Promise<externs.Auth> {
-      const auth = initializeAuth(FAKE_APP, {
-        persistence,
-        popupRedirectResolver
-      });
-      // Auth initializes async. We can make sure the initialization is
-      // flushed by awaiting a method on the queue.
-      await auth.setPersistence(inMemoryPersistence);
-      return auth;
-    }
-
-    it('converts single persistence to array', async () => {
-      const auth = await initAndWait(inMemoryPersistence);
-      expect(createManagerStub).to.have.been.calledWith(auth, [
-        _getInstance(inMemoryPersistence)
-      ]);
-    });
-
-    it('pulls the user from storage', async () => {
-      sinon
-        .stub(_getInstance<Persistence>(inMemoryPersistence), 'get')
-        .returns(Promise.resolve(testUser({}, 'uid').toPlainObject()));
-      const auth = await initAndWait(inMemoryPersistence);
-      expect(auth.currentUser!.uid).to.eq('uid');
-    });
-
-    it('calls create with the persistence in order', async () => {
-      const auth = await initAndWait([
-        inMemoryPersistence,
-        browserLocalPersistence
-      ]);
-      expect(createManagerStub).to.have.been.calledWith(auth, [
-        _getInstance(inMemoryPersistence),
-        _getInstance(browserLocalPersistence)
-      ]);
-    });
-
-    it('does not reload redirect users', async () => {
-      const user = testUser({}, 'uid');
-      user._redirectEventId = 'event-id';
-      sinon
-        .stub(_getInstance<Persistence>(inMemoryPersistence), 'get')
-        .returns(Promise.resolve(user.toPlainObject()));
-      sinon
-        .stub(_getInstance<Persistence>(browserSessionPersistence), 'get')
-        .returns(Promise.resolve(user.toPlainObject()));
-      await initAndWait(inMemoryPersistence);
-      expect(reload._reloadWithoutSaving).not.to.have.been.called;
-    });
-
-    it('reloads non-redirect users', async () => {
-      sinon
-        .stub(_getInstance<Persistence>(inMemoryPersistence), 'get')
-        .returns(Promise.resolve(testUser({}, 'uid').toPlainObject()));
-      sinon
-        .stub(_getInstance<Persistence>(browserSessionPersistence), 'get')
-        .returns(Promise.resolve(null));
-
-      await initAndWait(inMemoryPersistence);
-      expect(reload._reloadWithoutSaving).to.have.been.called;
-    });
-
-    it('Does not reload if the event ids match', async () => {
-      const user = testUser({}, 'uid');
-      user._redirectEventId = 'event-id';
-
-      sinon
-        .stub(_getInstance<Persistence>(inMemoryPersistence), 'get')
-        .returns(Promise.resolve(user.toPlainObject()));
-      sinon
-        .stub(_getInstance<Persistence>(browserSessionPersistence), 'get')
-        .returns(Promise.resolve(user.toPlainObject()));
-
-      await initAndWait(inMemoryPersistence, browserPopupRedirectResolver);
-      expect(reload._reloadWithoutSaving).not.to.have.been.called;
-    });
-
-    it('Reloads if the event ids do not match', async () => {
-      const user = testUser({}, 'uid');
-      user._redirectEventId = 'event-id';
-
-      sinon
-        .stub(_getInstance<Persistence>(inMemoryPersistence), 'get')
-        .returns(Promise.resolve(user.toPlainObject()));
-
-      user._redirectEventId = 'some-other-id';
-      sinon
-        .stub(_getInstance<Persistence>(browserSessionPersistence), 'get')
-        .returns(Promise.resolve(user.toPlainObject()));
-
-      await initAndWait(inMemoryPersistence, browserPopupRedirectResolver);
-      expect(reload._reloadWithoutSaving).to.have.been.called;
-    });
-
-    it('Nulls out the current user if reload fails', async () => {
-      const stub = sinon.stub(_getInstance<Persistence>(inMemoryPersistence));
-      stub.get.returns(Promise.resolve(testUser({}, 'uid').toPlainObject()));
-      stub.remove.returns(Promise.resolve());
-      reloadStub.returns(
-        Promise.reject(
-          AUTH_ERROR_FACTORY.create(AuthErrorCode.TOKEN_EXPIRED, {
-            appName: 'app'
-          })
-        )
-      );
-
-      await initAndWait(inMemoryPersistence);
-      expect(stub.remove).to.have.been.called;
-    });
-
-    it('Keeps current user if reload fails with network error', async () => {
-      const stub = sinon.stub(_getInstance<Persistence>(inMemoryPersistence));
-      stub.get.returns(Promise.resolve(testUser({}, 'uid').toPlainObject()));
-      stub.remove.returns(Promise.resolve());
-      reloadStub.returns(
-        Promise.reject(
-          AUTH_ERROR_FACTORY.create(AuthErrorCode.NETWORK_REQUEST_FAILED, {
-            appName: 'app'
-          })
-        )
-      );
-
-      await initAndWait(inMemoryPersistence);
-      expect(stub.remove).not.to.have.been.called;
-    });
-
-    it('sets auth name and config', async () => {
-      const auth = await initAndWait(inMemoryPersistence);
-      expect(auth.name).to.eq(FAKE_APP.name);
-      expect(auth.config).to.eql({
-        apiKey: FAKE_APP.options.apiKey,
-        authDomain: FAKE_APP.options.authDomain,
-        apiHost: DEFAULT_API_HOST,
-        apiScheme: DEFAULT_API_SCHEME,
-        tokenApiHost: DEFAULT_TOKEN_API_HOST,
-        sdkClientVersion: _getClientVersion(ClientPlatform.BROWSER)
-      });
-    });
-  });
-});

packages-exp/auth-exp/src/core/index.ts

@@ -59,15 +59,13 @@ export { OAuthCredential } from './credentials/oauth';
 
 // persistence
 export { inMemoryPersistence } from './persistence/in_memory';
-export { indexedDBLocalPersistence } from './persistence/indexed_db';
 
 // providers
 export { EmailAuthProvider } from './providers/email';
 export { FacebookAuthProvider } from './providers/facebook';
 export { GoogleAuthProvider } from './providers/google';
 export { GithubAuthProvider } from './providers/github';
 export { OAuthProvider } from './providers/oauth';
-export { PhoneAuthProvider } from './providers/phone';
 export { TwitterAuthProvider } from './providers/twitter';
 
 // strategies