Merge 0735291 into 064e1ca

Author: Feiyang1

common/api-review/auth-exp.api.md

@@ -82,7 +82,6 @@ export function applyActionCode(auth: Auth, oobCode: string): Promise<void>;
 export interface Auth {
     readonly config: Config;
     readonly currentUser: User | null;
-    // Warning: (ae-forgotten-export) The symbol "EmulatorConfig" needs to be exported by the entry point index.d.ts
     readonly emulatorConfig: EmulatorConfig | null;
     languageCode: string | null;
     readonly name: string;
@@ -328,6 +327,16 @@ export class EmailAuthProvider implements AuthProvider {
     readonly providerId: "password";
 }
 
+// @public
+export interface EmulatorConfig {
+    readonly host: string;
+    readonly options: {
+        readonly disableWarnings: boolean;
+    };
+    readonly port: number | null;
+    readonly protocol: string;
+}
+
 export { ErrorFn }
 
 // Warning: (ae-forgotten-export) The symbol "BaseOAuthProvider" needs to be exported by the entry point index.d.ts
@@ -463,6 +472,8 @@ export interface MultiFactorUser {
     unenroll(option: MultiFactorInfo | string): Promise<void>;
 }
 
+export { NextFn }
+
 // @public
 export type NextOrObserver<T> = NextFn<T | null> | Observer<T | null>;
 
@@ -634,12 +645,17 @@ export function reauthenticateWithPopup(user: User, provider: AuthProvider, reso
 // @public
 export function reauthenticateWithRedirect(user: User, provider: AuthProvider, resolver?: PopupRedirectResolver): Promise<never>;
 
+// @public
+export interface RecaptchaParameters {
+    // (undocumented)
+    [key: string]: any;
+}
+
 // Warning: (ae-forgotten-export) The symbol "ApplicationVerifierInternal" needs to be exported by the entry point index.d.ts
 //
 // @public
 export class RecaptchaVerifier implements ApplicationVerifierInternal {
-    // Warning: (ae-forgotten-export) The symbol "Parameters" needs to be exported by the entry point index.d.ts
-    constructor(containerOrId: HTMLElement | string, parameters: Parameters_2, authExtern: Auth);
+    constructor(containerOrId: HTMLElement | string, parameters: RecaptchaParameters, authExtern: Auth);
     clear(): void;
     // Warning: (ae-forgotten-export) The symbol "ReCaptchaLoader" needs to be exported by the entry point index.d.ts
     //

packages-exp/auth-exp/index.ts

@@ -33,46 +33,7 @@ import { browserPopupRedirectResolver } from './src/platform_browser/popup_redir
 import { Auth } from './src/model/public_types';
 
 // Public types
-export {
-  // Interfaces
-  ActionCodeInfo,
-  ActionCodeSettings,
-  AdditionalUserInfo,
-  ApplicationVerifier,
-  Auth,
-  AuthError,
-  AuthErrorMap,
-  AuthProvider,
-  AuthSettings,
-  Config,
-  ConfirmationResult,
-  IdTokenResult,
-  MultiFactorAssertion,
-  MultiFactorError,
-  MultiFactorInfo,
-  MultiFactorResolver,
-  MultiFactorSession,
-  MultiFactorUser,
-  ParsedToken,
-  Persistence,
-  PhoneMultiFactorAssertion,
-  PhoneMultiFactorEnrollInfoOptions,
-  PhoneMultiFactorSignInInfoOptions,
-  PhoneSingleFactorInfoOptions,
-  PopupRedirectResolver,
-  ReactNativeAsyncStorage,
-  User,
-  UserCredential,
-  UserInfo,
-  UserMetadata,
-  UserProfile,
-  PhoneInfoOptions,
-  Dependencies,
-  NextOrObserver,
-  ErrorFn,
-  CompleteFn,
-  Unsubscribe
-} from './src/model/public_types';
+export * from './src/model/public_types';
 
 // Helper maps (not used internally)
 export {

packages-exp/auth-exp/package.json

@@ -42,7 +42,7 @@
     "test:node:integration": "node ./scripts/run-node-tests.js --integration",
     "test:node:integration:local": "node ./scripts/run-node-tests.js --integration --local",
     "test:webdriver": "rollup -c test/integration/webdriver/static/rollup.config.js && node ./scripts/run-node-tests.js --webdriver",
-    "api-report": "api-extractor run --local --verbose",
+    "api-report": "api-extractor run --local --verbose && ts-node-script ../../repo-scripts/prune-dts/prune-dts.ts --input dist/auth-exp-public.d.ts --output dist/auth-exp-public.d.ts",
     "predoc": "node ../../scripts/exp/remove-exp.js temp",
     "doc": "api-documenter markdown --input temp --output docs",
     "build:doc": "yarn build && yarn doc",

packages-exp/auth-exp/src/api/account_management/account.test.ts

@@ -18,7 +18,7 @@
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 
-import { ProviderId } from '../../model/public_types';
+import { ProviderId } from '../../model/enums';
 import { FirebaseError } from '@firebase/util';
 
 import { Endpoint, HttpHeader } from '../';

packages-exp/auth-exp/src/api/authentication/custom_token.test.ts

@@ -18,7 +18,7 @@
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 
-import { ProviderId } from '../../model/public_types';
+import { ProviderId } from '../../model/enums';
 import { FirebaseError } from '@firebase/util';
 
 import { Endpoint, HttpHeader } from '../';

packages-exp/auth-exp/src/api/authentication/sms.test.ts

@@ -18,7 +18,7 @@
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 
-import { ProviderId } from '../../model/public_types';
+import { ProviderId } from '../../model/enums';
 import { FirebaseError } from '@firebase/util';
 
 import { Endpoint, HttpHeader } from '../';

packages-exp/auth-exp/src/core/credentials/email.test.ts

@@ -18,7 +18,7 @@
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 
-import { ProviderId, SignInMethod } from '../../model/public_types';
+import { ProviderId, SignInMethod } from '../../model/enums';
 
 import { mockEndpoint } from '../../../test/helpers/api/helper';
 import { testAuth, TestAuth } from '../../../test/helpers/mock_auth';

packages-exp/auth-exp/src/core/credentials/email.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ProviderId, SignInMethod } from '../../model/public_types';
+import { ProviderId, SignInMethod } from '../../model/enums';
 
 import { updateEmailPassword } from '../../api/account_management/email_and_password';
 import { signInWithPassword } from '../../api/authentication/email_and_password';

packages-exp/auth-exp/src/core/credentials/oauth.test.ts

@@ -17,7 +17,7 @@
 
 import { expect } from 'chai';
 
-import { ProviderId, SignInMethod } from '../../model/public_types';
+import { ProviderId, SignInMethod } from '../../model/enums';
 
 import { mockEndpoint } from '../../../test/helpers/api/helper';
 import { TEST_ID_TOKEN_RESPONSE } from '../../../test/helpers/id_token_response';

packages-exp/auth-exp/src/core/credentials/phone.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ProviderId, SignInMethod } from '../../model/public_types';
+import { ProviderId, SignInMethod } from '../../model/enums';
 
 import { PhoneOrOauthTokenResponse } from '../../api/authentication/mfa';
 import {
@@ -84,12 +84,8 @@ export class PhoneAuthCredential extends AuthCredential {
 
   /** @internal */
   _makeVerificationRequest(): SignInWithPhoneNumberRequest {
-    const {
-      temporaryProof,
-      phoneNumber,
-      verificationId,
-      verificationCode
-    } = this.params;
+    const { temporaryProof, phoneNumber, verificationId, verificationCode } =
+      this.params;
     if (temporaryProof && phoneNumber) {
       return { temporaryProof, phoneNumber };
     }
@@ -127,12 +123,8 @@ export class PhoneAuthCredential extends AuthCredential {
       json = JSON.parse(json);
     }
 
-    const {
-      verificationId,
-      verificationCode,
-      phoneNumber,
-      temporaryProof
-    } = json as { [key: string]: string };
+    const { verificationId, verificationCode, phoneNumber, temporaryProof } =
+      json as { [key: string]: string };
     if (
       !verificationCode &&
       !verificationId &&

packages-exp/auth-exp/src/core/providers/email.test.ts

@@ -18,7 +18,7 @@
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 
-import { ProviderId, SignInMethod } from '../../model/public_types';
+import { ProviderId, SignInMethod } from '../../model/enums';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { FirebaseError } from '@firebase/util';
 

packages-exp/auth-exp/src/core/providers/email.ts

@@ -15,11 +15,8 @@
  * limitations under the License.
  */
 
-import {
-  ProviderId,
-  SignInMethod,
-  AuthProvider
-} from '../../model/public_types';
+import { ProviderId, SignInMethod } from '../../model/enums';
+import { AuthProvider } from '../../model/public_types';
 
 import { ActionCodeURL } from '../action_code_url';
 import { EmailAuthCredential } from '../credentials/email';

packages-exp/auth-exp/src/core/providers/facebook.test.ts

@@ -21,7 +21,7 @@ import {
   OperationType,
   ProviderId,
   SignInMethod
-} from '../../model/public_types';
+} from '../../model/enums';
 
 import { TEST_ID_TOKEN_RESPONSE } from '../../../test/helpers/id_token_response';
 import { testUser, testAuth } from '../../../test/helpers/mock_auth';

packages-exp/auth-exp/src/core/providers/facebook.ts

@@ -15,17 +15,14 @@
  * limitations under the License.
  */
 
-import {
-  ProviderId,
-  SignInMethod,
-  UserCredential
-} from '../../model/public_types';
+import { UserCredential } from '../../model/public_types';
 import { FirebaseError } from '@firebase/util';
 
 import { TaggedWithTokenResponse } from '../../model/id_token';
 import { UserCredentialInternal } from '../../model/user';
 import { OAuthCredential } from '../credentials/oauth';
 import { BaseOAuthProvider } from './oauth';
+import { ProviderId, SignInMethod } from '../../model/enums';
 
 /**
  * Provider for generating an {@link OAuthCredential} for {@link ProviderId}.FACEBOOK.

packages-exp/auth-exp/src/core/providers/github.test.ts

@@ -21,7 +21,7 @@ import {
   OperationType,
   ProviderId,
   SignInMethod
-} from '../../model/public_types';
+} from '../../model/enums';
 
 import { TEST_ID_TOKEN_RESPONSE } from '../../../test/helpers/id_token_response';
 import { testUser, testAuth } from '../../../test/helpers/mock_auth';

packages-exp/auth-exp/src/core/providers/github.ts

@@ -15,17 +15,14 @@
  * limitations under the License.
  */
 
-import {
-  ProviderId,
-  SignInMethod,
-  UserCredential
-} from '../../model/public_types';
+import { UserCredential } from '../../model/public_types';
 import { FirebaseError } from '@firebase/util';
 
 import { TaggedWithTokenResponse } from '../../model/id_token';
 import { UserCredentialInternal } from '../../model/user';
 import { OAuthCredential } from '../credentials/oauth';
 import { BaseOAuthProvider } from './oauth';
+import { ProviderId, SignInMethod } from '../../model/enums';
 
 /**
  * Provider for generating an {@link OAuthCredential} for {@link ProviderId}.GITHUB.

packages-exp/auth-exp/src/core/providers/google.test.ts

@@ -21,7 +21,7 @@ import {
   OperationType,
   ProviderId,
   SignInMethod
-} from '../../model/public_types';
+} from '../../model/enums';
 
 import { TEST_ID_TOKEN_RESPONSE } from '../../../test/helpers/id_token_response';
 import { testUser, testAuth } from '../../../test/helpers/mock_auth';

packages-exp/auth-exp/src/core/providers/google.ts

@@ -15,18 +15,15 @@
  * limitations under the License.
  */
 
-import {
-  ProviderId,
-  SignInMethod,
-  UserCredential
-} from '../../model/public_types';
+import { UserCredential } from '../../model/public_types';
 import { FirebaseError } from '@firebase/util';
 
 import { SignInWithIdpResponse } from '../../api/authentication/idp';
 import { TaggedWithTokenResponse } from '../../model/id_token';
 import { UserCredentialInternal } from '../../model/user';
 import { OAuthCredential } from '../credentials/oauth';
 import { BaseOAuthProvider } from './oauth';
+import { ProviderId, SignInMethod } from '../../model/enums';
 
 /**
  * Provider for generating an an {@link OAuthCredential} for {@link ProviderId}.GOOGLE.

packages-exp/auth-exp/src/core/providers/oauth.test.ts

@@ -21,7 +21,7 @@ import {
   OperationType,
   ProviderId,
   SignInMethod
-} from '../../model/public_types';
+} from '../../model/enums';
 
 import { TEST_ID_TOKEN_RESPONSE } from '../../../test/helpers/id_token_response';
 import { testUser, testAuth } from '../../../test/helpers/mock_auth';

packages-exp/auth-exp/src/core/providers/saml.test.ts

@@ -17,7 +17,7 @@
 
 import { expect } from 'chai';
 
-import { OperationType } from '../../model/public_types';
+import { OperationType } from '../../model/enums';
 
 import { TEST_ID_TOKEN_RESPONSE } from '../../../test/helpers/id_token_response';
 import { testUser, testAuth } from '../../../test/helpers/mock_auth';

packages-exp/auth-exp/src/core/providers/twitter.test.ts

@@ -38,7 +38,7 @@ import {
   OperationType,
   ProviderId,
   SignInMethod
-} from '../../model/public_types';
+} from '../../model/enums';
 
 import { TEST_ID_TOKEN_RESPONSE } from '../../../test/helpers/id_token_response';
 import { testUser, testAuth } from '../../../test/helpers/mock_auth';

packages-exp/auth-exp/src/core/providers/twitter.ts

@@ -32,18 +32,15 @@
  * limitations under the License.
  */
 
-import {
-  ProviderId,
-  SignInMethod,
-  UserCredential
-} from '../../model/public_types';
+import { UserCredential } from '../../model/public_types';
 import { FirebaseError } from '@firebase/util';
 
 import { SignInWithIdpResponse } from '../../api/authentication/idp';
 import { TaggedWithTokenResponse } from '../../model/id_token';
 import { UserCredentialInternal } from '../../model/user';
 import { OAuthCredential } from '../credentials/oauth';
 import { BaseOAuthProvider } from './oauth';
+import { ProviderId, SignInMethod } from '../../model/enums';
 
 /**
  * Provider for generating an {@link OAuthCredential} for {@link ProviderId}.TWITTER.

packages-exp/auth-exp/src/core/strategies/abstract_popup_redirect_operation.test.ts

@@ -20,7 +20,7 @@ import * as chaiAsPromised from 'chai-as-promised';
 import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';
 
-import { OperationType, ProviderId } from '../../model/public_types';
+import { OperationType, ProviderId } from '../../model/enums';
 import { FirebaseError } from '@firebase/util';
 
 import { TEST_ID_TOKEN_RESPONSE } from '../../../test/helpers/id_token_response';

packages-exp/auth-exp/src/core/strategies/anonymous.test.ts

@@ -17,7 +17,7 @@
 
 import { expect } from 'chai';
 
-import { OperationType } from '../../model/public_types';
+import { OperationType } from '../../model/enums';
 
 import { mockEndpoint } from '../../../test/helpers/api/helper';
 import { testAuth, testUser, TestAuth } from '../../../test/helpers/mock_auth';

packages-exp/auth-exp/src/core/strategies/anonymous.ts

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-import { Auth, OperationType, UserCredential } from '../../model/public_types';
+import { Auth, UserCredential } from '../../model/public_types';
 import { signUp } from '../../api/authentication/sign_up';
 import { UserInternal } from '../../model/user';
 import { UserCredentialImpl } from '../user/user_credential_impl';
 import { _castAuth } from '../auth/auth_impl';
+import { OperationType } from '../../model/enums';
 
 /**
  * Asynchronously signs in as an anonymous user.