Token management into user_impl

Author: sam-gc

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

@@ -31,6 +31,7 @@ export const TOKEN_REFRESH_BUFFER_MS = 30_000;
 export interface Tokens {
   accessToken: string;
   refreshToken: string | null;
+  wasRefreshed: boolean;
 }
 
 export class StsTokenManager {
@@ -50,14 +51,16 @@ export class StsTokenManager {
     refreshToken,
     expiresIn: expiresInSec
   }: IdTokenResponse): void {
-    this.refreshToken = refreshToken;
-    this.accessToken = idToken;
-    this.expirationTime = Date.now() + Number(expiresInSec) * 1000;
+    this.updateTokensAndExpiration(idToken, refreshToken, expiresInSec);
   }
 
   async getToken(auth: Auth, forceRefresh = false): Promise<Tokens|null> {
     if (!forceRefresh && this.accessToken && !this.isExpired) {
-      return this.tokens;
+      return {
+        accessToken: this.accessToken,
+        refreshToken: this.refreshToken,
+        wasRefreshed: false,
+      };
     }
 
     if (this.accessToken && !this.refreshToken) {
@@ -71,30 +74,30 @@ export class StsTokenManager {
     }
 
     await this.refresh(auth, this.refreshToken);
-    return this.tokens;
-  }
-
-  toPlainObject(): object {
     return {
+      accessToken: this.accessToken!,
       refreshToken: this.refreshToken,
-      accessToken: this.accessToken,
-      expirationTime: this.expirationTime
+      wasRefreshed: true,
     };
   }
 
-  private get tokens(): Tokens {
+  toPlainObject(): object {
     return {
-      accessToken: this.accessToken!,
       refreshToken: this.refreshToken,
+      accessToken: this.accessToken,
+      expirationTime: this.expirationTime
     };
   }
 
   private async refresh(auth: Auth, refreshToken: string) {
     const {access_token, refresh_token, expires_in} = await requestStsToken(auth, refreshToken);
-    
-    this.accessToken = access_token || null;
-    this.refreshToken = refresh_token || null;
-    this.expirationTime = expires_in ? Date.now() + Number(expires_in) * 1000 : null;
+    this.updateTokensAndExpiration(access_token, refresh_token, expires_in);
+  }
+
+  private updateTokensAndExpiration(accessToken: string|undefined, refreshToken: string|undefined, expiresInSec: string|undefined) {
+    this.refreshToken = refreshToken || null;
+    this.accessToken = accessToken || null;
+    this.expirationTime = expiresInSec ? Date.now() + Number(expiresInSec) * 1000 : null;
   }
 
   static fromPlainObject(

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

@@ -75,12 +75,18 @@ export class UserImpl implements User {
   }
 
   async getIdToken(forceRefresh?: boolean): Promise<string> {
-    const { refreshToken, accessToken } = await this.stsTokenManager.getToken(
-      forceRefresh
-    );
+    const tokens = await this.stsTokenManager.getToken(this.auth, forceRefresh);
+    assert(tokens, this.auth.name);
+
+    // TODO: remove ! after #2934 is merged --
+    const { refreshToken, accessToken, /* wasRefreshed */ } = tokens!;
     this.refreshToken = refreshToken || '';
 
-    // TODO: notify listeners at this point
+    // TODO: Uncomment after #2961 is merged
+    // if (wasRefreshed && this.auth.currentUser === this) {
+    //   this.auth._notifyListeners();
+    // }
+
     return accessToken;
   }