Merge 755c901 into 0fac7bd

Author: schmidt-sebastian

packages/firestore/src/api/credentials.ts

@@ -23,6 +23,7 @@ import {
   FirebaseAuthInternalName
 } from '@firebase/auth-interop-types';
 import { Provider } from '@firebase/component';
+import { logDebug } from '../util/log';
 
 // TODO(mikelehen): This should be split into multiple files and probably
 // moved to an auth/ folder to match other platforms.
@@ -214,10 +215,11 @@ export class FirebaseCredentialsProvider implements CredentialsProvider {
       // outstanding so the response is potentially for a previous user (which
       // user, we can't be sure).
       if (this.tokenCounter !== initialTokenCounter) {
-        throw new FirestoreError(
-          Code.ABORTED,
+        logDebug(
+          'FirebaseCredentialsProvider',
           'getToken aborted due to token change.'
         );
+        return this.getToken();
       } else {
         if (tokenData) {
           hardAssert(