Merge 645d1e7 into 12e7465

Author: sam-gc

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

@@ -21,7 +21,3 @@
  * implementation that mandates having a separate entrypoint. Otherwise you can
  * just use index.ts
  */
-
-import { testFxn } from './src';
-
-testFxn();

packages-exp/auth-exp/index.ts

@@ -37,6 +37,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@rollup/plugin-strip": "^1.3.2",
+    "@firebase/app-exp": "0.x",
     "rollup": "1.32.1",
     "rollup-plugin-json": "4.0.0",
     "rollup-plugin-replace": "2.2.0",

packages-exp/auth-exp/package.json

@@ -48,7 +48,7 @@ const es5Builds = [
    * Browser Builds
    */
   {
-    input: 'index.ts',
+    input: 'src/index.ts',
     output: [{ file: pkg.module, format: 'es', sourcemap: true }],
     plugins: es5BuildPlugins,
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
@@ -84,7 +84,7 @@ const es2017Builds = [
    *  Browser Builds
    */
   {
-    input: 'index.ts',
+    input: 'src/index.ts',
     output: {
       file: pkg.esm2017,
       format: 'es',

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

@@ -15,9 +15,11 @@
  * limitations under the License.
  */
 
-import { AuthErrorCode, AUTH_ERROR_FACTORY } from './errors';
+import * as externs from '@firebase/auth-types-exp';
+
 import { Operation } from '../model/action_code_info';
 import { Auth } from '../model/auth';
+import { AUTH_ERROR_FACTORY, AuthErrorCode } from './errors';
 
 /**
  * Enums for fields in URL query string.
@@ -64,7 +66,7 @@ function parseDeepLink(url: string): string {
   return iOSDoubleDeepLink || iOSDeepLink || doubleDeepLink || link || url;
 }
 
-export class ActionCodeURL {
+export class ActionCodeURL implements externs.ActionCodeURL {
   readonly apiKey: string;
   readonly code: string;
   readonly continueUrl: string | null;

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

@@ -20,6 +20,7 @@ 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/mock_auth';
@@ -31,10 +32,7 @@ import { inMemoryPersistence } from '../persistence/in_memory';
 import { PersistenceUserManager } from '../persistence/persistence_user_manager';
 import { _getClientVersion, ClientPlatform } from '../util/version';
 import {
-  DEFAULT_API_HOST,
-  DEFAULT_API_SCHEME,
-  DEFAULT_TOKEN_API_HOST,
-  initializeAuth
+    DEFAULT_API_HOST, DEFAULT_API_SCHEME, DEFAULT_TOKEN_API_HOST, initializeAuth
 } from './auth_impl';
 
 use(sinonChai);
@@ -53,8 +51,8 @@ describe('core/auth/auth_impl', () => {
   let persistenceStub: sinon.SinonStubbedInstance<Persistence>;
 
   beforeEach(() => {
-    persistenceStub = sinon.stub(inMemoryPersistence);
-    auth = initializeAuth(FAKE_APP, { persistence: inMemoryPersistence });
+    persistenceStub = sinon.stub(inMemoryPersistence as Persistence);
+    auth = initializeAuth(FAKE_APP, { persistence: inMemoryPersistence }) as Auth;
   });
 
   afterEach(sinon.restore);
@@ -104,7 +102,7 @@ describe('core/auth/auth_impl', () => {
 
   describe('#setPersistence', () => {
     it('swaps underlying persistence', async () => {
-      const newPersistence = browserLocalPersistence;
+      const newPersistence = browserLocalPersistence as Persistence;
       const newStub = sinon.stub(newPersistence);
       persistenceStub.get.returns(
         Promise.resolve(testUser('test').toPlainObject())
@@ -271,18 +269,20 @@ describe('core/auth/initializeAuth', () => {
 
   describe('persistence manager creation', () => {
     let createManagerStub: sinon.SinonSpy;
+    // const inMemory = inMemoryPersistence as Persistence;
+    // const browserLocal = browserL
     beforeEach(() => {
       createManagerStub = sinon.spy(PersistenceUserManager, 'create');
     });
 
     async function initAndWait(
-      persistence: Persistence | Persistence[]
+      persistence: externs.Persistence | externs.Persistence[]
     ): Promise<Auth> {
       const auth = initializeAuth(FAKE_APP, { persistence });
       // Auth initializes async. We can make sure the initialization is
       // flushed by awaiting a method on the queue.
       await auth.setPersistence(inMemoryPersistence);
-      return auth;
+      return auth as Auth;
     }
 
     it('converts single persistence to array', async () => {
@@ -294,7 +294,7 @@ describe('core/auth/initializeAuth', () => {
 
     it('pulls the user from storage', async () => {
       sinon
-        .stub(inMemoryPersistence, 'get')
+        .stub(inMemoryPersistence as Persistence, 'get')
         .returns(Promise.resolve(testUser('uid').toPlainObject()));
       const auth = await initAndWait(inMemoryPersistence);
       expect(auth.currentUser!.uid).to.eq('uid');

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

@@ -19,16 +19,10 @@ import { getApp } from '@firebase/app-exp';
 import { FirebaseApp } from '@firebase/app-types-exp';
 import * as externs from '@firebase/auth-types-exp';
 import {
-  CompleteFn,
-  createSubscribe,
-  ErrorFn,
-  NextFn,
-  Observer,
-  Subscribe,
-  Unsubscribe
+    CompleteFn, createSubscribe, ErrorFn, NextFn, Observer, Subscribe, Unsubscribe
 } from '@firebase/util';
 
-import { Auth, Config, Dependencies, NextOrObserver } from '../../model/auth';
+import { Auth, Dependencies, NextOrObserver } from '../../model/auth';
 import { User } from '../../model/user';
 import { AuthErrorCode } from '../errors';
 import { Persistence } from '../persistence';
@@ -58,7 +52,7 @@ class AuthImpl implements Auth {
 
   constructor(
     public readonly name: string,
-    public readonly config: Config,
+    public readonly config: externs.Config,
     persistenceHierarchy: Persistence[]
   ) {
     // This promise is intended to float; auth initialization happens in the
@@ -197,14 +191,14 @@ class AuthImpl implements Auth {
 export function initializeAuth(
   app: FirebaseApp = getApp(),
   deps?: Dependencies
-): Auth {
+): externs.Auth {
   const persistence = deps?.persistence || [];
   const hierarchy = Array.isArray(persistence) ? persistence : [persistence];
   const { apiKey, authDomain } = app.options;
 
   // TODO: platform needs to be determined using heuristics
   assert(apiKey, app.name, AuthErrorCode.INVALID_API_KEY);
-  const config: Config = {
+  const config: externs.Config = {
     apiKey,
     authDomain,
     apiHost: DEFAULT_API_HOST,
@@ -213,7 +207,7 @@ export function initializeAuth(
     sdkClientVersion: _getClientVersion(ClientPlatform.BROWSER)
   };
 
-  return new AuthImpl(app.name, config, hierarchy);
+  return new AuthImpl(app.name, config, hierarchy as Persistence[]);
 }
 
 /** Helper class to wrap subscriber logic */

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

@@ -19,7 +19,7 @@ import { expect } from 'chai';
 import * as sinon from 'sinon';
 
 import { testUser } from '../../../test/mock_auth';
-import { PersistedBlob, PersistenceType } from './';
+import { PersistedBlob, Persistence, PersistenceType } from './';
 import { browserLocalPersistence, browserSessionPersistence } from './browser';
 
 describe('core/persistence/browser', () => {
@@ -31,7 +31,7 @@ describe('core/persistence/browser', () => {
   afterEach(() => sinon.restore());
 
   describe('browserLocalPersistence', () => {
-    const persistence = browserLocalPersistence;
+    const persistence: Persistence = browserLocalPersistence as Persistence;
 
     it('should work with persistence type', async () => {
       const key = 'my-super-special-persistence-type';
@@ -74,7 +74,7 @@ describe('core/persistence/browser', () => {
   });
 
   describe('browserSessionPersistence', () => {
-    const persistence = browserSessionPersistence;
+    const persistence = browserSessionPersistence as Persistence;
 
     it('should work with persistence type', async () => {
       const key = 'my-super-special-persistence-type';

packages-exp/auth-exp/src/core/persistence/browser.test.ts

@@ -15,12 +15,9 @@
  * limitations under the License.
  */
 
-import {
-  Persistence,
-  PersistenceType,
-  PersistenceValue,
-  STORAGE_AVAILABLE_KEY
-} from './';
+import * as externs from '@firebase/auth-types-exp';
+
+import { Persistence, PersistenceType, PersistenceValue, STORAGE_AVAILABLE_KEY } from './';
 
 class BrowserPersistence implements Persistence {
   type: PersistenceType = PersistenceType.LOCAL;
@@ -54,9 +51,9 @@ class BrowserPersistence implements Persistence {
   }
 }
 
-export const browserLocalPersistence: Persistence = new BrowserPersistence(
+export const browserLocalPersistence: externs.Persistence = new BrowserPersistence(
   localStorage
 );
-export const browserSessionPersistence: Persistence = new BrowserPersistence(
+export const browserSessionPersistence: externs.Persistence = new BrowserPersistence(
   sessionStorage
 );

packages-exp/auth-exp/src/core/persistence/browser.ts

@@ -18,8 +18,10 @@
 import { expect } from 'chai';
 
 import { testUser } from '../../../test/mock_auth';
-import { PersistenceType } from './';
-import { inMemoryPersistence as persistence } from './in_memory';
+import { Persistence, PersistenceType } from './';
+import { inMemoryPersistence } from './in_memory';
+
+const persistence = inMemoryPersistence as Persistence;
 
 describe('core/persistence/in_memory', () => {
   it('should work with persistence type', async () => {

packages-exp/auth-exp/src/core/persistence/in_memory.test.ts

@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import * as externs from '@firebase/auth-types-exp';
+
 import { Persistence, PersistenceType, PersistenceValue } from '../persistence';
 
 class InMemoryPersistence implements Persistence {
@@ -41,4 +43,4 @@ class InMemoryPersistence implements Persistence {
   }
 }
 
-export const inMemoryPersistence: Persistence = new InMemoryPersistence();
+export const inMemoryPersistence: externs.Persistence = new InMemoryPersistence();

packages-exp/auth-exp/src/core/persistence/in_memory.ts

@@ -19,8 +19,10 @@ import { expect } from 'chai';
 import * as sinon from 'sinon';
 
 import { testUser } from '../../../test/mock_auth';
-import { PersistenceType } from './';
-import { indexedDBLocalPersistence as persistence } from './indexed_db';
+import { Persistence, PersistenceType } from './';
+import { indexedDBLocalPersistence } from './indexed_db';
+
+const persistence = indexedDBLocalPersistence as Persistence;
 
 describe('core/persistence/indexed_db', () => {
   afterEach(sinon.restore);

packages-exp/auth-exp/src/core/persistence/indexed_db.test.ts

@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 
+import * as externs from '@firebase/auth-types-exp';
+
 import {
-  PersistedBlob,
-  Persistence,
-  PersistenceType,
-  PersistenceValue,
-  STORAGE_AVAILABLE_KEY
+    PersistedBlob, Persistence, PersistenceType, PersistenceValue, STORAGE_AVAILABLE_KEY
 } from './';
 
 export const DB_NAME = 'firebaseLocalStorageDb';
@@ -175,4 +173,4 @@ class IndexedDBLocalPersistence implements Persistence {
   }
 }
 
-export const indexedDBLocalPersistence: Persistence = new IndexedDBLocalPersistence();
+export const indexedDBLocalPersistence: externs.Persistence = new IndexedDBLocalPersistence();

packages-exp/auth-exp/src/core/persistence/indexed_db.ts

@@ -88,7 +88,7 @@ export class PersistenceUserManager {
     userKey = _AUTH_USER_KEY_NAME
   ): Promise<PersistenceUserManager> {
     if (!persistenceHierarchy.length) {
-      return new PersistenceUserManager(inMemoryPersistence, auth, userKey);
+      return new PersistenceUserManager(inMemoryPersistence as Persistence, auth, userKey);
     }
 
     const key = _persistenceKeyName(userKey, auth.config.apiKey, auth.name);

packages-exp/auth-exp/src/core/persistence/persistence_user_manager.ts

@@ -15,14 +15,10 @@
  * limitations under the License.
  */
 
-import {
-  Persistence,
-  PersistenceType,
-  PersistenceValue,
-  STORAGE_AVAILABLE_KEY
-} from './';
 import { ReactNativeAsyncStorage } from '@firebase/auth-types-exp';
 
+import { Persistence, PersistenceType, PersistenceValue, STORAGE_AVAILABLE_KEY } from './';
+
 /**
  * Persistence class that wraps AsyncStorage imported from `react-native` or `@react-native-community/async-storage`.
  */

packages-exp/auth-exp/src/core/persistence/react_native.ts

@@ -15,22 +15,9 @@
  * limitations under the License.
  */
 
-import { GetOobCodeRequest } from '../api/authentication/email_and_password';
+import { ActionCodeSettings } from '@firebase/auth-types-exp';
 
-export interface ActionCodeSettings {
-  android?: {
-    installApp?: boolean;
-    minimumVersion?: string;
-    packageName: string;
-  };
-  handleCodeInApp?: boolean;
-  iOS?: {
-    bundleId: string;
-    appStoreId: string;
-  };
-  url: string;
-  dynamicLinkDomain?: string;
-}
+import { GetOobCodeRequest } from '../../api/authentication/email_and_password';
 
 export function setActionCodeSettingsOnRequest(
   request: GetOobCodeRequest,

packages-exp/auth-exp/src/model/action_code_settings.ts renamed to packages-exp/auth-exp/src/core/strategies/action_code_settings.ts

@@ -16,20 +16,15 @@
  */
 
 import * as externs from '@firebase/auth-types-exp';
+import { ActionCodeSettings } from '@firebase/auth-types-exp';
 
-import {
-  createAuthUri,
-  CreateAuthUriRequest
-} from '../../api/authentication/create_auth_uri';
+import { createAuthUri, CreateAuthUriRequest } from '../../api/authentication/create_auth_uri';
 import * as api from '../../api/authentication/email_and_password';
 import { Operation } from '../../model/action_code_info';
-import {
-  ActionCodeSettings,
-  setActionCodeSettingsOnRequest
-} from '../../model/action_code_settings';
 import { Auth } from '../../model/auth';
 import { User } from '../../model/user';
 import { _getCurrentUrl, _isHttpOrHttps } from '../util/location';
+import { setActionCodeSettingsOnRequest } from './action_code_settings';
 
 export async function fetchSignInMethodsForEmail(
   auth: externs.Auth,