Update internal types to work with external types

sam-gc · sam-gc · commit b14770260b74 · 2020-05-15T14:32:51.000-07:00
diff --git a/packages-exp/auth-exp/src/core/auth/auth_impl.test.ts b/packages-exp/auth-exp/src/core/auth/auth_impl.test.ts
@@ -31,10 +31,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);
@@ -138,7 +135,7 @@ describe('core/auth/auth_impl', () => {
       const user = testUser('uid');
       auth.currentUser = user;
       auth._isInitialized = true;
-      auth.onIdTokenChange(user => {
+      auth.onIdTokenChanged(user => {
         expect(user).to.eq(user);
         done();
       });
@@ -147,7 +144,7 @@ describe('core/auth/auth_impl', () => {
     it('immediate callback is done async', () => {
       auth._isInitialized = true;
       let callbackCalled = false;
-      auth.onIdTokenChange(() => {
+      auth.onIdTokenChanged(() => {
         callbackCalled = true;
       });
 
@@ -168,7 +165,7 @@ describe('core/auth/auth_impl', () => {
       context('initially currentUser is null', () => {
         beforeEach(async () => {
           auth.onAuthStateChanged(authStateCallback);
-          auth.onIdTokenChange(idTokenCallback);
+          auth.onIdTokenChanged(idTokenCallback);
           await auth.updateCurrentUser(null);
           authStateCallback.resetHistory();
           idTokenCallback.resetHistory();
@@ -188,7 +185,7 @@ describe('core/auth/auth_impl', () => {
       context('initially currentUser is user', () => {
         beforeEach(async () => {
           auth.onAuthStateChanged(authStateCallback);
-          auth.onIdTokenChange(idTokenCallback);
+          auth.onIdTokenChanged(idTokenCallback);
           await auth.updateCurrentUser(user);
           authStateCallback.resetHistory();
           idTokenCallback.resetHistory();
@@ -240,8 +237,8 @@ describe('core/auth/auth_impl', () => {
       it('onIdTokenChange works for multiple listeners', async () => {
         const cb1 = sinon.spy();
         const cb2 = sinon.spy();
-        auth.onIdTokenChange(cb1);
-        auth.onIdTokenChange(cb2);
+        auth.onIdTokenChanged(cb1);
+        auth.onIdTokenChanged(cb2);
         await auth.updateCurrentUser(null);
         cb1.resetHistory();
         cb2.resetHistory();
diff --git a/packages-exp/auth-exp/src/core/auth/auth_impl.ts b/packages-exp/auth-exp/src/core/auth/auth_impl.ts
@@ -17,14 +17,9 @@
 
 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';
@@ -33,7 +28,7 @@ import { AuthErrorCode } from '../errors';
 import { Persistence } from '../persistence';
 import { PersistenceUserManager } from '../persistence/persistence_user_manager';
 import { assert } from '../util/assert';
-import { ClientPlatform, _getClientVersion } from '../util/version';
+import { _getClientVersion, ClientPlatform } from '../util/version';
 
 interface AsyncAction {
   (): Promise<void>;
@@ -79,6 +74,13 @@ class AuthImpl implements Auth {
       this._notifyStateListeners();
     });
   }
+  languageCode: string | null = null;
+  tenantId?: string | null | undefined;
+  settings: externs.AuthSettings = {appVerificationDisabledForTesting: false};
+  
+  useDeviceLanguage(): void {
+    throw new Error("Method not implemented.");
+  }
 
   updateCurrentUser(user: User | null): Promise<void> {
     return this.queue(() => this.directlySetCurrentUser(user));
@@ -107,7 +109,7 @@ class AuthImpl implements Auth {
     );
   }
 
-  onIdTokenChange(
+  onIdTokenChanged(
     nextOrObserver: NextOrObserver<User>,
     error?: ErrorFn,
     completed?: CompleteFn
diff --git a/packages-exp/auth-exp/src/core/strategies/email.ts b/packages-exp/auth-exp/src/core/strategies/email.ts
@@ -15,22 +15,20 @@
  * limitations under the License.
  */
 
-import {
-  createAuthUri,
-  CreateAuthUriRequest
-} from '../../api/authentication/create_auth_uri';
+import * as externs from '@firebase/auth-types-exp';
+
+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
+    ActionCodeSettings, setActionCodeSettingsOnRequest
 } from '../../model/action_code_settings';
 import { Auth } from '../../model/auth';
 import { User } from '../../model/user';
 import { _getCurrentUrl, _isHttpOrHttps } from '../util/location';
 
 export async function fetchSignInMethodsForEmail(
-  auth: Auth,
+  auth: externs.Auth,
   email: string
 ): Promise<string[]> {
   // createAuthUri returns an error if continue URI is not http or https.
@@ -42,13 +40,13 @@ export async function fetchSignInMethodsForEmail(
     continueUri
   };
 
-  const { signinMethods } = await createAuthUri(auth, request);
+  const { signinMethods } = await createAuthUri(auth as Auth, request);
 
   return signinMethods || [];
 }
 
 export async function sendEmailVerification(
-  auth: Auth,
+  auth: externs.Auth,
   user: User,
   actionCodeSettings?: ActionCodeSettings
 ): Promise<void> {
@@ -61,7 +59,7 @@ export async function sendEmailVerification(
     setActionCodeSettingsOnRequest(request, actionCodeSettings);
   }
 
-  const { email } = await api.sendEmailVerification(auth, request);
+  const { email } = await api.sendEmailVerification(auth as Auth, request);
 
   if (email !== user.email) {
     await user.reload();
diff --git a/packages-exp/auth-exp/src/core/strategies/email_and_password.ts b/packages-exp/auth-exp/src/core/strategies/email_and_password.ts
@@ -15,18 +15,19 @@
  * limitations under the License.
  */
 
+import * as externs from '@firebase/auth-types-exp';
+
 import { resetPassword } from '../../api/account_management/email_and_password';
 import * as api from '../../api/authentication/email_and_password';
 import { ActionCodeInfo, Operation } from '../../model/action_code_info';
 import {
-  ActionCodeSettings,
-  setActionCodeSettingsOnRequest
+    ActionCodeSettings, setActionCodeSettingsOnRequest
 } from '../../model/action_code_settings';
 import { Auth } from '../../model/auth';
-import { AuthErrorCode, AUTH_ERROR_FACTORY } from '../errors';
+import { AUTH_ERROR_FACTORY, AuthErrorCode } from '../errors';
 
 export async function sendPasswordResetEmail(
-  auth: Auth,
+  auth: externs.Auth,
   email: string,
   actionCodeSettings?: ActionCodeSettings
 ): Promise<void> {
@@ -38,26 +39,26 @@ export async function sendPasswordResetEmail(
     setActionCodeSettingsOnRequest(request, actionCodeSettings);
   }
 
-  await api.sendPasswordResetEmail(auth, request);
+  await api.sendPasswordResetEmail(auth as Auth, request);
 }
 
 export async function confirmPasswordReset(
-  auth: Auth,
+  auth: externs.Auth,
   oobCode: string,
   newPassword: string
 ): Promise<void> {
-  await resetPassword(auth, {
+  await resetPassword(auth as Auth, {
     oobCode,
     newPassword
   });
   // Do not return the email.
 }
 
 export async function checkActionCode(
-  auth: Auth,
+  auth: externs.Auth,
   oobCode: string
 ): Promise<ActionCodeInfo> {
-  const response = await resetPassword(auth, {
+  const response = await resetPassword(auth as Auth, {
     oobCode
   });
   if (!response.requestType) {
@@ -76,7 +77,7 @@ export async function checkActionCode(
 }
 
 export async function verifyPasswordResetCode(
-  auth: Auth,
+  auth: externs.Auth,
   code: string
 ): Promise<string> {
   const { data } = await checkActionCode(auth, code);
diff --git a/packages-exp/auth-exp/src/core/strategies/email_link.ts b/packages-exp/auth-exp/src/core/strategies/email_link.ts
@@ -15,17 +15,18 @@
  * limitations under the License.
  */
 
+import * as externs from '@firebase/auth-types-exp';
+
 import * as api from '../../api/authentication/email_and_password';
 import { Operation } from '../../model/action_code_info';
 import {
-  ActionCodeSettings,
-  setActionCodeSettingsOnRequest
+    ActionCodeSettings, setActionCodeSettingsOnRequest
 } from '../../model/action_code_settings';
-import { ActionCodeURL } from '../action_code_url';
 import { Auth } from '../../model/auth';
+import { ActionCodeURL } from '../action_code_url';
 
 export async function sendSignInLinkToEmail(
-  auth: Auth,
+  auth: externs.Auth,
   email: string,
   actionCodeSettings?: ActionCodeSettings
 ): Promise<void> {
@@ -37,10 +38,10 @@ export async function sendSignInLinkToEmail(
     setActionCodeSettingsOnRequest(request, actionCodeSettings);
   }
 
-  await api.sendSignInLinkToEmail(auth, request);
+  await api.sendSignInLinkToEmail(auth as Auth, request);
 }
 
-export function isSignInWithEmailLink(auth: Auth, emailLink: string): boolean {
-  const actionCodeUrl = ActionCodeURL._fromLink(auth, emailLink);
+export function isSignInWithEmailLink(auth: externs.Auth, emailLink: string): boolean {
+  const actionCodeUrl = ActionCodeURL._fromLink(auth as Auth, emailLink);
   return actionCodeUrl?.operation === Operation.EMAIL_SIGNIN;
 }
diff --git a/packages-exp/auth-exp/src/core/user/id_token_result.ts b/packages-exp/auth-exp/src/core/user/id_token_result.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
+import { IdTokenResult, ParsedToken } from '@firebase/auth-types-exp';
 import { base64Decode } from '@firebase/util';
 
-import { IdTokenResult, ParsedToken } from '../../model/id_token';
 import { User } from '../../model/user';
 import { ProviderId } from '../providers';
 import { assert } from '../util/assert';
diff --git a/packages-exp/auth-exp/src/core/user/reload.test.ts b/packages-exp/auth-exp/src/core/user/reload.test.ts
@@ -20,17 +20,14 @@ import * as chaiAsPromised from 'chai-as-promised';
 import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';
 
+import { UserInfo } from '@firebase/auth-types-exp';
 import { FirebaseError } from '@firebase/util';
 
 import { mockEndpoint } from '../../../test/api/helper';
 import { testUser } from '../../../test/mock_auth';
 import * as fetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
-import {
-  APIUserInfo,
-  ProviderUserInfo
-} from '../../api/account_management/account';
-import { UserInfo } from '../../model/user';
+import { APIUserInfo, ProviderUserInfo } from '../../api/account_management/account';
 import { ProviderId } from '../providers';
 import { _reloadWithoutSaving, reload } from './reload';
 
diff --git a/packages-exp/auth-exp/src/core/user/reload.ts b/packages-exp/auth-exp/src/core/user/reload.ts
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-import {
-  getAccountInfo,
-  ProviderUserInfo
-} from '../../api/account_management/account';
-import { User, UserInfo } from '../../model/user';
+import * as externs from '@firebase/auth-types-exp';
+
+import { getAccountInfo, ProviderUserInfo } from '../../api/account_management/account';
+import { User } from '../../model/user';
 import { ProviderId } from '../providers';
 import { assert } from '../util/assert';
 
@@ -52,19 +51,20 @@ export async function _reloadWithoutSaving(user: User): Promise<void> {
   Object.assign(user, updates);
 }
 
-export async function reload(user: User): Promise<void> {
-  await _reloadWithoutSaving(user);
+export async function reload(user: externs.User): Promise<void> {
+  const userInternal: User = user as User;
+  await _reloadWithoutSaving(userInternal);
 
   // Even though the current user hasn't changed, update
   // current user will trigger a persistence update w/ the
   // new info.
-  return user.auth.updateCurrentUser(user);
+  return userInternal.auth.updateCurrentUser(userInternal);
 }
 
 function mergeProviderData(
-  original: UserInfo[],
-  newData: UserInfo[]
-): UserInfo[] {
+  original: externs.UserInfo[],
+  newData: externs.UserInfo[]
+): externs.UserInfo[] {
   const deduped = original.filter(
     o => !newData.some(n => n.providerId === o.providerId)
   );
@@ -74,7 +74,7 @@ function mergeProviderData(
 function extractProviderData(
   providers: ProviderUserInfo[],
   appName: string
-): UserInfo[] {
+): externs.UserInfo[] {
   return providers.map(({ providerId, ...provider }) => {
     assert(
       providerId && Object.values<string>(ProviderId).includes(providerId),
diff --git a/packages-exp/auth-exp/src/core/user/user_impl.ts b/packages-exp/auth-exp/src/core/user/user_impl.ts
@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 
+import { IdTokenResult } from '@firebase/auth-types-exp';
+
 import { Auth } from '../../model/auth';
-import { IdTokenResult } from '../../model/id_token';
 import { User } from '../../model/user';
 import { PersistedBlob } from '../persistence';
 import { ProviderId } from '../providers';
@@ -64,6 +65,7 @@ export class UserImpl implements User {
   email: string | null;
   phoneNumber: string | null;
   photoURL: string | null;
+  isAnonymous = false;
 
   constructor({ uid, auth, stsTokenManager, ...opt }: UserParameters) {
     this.uid = uid;
diff --git a/packages-exp/auth-exp/src/model/auth.d.ts b/packages-exp/auth-exp/src/model/auth.d.ts
@@ -15,13 +15,8 @@
  * limitations under the License.
  */
 
-import {
-  CompleteFn,
-  ErrorFn,
-  NextFn,
-  Observer,
-  Unsubscribe
-} from '@firebase/util';
+import * as externs from '@firebase/auth-types-exp';
+import { CompleteFn, ErrorFn, NextFn, Observer, Unsubscribe } from '@firebase/util';
 
 import { Persistence } from '../core/persistence';
 import { User } from './user';
@@ -40,7 +35,7 @@ export interface Config {
   authDomain?: AuthDomain;
 }
 
-export interface Auth {
+export interface Auth extends externs.Auth {
   currentUser: User | null;
   readonly name: AppName;
   readonly config: Config;
@@ -54,7 +49,7 @@ export interface Auth {
     error?: ErrorFn,
     completed?: CompleteFn
   ): Unsubscribe;
-  onIdTokenChange(
+  onIdTokenChanged(
     nextOrObserver: NextOrObserver<User>,
     error?: ErrorFn,
     completed?: CompleteFn
diff --git a/packages-exp/auth-exp/src/model/id_token.d.ts b/packages-exp/auth-exp/src/model/id_token.d.ts
diff --git a/packages-exp/auth-exp/src/model/user.d.ts b/packages-exp/auth-exp/src/model/user.d.ts
diff --git a/packages-exp/auth-exp/test/mock_auth.ts b/packages-exp/auth-exp/test/mock_auth.ts
diff --git a/packages-exp/auth-types-exp/index.d.ts b/packages-exp/auth-types-exp/index.d.ts
