Merge branch 'master' into dockerversion

xil222 · web-flow · commit d7046b8f833f · 2021-08-18T16:26:05.000-07:00
diff --git a/README.md b/README.md
@@ -62,8 +62,8 @@ You just need to include the following script and CSS file in the `<head>` tag
 of your page, below the initialization snippet from the Firebase Console:
 
 ```html
-<script src="https://www.gstatic.com/firebasejs/ui/4.8.1/firebase-ui-auth.js"></script>
-<link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/4.8.1/firebase-ui-auth.css" />
+<script src="https://www.gstatic.com/firebasejs/ui/5.0.0/firebase-ui-auth.js"></script>
+<link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/5.0.0/firebase-ui-auth.css" />
 ```
 
 #### Localized Widget
@@ -72,17 +72,17 @@ Localized versions of the widget are available through the CDN. To use a
 localized widget, load the localized JS library instead of the default library:
 
 ```html
-<script src="https://www.gstatic.com/firebasejs/ui/4.8.1/firebase-ui-auth__{LANGUAGE_CODE}.js"></script>
-<link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/4.8.1/firebase-ui-auth.css" />
+<script src="https://www.gstatic.com/firebasejs/ui/5.0.0/firebase-ui-auth__{LANGUAGE_CODE}.js"></script>
+<link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/5.0.0/firebase-ui-auth.css" />
 ```
 
 where `{LANGUAGE_CODE}` is replaced by the code of the language you want. For example, the French
 version of the library is available at
-`https://www.gstatic.com/firebasejs/ui/4.8.1/firebase-ui-auth__fr.js`. The list of available
+`https://www.gstatic.com/firebasejs/ui/5.0.0/firebase-ui-auth__fr.js`. The list of available
 languages and their respective language codes can be found at [LANGUAGES.md](LANGUAGES.md).
 
 Right-to-left languages also require the right-to-left version of the stylesheet, available at
-`https://www.gstatic.com/firebasejs/ui/4.8.1/firebase-ui-auth-rtl.css`, instead of the default
+`https://www.gstatic.com/firebasejs/ui/5.0.0/firebase-ui-auth-rtl.css`, instead of the default
 stylesheet. The supported right-to-left languages are Arabic (ar), Farsi (fa), and Hebrew (iw).
 
 ### Option 2: npm Module
@@ -199,8 +199,8 @@ for a more in-depth example, showcasing a Single Page Application mode.
        * In addition, include the firebase-auth SDK:
        * <script src="https://www.gstatic.com/firebasejs/[FIREBASE VERSION USED IN SNIPPET]/firebase-auth.js"></script> *
        ***************************************************************************************** -->
-    <script src="https://www.gstatic.com/firebasejs/ui/4.8.1/firebase-ui-auth.js"></script>
-    <link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/4.8.1/firebase-ui-auth.css" />
+    <script src="https://www.gstatic.com/firebasejs/ui/5.0.0/firebase-ui-auth.js"></script>
+    <link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/5.0.0/firebase-ui-auth.css" />
     <script type="text/javascript">
       // FirebaseUI config.
       var uiConfig = {
@@ -1351,8 +1351,8 @@ FirebaseUI is displayed.
        * TODO(DEVELOPER): Paste the initialization snippet from:
        * Firebase Console > Overview > Add Firebase to your web app. *
        ***************************************************************************************** -->
-    <script src="https://www.gstatic.com/firebasejs/ui/4.8.1/firebase-ui-auth.js"></script>
-    <link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/4.8.1/firebase-ui-auth.css" />
+    <script src="https://www.gstatic.com/firebasejs/ui/5.0.0/firebase-ui-auth.js"></script>
+    <link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/5.0.0/firebase-ui-auth.css" />
     <script type="text/javascript">
       // FirebaseUI config.
       var uiConfig = {
@@ -1933,11 +1933,18 @@ on a server deployed locally, accessing the application through a `localhost`
 address. However, it doesn't impact applications deployed on a server (as you
 can verify in the [demo app](https://fir-ui-demo-84a6c.firebaseapp.com/)).
 
-## Deprecated APIs
+## Release Notes
+
+**Latest**: https://github.com/firebase/firebaseui-web/releases/latest
+
+**For v1.0.0 and superior:** https://github.com/firebase/firebaseui-web/releases
+
+### 5.0.0
 
-As a result of `accountchooser.com` switching to "universal opt-out" mode on
-July 31st, 2020, FirebaseUI will no longer support `accountchooser.com`
-credential helper.
+`accountchooser.com` has been operating in "universal opt-out" mode and was
+shutdown on July 2021. FirebaseUI-web has stopped supporting this credential
+helper and since version v5.0.0, all related configurations and enums have been
+removed.
 
 - If you are using `firebaseui.auth.CredentialHelper.ACCOUNT_CHOOSER_COM`,
   you need to switch to `firebaseui.auth.CredentialHelper.NONE` or
@@ -1949,12 +1956,6 @@ credential helper.
   be provided by the latest
   [one-tap API](https://developers.google.com/identity/one-tap/web/reference/js-reference).
 
-## Release Notes
-
-**Latest**: https://github.com/firebase/firebaseui-web/releases/latest
-
-**For v1.0.0 and superior:** https://github.com/firebase/firebaseui-web/releases
-
 ### 0.5.0
 
 See the milestone [0.5.0](https://github.com/firebase/firebaseui-web/milestone/1)
diff --git a/externs/firebaseui-externs.js b/externs/firebaseui-externs.js
@@ -467,12 +467,10 @@ firebaseui.auth.AuthUIError.prototype.toJSON = function() {};
 
 
 /**
- * The FirebaseUI credential helpers available. `ACCOUNT_CHOOSER_COM` is
- * deprecated and will be removed by Jan 31st, 2021.
+ * The FirebaseUI credential helpers available.
  * @enum {string}
  */
 firebaseui.auth.CredentialHelper = {
-  ACCOUNT_CHOOSER_COM: 'accountchooser.com',
   GOOGLE_YOLO: 'googleyolo',
   NONE: 'none'
 };
@@ -485,16 +483,6 @@ firebaseui.auth.CredentialHelper = {
  */
 firebaseui.auth.Config = function() {};
 
-/**
- * The accountchooser.com configuration when it is selected as credential
- * helper. This is now a no-op and is deprecated and will be removed by
- * Jan 31st, 2021.
- *
- * @deprecated
- * @type {!Object|undefined}
- */
-firebaseui.auth.Config.prototype.acUiConfig;
-
 /**
  * Whether to upgrade anonymous users on sign-in. The default is false.
  *
diff --git a/javascript/utils/account.js b/javascript/utils/account.js
@@ -83,14 +83,8 @@ firebaseui.auth.Account = class {
    * @return {?firebaseui.auth.Account} The account.
    */
   static fromPlainObject(account) {
-    // TODO: Remove this filter once accountchooser.com supports non-email
-    // accounts. We will also have to figure out how to choose a sign-in method,
-    // since fetchProvidersForEmail won't work.
-    if (account['email']) {
-      return new firebaseui.auth.Account(
-          account['email'], account['displayName'], account['photoUrl'],
-          account['providerId']);
-    }
-    return null;
+    return new firebaseui.auth.Account(
+        account['email'], account['displayName'], account['photoUrl'],
+        account['providerId']);
   }
 };
diff --git a/javascript/widgets/authui.js b/javascript/widgets/authui.js
@@ -580,9 +580,7 @@ firebaseui.auth.AuthUI.prototype.initElement_ = function(element) {
   // Make sure the locale uses hyphens instead of underscores.
   container.setAttribute('lang', firebaseui.auth.util.getUnicodeLocale());
 
-  // Only one auth instance can be rendered per page. This is because
-  // accountchooser.com callbacks are set once to the AuthUI instance that
-  // first calls them.
+  // Only one auth instance can be rendered per page.
   if (firebaseui.auth.AuthUI.widgetAuthUi_) {
     // Already rendered, automatically reset.
     // First check if there is a pending operation on that widget, if so,
@@ -612,7 +610,7 @@ firebaseui.auth.AuthUI.prototype.initElement_ = function(element) {
       this.currentComponent_.getPageId() == 'blank' &&
       this.getConfig().federatedProviderShouldImmediatelyRedirect();
   // Removes pending status of previous redirect operations including redirect
-  // back from accountchooser.com and federated sign in.
+  // back from federated sign in.
   // Remove status after dispatchOperation completes as that operation depends
   // on this information.
   if (firebaseui.auth.storage.hasRedirectStatus(this.getAppId()) &&
@@ -809,7 +807,7 @@ firebaseui.auth.AuthUI.prototype.reset = function() {
   // Clear email link sign-in state from URL if needed.
   this.clearEmailSignInState();
   // Removes pending status of previous redirect operations including redirect
-  // back from accountchooser.com and federated sign in.
+  // back from federated sign in.
   firebaseui.auth.storage.removeRedirectStatus(this.getAppId());
   // Cancel One-Tap last operation.
   this.cancelOneTapSignIn();
diff --git a/javascript/widgets/authui_test.js b/javascript/widgets/authui_test.js
@@ -254,13 +254,6 @@ function setUp() {
       firebaseui.auth.widget.dispatcher,
       'dispatchOperation',
       goog.testing.recordFunction());
-  // Simulate accountchooser.com loaded.
-  testStubs.set(
-      firebaseui.auth.widget.handler.common,
-      'loadAccountchooserJs',
-      function(app, callback, opt_forceUiShownCallback) {
-        callback();
-      });
   // Install fake test utilities.
   testUtil = new firebaseui.auth.testing.FakeUtil().install();
   ignoreArgument = goog.testing.mockmatchers.ignoreArgument;
diff --git a/javascript/widgets/config.js b/javascript/widgets/config.js
@@ -35,9 +35,6 @@ class Config {
   constructor() {
     /** @const @private {!AuthConfig} The AuthUI config object. */
     this.config_ = new AuthConfig();
-    // Define FirebaseUI widget configurations and convenient getters.
-    // TODO: This is deprecated and should be removed by Jan 31st, 2021.
-    this.config_.define('acUiConfig');
     this.config_.define('autoUpgradeAnonymousUsers');
     this.config_.define('callbacks');
     /**
@@ -857,11 +854,6 @@ class Config {
     }
     const credentialHelper = this.config_.get('credentialHelper');
 
-    // Manually set deprecated accountchooser.com to none.
-    if (credentialHelper === Config.CredentialHelper.ACCOUNT_CHOOSER_COM) {
-      return Config.CredentialHelper.NONE;
-    }
-
     // Make sure the credential helper is valid.
     for (let key in Config.CredentialHelper) {
       if (Config.CredentialHelper[key] === credentialHelper) {
@@ -916,8 +908,6 @@ class Config {
  * @enum {string}
  */
 Config.CredentialHelper = {
-  // TODO: accountchooser.com is no longer supported. Remove by Jan 31st, 2021.
-  ACCOUNT_CHOOSER_COM: 'accountchooser.com',
   GOOGLE_YOLO: 'googleyolo',
   NONE: 'none',
 };
diff --git a/javascript/widgets/exports_app.js b/javascript/widgets/exports_app.js
@@ -79,9 +79,6 @@ goog.exportSymbol('firebaseui.auth.AuthUIError', firebaseui.auth.AuthUIError);
 goog.exportSymbol(
     'firebaseui.auth.AuthUIError.prototype.toJSON',
     firebaseui.auth.AuthUIError.prototype.toJSON);
-goog.exportSymbol(
-    'firebaseui.auth.CredentialHelper.ACCOUNT_CHOOSER_COM',
-    firebaseui.auth.widget.Config.CredentialHelper.ACCOUNT_CHOOSER_COM);
 goog.exportSymbol(
     'firebaseui.auth.CredentialHelper.GOOGLE_YOLO',
     firebaseui.auth.widget.Config.CredentialHelper.GOOGLE_YOLO);
diff --git a/javascript/widgets/handler/providersignin_test.js b/javascript/widgets/handler/providersignin_test.js
@@ -88,7 +88,7 @@ function setupProviderSignInPage(
       'signInFlow': flow,
       'credentialHelper': !!enableOneTap ?
           firebaseui.auth.widget.Config.CredentialHelper.GOOGLE_YOLO :
-          firebaseui.auth.widget.Config.CredentialHelper.ACCOUNT_CHOOSER_COM
+          firebaseui.auth.widget.Config.CredentialHelper.NONE
     });
   }
   // Set sign-in options.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "firebaseui",
-  "version": "4.8.1",
+  "version": "5.0.0",
   "description": "Javascript library for customizable UI on top of Firebase SDK",
   "files": [
     "dist/firebaseui.js",
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -113,9 +113,6 @@ interface PhoneSignInOption extends SignInOption {
 
 declare namespace firebaseui.auth {
   interface Config {
-    // This is now a no-op and is deprecated and will be removed by Jan 31st,
-    // 2021.
-    acUiConfig?: object;
     autoUpgradeAnonymousUsers?: boolean;
     callbacks?: Callbacks;
     credentialHelper?: CredentialHelperType;
@@ -166,9 +163,6 @@ declare namespace firebaseui.auth {
 
   class CredentialHelper {
     private constructor();
-    // `ACCOUNT_CHOOSER_COM` is deprecated and will be removed by Jan 31st,
-    // 2021.
-    static ACCOUNT_CHOOSER_COM: CredentialHelperType;
     static GOOGLE_YOLO: CredentialHelperType;
     static NONE: CredentialHelperType;
   }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ function setupProviderSignInPage(`
`88`	`88`	`'signInFlow': flow,`
`89`	`89`	`'credentialHelper': !!enableOneTap ?`
`90`	`90`	`firebaseui.auth.widget.Config.CredentialHelper.GOOGLE_YOLO :`
`91`		`- firebaseui.auth.widget.Config.CredentialHelper.ACCOUNT_CHOOSER_COM`
	`91`	`+ firebaseui.auth.widget.Config.CredentialHelper.NONE`
`92`	`92`	`});`
`93`	`93`	`}`
`94`	`94`	`// Set sign-in options.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebaseui",`
`3`		`- "version": "4.8.1",`
	`3`	`+ "version": "5.0.0",`
`4`	`4`	`"description": "Javascript library for customizable UI on top of Firebase SDK",`
`5`	`5`	`"files": [`
`6`	`6`	`"dist/firebaseui.js",`