Fix some tests

Author: avolkovi

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

@@ -32,7 +32,8 @@ use(chaiAsPromised);
 
 describe('api/authentication/signInWithCustomToken', () => {
   const request = {
-    token: 'my-token'
+    token: 'my-token',
+    returnSecureToken: true
   };
 
   let auth: TestAuth;

packages-exp/auth-exp/src/core/auth/auth_impl.ts

@@ -118,13 +118,11 @@ export class AuthImpl implements Auth, _FirebaseService {
     });
 
     // After initialization completes, throw any error caused by redirect flow
-    this._initializationPromise.then(() => {
+    return this._initializationPromise.then(() => {
       if (this.redirectInitializerError) {
         throw this.redirectInitializerError;
       }
     });
-
-    return this._initializationPromise;
   }
 
   /**

packages-exp/auth-exp/src/core/auth/firebase_internal.test.ts

@@ -56,6 +56,7 @@ describe('src/core/auth/firebase_internal', () => {
       const user = testUser(auth, 'uid');
       await auth._updateCurrentUser(user);
       user.stsTokenManager.accessToken = 'access-token';
+      user.stsTokenManager.refreshToken = 'refresh-token';
       user.stsTokenManager.expirationTime = Date.now() + 1000 * 60 * 60 * 24;
       expect(await authInternal.getToken()).to.eql({
         accessToken: 'access-token'

packages-exp/auth-exp/src/core/auth/initialize.test.ts

@@ -106,6 +106,13 @@ describe('src/core/auth/initialize', () => {
     ): void {
       cb(true);
     }
+    async _completeRedirectFn(
+      _auth: externs.Auth,
+      _resolver: externs.PopupRedirectResolver,
+      _bypassAuthState: boolean
+    ): Promise<externs.UserCredential | null> {
+      return null;
+    }
   }
 
   const fakePopupRedirectResolver: externs.PopupRedirectResolver = FakePopupRedirectResolver;

packages-exp/auth-exp/src/core/user/token_manager.ts

@@ -54,20 +54,24 @@ export class StsTokenManager {
   }
 
   async getToken(auth: Auth, forceRefresh = false): Promise<string | null> {
-    if (!forceRefresh && this.accessToken && !this.isExpired) {
-      return this.accessToken;
-    }
-
     assert(
-      this.accessToken && !this.refreshToken,
+      !this.accessToken || this.refreshToken,
       AuthErrorCode.TOKEN_EXPIRED,
       {
         appName: auth.name
       }
-    ); /*  */
+    );
+
+    if (!forceRefresh && this.accessToken && !this.isExpired) {
+      return this.accessToken;
+    }
+
+    if (this.refreshToken) {
+      await this.refresh(auth, this.refreshToken!);
+      return this.accessToken;
+    }
 
-    await this.refresh(auth, this.refreshToken!);
-    return this.accessToken;
+    return null;
   }
 
   clearRefreshToken(): void {