Release (#336)

Fixes the verifyPassword error logged to the browser console on anonymous user upgrade.
Fixes the bug when the incorrect user reference is returned on anonymous user upgrade which occurs when a user is already signed in on the external Auth instance.
Fixes the uncaught promise cancellation error when signInSuccess callback is provided and no redirect is required.

Author: wti806

README.md

@@ -63,17 +63,17 @@ Localized versions of the widget are available through the CDN. To use a localiz
 localized JS library instead of the default library:
 
 ```html
-<script src="https://www.gstatic.com/firebasejs/ui/2.6.1/firebase-ui-auth__{LANGUAGE_CODE}.js"></script>
-<link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/2.6.1/firebase-ui-auth.css" />
+<script src="https://www.gstatic.com/firebasejs/ui/2.6.2/firebase-ui-auth__{LANGUAGE_CODE}.js"></script>
+<link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/2.6.2/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/2.6.1/firebase-ui-auth__fr.js`. The list of available
+`https://www.gstatic.com/firebasejs/ui/2.6.2/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/2.6.1/firebase-ui-auth-rtl.css`, instead of the default
+`https://www.gstatic.com/firebasejs/ui/2.6.2/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

changelog.txt

@@ -0,0 +1,3 @@
+fixed - Fixes the verifyPassword error logged to the browser console on anonymous user upgrade.
+fixed - Fixes the bug when the incorrect user reference is returned on anonymous user upgrade which occurs when a user is already signed in on the external Auth instance.
+fixed - Fixes the uncaught promise cancellation error when signInSuccess callback is provided and no redirect is required.

javascript/widgets/authui.js

@@ -1152,9 +1152,12 @@ firebaseui.auth.AuthUI.prototype.finishSignInWithCredential =
     // Anonymous user upgrade successful, resolve immediately with the user.
     // No need to sign in again with the same credential on the external Auth
     // instance.
+    // If user is signed in on internal instance, ignore the user on external
+    // instance and finish the sign in on external instance.
     if (self.currentUser_ &&
         !self.currentUser_['isAnonymous'] &&
-        self.getConfig().autoUpgradeAnonymousUsers()) {
+        self.getConfig().autoUpgradeAnonymousUsers() &&
+        !self.getAuth().currentUser) {
       return (firebase.Promise || goog.Promise).resolve(self.currentUser_);
     } else if (user) {
       // TODO: optimize and fail directly as this will fail in most cases

javascript/widgets/authui_test.js

@@ -2909,6 +2909,46 @@ function testFinishSignInWithCredential_upgradeAnonymous_nonAnonymous() {
 }
 
 
+function testFinishSignInWithCredential_upgradeAnon_nonAnonUserOnTempAuth() {
+  // If there is a user signed in on internal instance, finish the sign in flow
+  // by signing it on external instance.
+  testApp = new firebaseui.auth.testing.FakeAppClient(options);
+  testAuth = testApp.auth();
+  app = new firebaseui.auth.AuthUI(testAuth, 'id0');
+  // Simulate autoUpgradeAnonymousUsers set to true.
+  app.setConfig(anonymousUpgradeConfig);
+  app.getAuth().install();
+  app.getExternalAuth().install();
+  asyncTestCase.waitForSignals(1);
+  var userOnExternalInstance = {
+    'email': '[email protected]',
+    'displayName': 'Federated User2'
+  };
+  // Simulate a user already logged in on external instance.
+  testAuth.setUser(userOnExternalInstance);
+  // Simulate another user already logged in on internal instance.
+  app.getAuth().setUser(expectedUser);
+  app.finishSignInWithCredential(expectedCredential)
+      .then(function(user) {
+        // The user returned should be the one originally signed in on internal
+        // instance.
+        assertObjectEquals(app.getAuth().currentUser, user);
+        assertEquals(app.getExternalAuth().currentUser, user);
+        asyncTestCase.signal();
+      });
+  // Trigger initial onAuthStateChanged listener.
+  app.getExternalAuth().runAuthChangeHandler();
+  app.getExternalAuth().assertSignInWithCredential(
+      [expectedCredential],
+      function() {
+        app.getExternalAuth().setUser(expectedUser);
+        return app.getExternalAuth().currentUser;
+      });
+  app.getExternalAuth().process();
+  app.getAuth().process();
+}
+
+
 function testFinishSignInWithCredential_upgradeAnonymous_noUser() {
   testApp = new firebaseui.auth.testing.FakeAppClient(options);
   testAuth = testApp.auth();

javascript/widgets/handler/common.js

@@ -486,15 +486,13 @@ firebaseui.auth.widget.handler.common.setLoggedIn =
     firebaseui.auth.storage.removeRememberAccount(app.getAppId());
     // After successful sign out from internal instance, sign in with credential
     // to the developer provided auth instance. Use the credential passed.
-    var finishSignInPromise = app.finishSignInWithCredential(
+    return app.finishSignInWithCredential(
         /** @type {!firebase.auth.AuthCredential} */ (credential))
         .then(function(user) {
           firebaseui.auth.widget.handler.common.setUserLoggedInExternal_(
               app, component, user, outputCred);
           // Catch error when signInSuccessUrl is required and not provided.
         }, onError).then(function() {}, onError);
-    app.registerPending(finishSignInPromise);
-    return finishSignInPromise;
   }, onError);
   app.registerPending(signOutAndSignInPromise);
   return goog.Promise.resolve(signOutAndSignInPromise);
@@ -1012,6 +1010,10 @@ firebaseui.auth.widget.handler.common.verifyPassword =
           return;
         }
         switch (error['code']) {
+          case 'auth/email-already-in-use':
+            // Do nothing when anonymous user is getting updated.
+            // Developer should handle this in signInFailure callback.
+            break;
           case 'auth/email-exists':
             showInvalidEmail(error);
             break;

javascript/widgets/handler/passwordsignin_test.js

@@ -29,6 +29,7 @@ goog.require('goog.Promise');
 goog.require('goog.dom');
 goog.require('goog.dom.forms');
 goog.require('goog.testing.events');
+goog.require('goog.testing.recordFunction');
 
 
 function testHandlePasswordSignIn() {
@@ -65,6 +66,10 @@ function testHandlePasswordSignIn() {
 
 
 function testHandlePasswordSignIn_upgradeAnonymous_successfulSignIn() {
+  testStubs.replace(
+      firebaseui.auth.log,
+      'error',
+      goog.testing.recordFunction());
   var expectedCredential = firebase.auth.EmailAuthProvider.credential(
       passwordAccount.getEmail(), '123');
   // Expected FirebaseUI error.
@@ -98,6 +103,10 @@ function testHandlePasswordSignIn_upgradeAnonymous_successfulSignIn() {
     testAuth.assertSignOut([]);
     return testAuth.process();
   }).then(function() {
+    mockClock.tick();
+    // No error message should be displayed in console.
+    /** @suppress {missingRequire} */
+    assertEquals(0, firebaseui.auth.log.error.getCallCount());
     // No info bar should be displayed.
     assertNoInfoBarMessage();
     // UI should be disposed.

translations/ar-XB.xtb

@@ -34,8 +34,7 @@
 <translation id="1799407952500261728">‏‮Cook‬‏ ‏‮Islands‬‏</translation>
 <translation id="1870056762032541323">‏‮Wrong‬‏ ‏‮code‬‏. ‏‮Try‬‏ ‏‮again‬‏.</translation>
 <translation id="1898579907513173256">‏‮Macau‬‏</translation>
-<translation id="1929332760123475919"><ph name="P_START" />‏‮Hello‬‏ <ph name="DISPLAY_NAME" />,<ph name="P_END" /></translation>
-<translation id="1966996824429980990">‏‮Delete‬‏ ‏‮account‬‏</translation>
+<translation id="1933044638365301516">‏‮Sign‬‏ ‏‮in‬‏ ‏‮with‬‏ <ph name="STRING" /></translation>
 <translation id="1987722456379605552">‏‮Enter‬‏ ‏‮the‬‏ 6-‏‮digit‬‏ ‏‮code‬‏ ‏‮we‬‏ ‏‮sent‬‏ ‏‮to‬‏ <ph name="START_LINK" /><ph name="PHONE_NUMBER" /><ph name="END_LINK" /></translation>
 <translation id="2016421613709283485">‏‮Follow‬‏ ‏‮the‬‏ ‏‮instructions‬‏ ‏‮sent‬‏ ‏‮to‬‏ <ph name="PH_1" /> ‏‮to‬‏ ‏‮recover‬‏ ‏‮your‬‏ ‏‮password‬‏.</translation>
 <translation id="2035855087334775326">‏‮Hungary‬‏</translation>
@@ -294,6 +293,7 @@
 <translation id="6999773882165218263">‏‮First‬‏ &amp;amp; ‏‮last‬‏ ‏‮name‬‏</translation>
 <translation id="7012506961150923116">‏‮Grenada‬‏</translation>
 <translation id="7024571478138322659">‏‮Western‬‏ ‏‮Sahara‬‏</translation>
+<translation id="7062299334696934251">‏‮An‬‏ ‏‮unknown‬‏ ‏‮error‬‏ ‏‮occurred‬‏.</translation>
 <translation id="7064251114893721966">‏‮You‬‏’‏‮ve‬‏ ‏‮already‬‏ ‏‮used‬‏ <ph name="START_STRONG" /><ph name="EMAIL" /><ph name="END_STRONG" /> ‏‮to‬‏ ‏‮sign‬‏ ‏‮in‬‏. ‏‮Enter‬‏ ‏‮your‬‏ ‏‮password‬‏ ‏‮for‬‏ ‏‮that‬‏ ‏‮account‬‏.</translation>
 <translation id="7089485669419398254">‏‮Ireland‬‏</translation>
 <translation id="7093343209860483088">‏‮Democratic‬‏ ‏‮Republic‬‏ ‏‮Congo‬‏</translation>

translations/en-XA.xtb

@@ -34,8 +34,7 @@
 <translation id="1799407952500261728">[Çööķ Κļåñðš one two]</translation>
 <translation id="1870056762032541323">[Ŵŕöñĝ çöðé. Ţŕý åĝåîñ. one two three four five]</translation>
 <translation id="1898579907513173256">[Måçåû one]</translation>
-<translation id="1929332760123475919">[ᐅ<ph name="P_START" />ᐊĤéļļö ᐅ<ph name="DISPLAY_NAME" />ᐊ,ᐅ<ph name="P_END" />ᐊ one two three four]</translation>
-<translation id="1966996824429980990">[Ðéļéţé åççöûñţ one two]</translation>
+<translation id="1933044638365301516">[Šîĝñ îñ ŵîţĥ ᐅ<ph name="STRING" />ᐊ one two three four]</translation>
 <translation id="1987722456379605552">[Éñţéŕ ţĥé 6-ðîĝîţ çöðé ŵé šéñţ ţö ᐅ<ph name="START_LINK" />ᐊᐅ<ph name="PHONE_NUMBER" />ᐊᐅ<ph name="END_LINK" />ᐊ one two three four five six seven eight nine]</translation>
 <translation id="2016421613709283485">[Föļļöŵ ţĥé îñšţŕûçţîöñš šéñţ ţö ᐅ<ph name="PH_1" />ᐊ ţö ŕéçövéŕ ýöûŕ þåššŵöŕð. one two three four five six seven eight nine ten eleven twelve]</translation>
 <translation id="2035855087334775326">[Ĥûñĝåŕý one]</translation>
@@ -294,6 +293,7 @@
 <translation id="6999773882165218263">[Fîŕšţ &amp;amp; ļåšţ ñåmé one two three four]</translation>
 <translation id="7012506961150923116">[Ĝŕéñåðå one]</translation>
 <translation id="7024571478138322659">[Ŵéšţéŕñ Šåĥåŕå one two]</translation>
+<translation id="7062299334696934251">[Åñ ûñķñöŵñ éŕŕöŕ öççûŕŕéð. one two three four five six]</translation>
 <translation id="7064251114893721966">[Ýöû’vé åļŕéåðý ûšéð ᐅ<ph name="START_STRONG" />ᐊᐅ<ph name="EMAIL" />ᐊᐅ<ph name="END_STRONG" />ᐊ ţö šîĝñ îñ. Éñţéŕ ýöûŕ þåššŵöŕð ƒöŕ ţĥåţ åççöûñţ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen]</translation>
 <translation id="7089485669419398254">[Îŕéļåñð one]</translation>
 <translation id="7093343209860483088">[Ðémöçŕåţîç Ŕéþûбļîç Çöñĝö one two three]</translation>

translations/iw.xtb

@@ -296,6 +296,7 @@
 <translation id="6999773882165218263">שם פרטי ומשפחה</translation>
 <translation id="7012506961150923116">גרנדה</translation>
 <translation id="7024571478138322659">סהרה המערבית</translation>
+<translation id="7062299334696934251">אירעה שגיאה לא ידועה.</translation>
 <translation id="7064251114893721966">כבר השתמשת בכתובת <ph name="START_STRONG" /><ph name="EMAIL" /><ph name="END_STRONG" /> כדי להיכנס. עליך להזין את הסיסמה לחשבון המשויך אליה.</translation>
 <translation id="7089485669419398254">אירלנד</translation>
 <translation id="7093343209860483088">הרפובליקה הדמוקרטית של קונגו</translation>