[firebase-release] Updated FirebaseUI for web to 2.4.1.

  - Passes the language code to Firebase Auth instance to fully localize firebase-ui web.

PiperOrigin-RevId: 172029023
Change-Id: I7de921fd4079feb736c0ca41b87f23431bcb7a32

Author: Googler

gulpfile.js

@@ -129,6 +129,7 @@ function getLocaleForFileName(locale) {
  * Gets the path to the temporary JS file that contains all FirebaseUI code
  * but no external dependencies.
  * @param {string} locale
+ * @return {string} The path of the temporary JS file.
  */
 function getTmpJsPath(locale) {
   const localeForFileName = getLocaleForFileName(locale);
@@ -163,6 +164,7 @@ function repeatTaskForAllLocales(taskName, dependencies, operation) {
 /**
  * Builds the core FirebaseUI binary in the given locale.
  * @param {string} locale
+ * @return {*} A stream that finishes when compilation finishes.
  */
 function buildFirebaseUiJs(locale) {
   const flags = {
@@ -225,6 +227,7 @@ const buildJsTasks = repeatTaskForAllLocales(
  * Creates the default FirebaseUI binaries for basic usage without
  * localization. For example, it copies firebaseui__en.js to firebaseui.js.
  * @param {string} fileName
+ * @return {!Promise} A promise that resolves on completion.
  */
 function makeDefaultFile(fileName) {
   const localeForFileName = getLocaleForFileName(DEFAULT_LOCALE);

javascript/utils/util.js

@@ -193,3 +193,11 @@ firebaseui.auth.util.getElement = function(element, opt_notFoundDesc) {
 firebaseui.auth.util.getCurrentUrl = function() {
   return window.location.href;
 };
+
+
+/**
+ * @return {string} The country code in canonical Unicode format.
+ */
+firebaseui.auth.util.getUnicodeLocale = function() {
+  return goog.LOCALE.replace(/_/g, '-');
+};

javascript/utils/util_test.js

@@ -99,3 +99,16 @@ function testIsHttpOrHttps() {
       });
   assertFalse(firebaseui.auth.util.isHttpOrHttps());
 }
+
+function testGetUnicodeLocale() {
+  stubs.replace(goog, 'LOCALE', 'de');
+  assertEquals('de', firebaseui.auth.util.getUnicodeLocale());
+
+  stubs.replace(goog, 'LOCALE', 'zh-CN');
+  assertEquals('zh-CN', firebaseui.auth.util.getUnicodeLocale());
+
+  // The locale should have a dash instead of an underscore.
+  stubs.replace(goog, 'LOCALE', 'zh_CN');
+  assertEquals('zh-CN', firebaseui.auth.util.getUnicodeLocale());
+
+}

javascript/widgets/authui.js

@@ -86,6 +86,8 @@ firebaseui.auth.AuthUI = function(auth, opt_appId) {
   }
   /** @private {!firebase.auth.Auth} The Firebase Auth instance. */
   this.auth_ = auth;
+  /** @private {?string} The original Auth language code. */
+  this.originalAuthLanguageCode_ = null;
   // Log FirebaseUI on external Auth instance.
   firebaseui.auth.AuthUI.logFirebaseUI_(this.auth_);
   var tempApp = firebase.initializeApp({
@@ -327,6 +329,16 @@ firebaseui.auth.AuthUI.prototype.start = function(element, config) {
   this.checkIfDestroyed_();
   var self = this;
 
+  // Save the original language code of external Auth instance.
+  if (typeof this.auth_.languageCode !== 'undefined') {
+    this.originalAuthLanguageCode_ = this.auth_.languageCode;
+  }
+  // Make sure the locale uses hyphens instead of underscores.
+  var unicodeLocale = firebaseui.auth.util.getUnicodeLocale();
+  // Sync the language code of Auth instance with widget.
+  this.auth_.languageCode = unicodeLocale;
+  this.tempAuth_.languageCode = unicodeLocale;
+
   // There is a problem when config in second call modifies accountchooser.com
   // related config. eg. acUiConfig
   // These changes will be ignored as only the first accountchooser.com related
@@ -360,9 +372,8 @@ firebaseui.auth.AuthUI.prototype.initElement_ = function(element) {
   // Set the "lang" attribute; without this, there are subtle rendering errors
   // like vowel capitalization in Turkish.
 
-  // Make sure the locale uses hyphens instead of strings.
-  var locale = goog.LOCALE.replace(/_/g, '-');
-  container.setAttribute('lang', locale);
+  // 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
@@ -434,6 +445,10 @@ firebaseui.auth.AuthUI.prototype.reset = function() {
   if (this.widgetElement_) {
     this.widgetElement_.removeAttribute('lang');
   }
+  // Change back the languageCode of external Auth instance.
+  if (typeof this.auth_.languageCode !== 'undefined') {
+    this.auth_.languageCode = this.originalAuthLanguageCode_;
+  }
 
   // After reset, if the sign-in widget callback is called again, it should not
   // resolve with the previous redirect result.

javascript/widgets/authui_test.js

@@ -479,27 +479,62 @@ function testStart() {
 
 
 function testSetLang() {
-  createAndInstallTestInstances();
   testStubs.replace(goog, 'LOCALE', 'de');
+  // Language code of auth instance is set to goog.LOCALE at initialization.
+  // Replace goog.LOCALE and then install instance.
+  createAndInstallTestInstances();
   app1.start(container1, config1);
   assertEquals('de', container1.getAttribute('lang'));
+  assertEquals('de', app1.getAuth().languageCode);
+  assertEquals('de', app1.getExternalAuth().languageCode);
   app1.reset();
   assertFalse(container1.hasAttribute('lang'));
+}
 
+function testSetLang_codeWithdash() {
   testStubs.replace(goog, 'LOCALE', 'zh-CN');
+  // Language code of auth instance is set to goog.LOCALE at initialization.
+  // Replace goog.LOCALE and then install instance.
+  createAndInstallTestInstances();
   app1.start(container1, config1);
   assertEquals('zh-CN', container1.getAttribute('lang'));
+  assertEquals('zh-CN', app1.getAuth().languageCode);
+  assertEquals('zh-CN', app1.getExternalAuth().languageCode);
   app1.reset();
   assertFalse(container1.hasAttribute('lang'));
+}
 
+function testSetLang_codeWithUnderscore() {
   testStubs.replace(goog, 'LOCALE', 'zh_CN');
+  // Language code of auth instance is set to goog.LOCALE at initialization.
+  // Replace goog.LOCALE and then install instance.
+  createAndInstallTestInstances();
   app1.start(container1, config1);
   // The lang should have a dash instead of an underscore.
   assertEquals('zh-CN', container1.getAttribute('lang'));
+  assertEquals('zh-CN', app1.getAuth().languageCode);
+  assertEquals('zh-CN', app1.getExternalAuth().languageCode);
   app1.reset();
   assertFalse(container1.hasAttribute('lang'));
 }
 
+function testStart_overrideLanguageCode() {
+  // Set the language code of widget to zh-CN.
+  testStubs.replace(goog, 'LOCALE', 'zh-CN');
+  createAndInstallTestInstances();
+  testAuth.install();
+  app = new firebaseui.auth.AuthUI(testAuth, 'id0');
+  app.getAuth().assertSetPersistence(['session'], null);
+  // Set the language code of auth to de.
+  testAuth.languageCode = 'de';
+  // Override language code of auth to zh-CN.
+  app.start(container1, config1);
+  assertEquals('zh-CN', app.getExternalAuth().languageCode);
+  app.reset();
+  // Confirm language code of auth changed back to de.
+  assertEquals('de', testAuth.languageCode);
+}
+
 
 function testStart_elementNotFound() {
   // Test widget start method with missing element.