PR feedback

Author: avolkovi

packages-exp/auth-exp/src/core/user/reload.test.ts

@@ -91,8 +91,8 @@ describe('core/user/reload', () => {
     expect(user.phoneNumber).to.eq('phone-number');
     expect(user.tenantId).to.eq('tenant-id');
     expect((user.metadata as UserMetadata).toJSON()).to.eql({
-      createdAt: '123',
-      lastLoginAt: '456'
+      createdAt: 123,
+      lastLoginAt: 456
     });
   });
 

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

@@ -52,8 +52,8 @@ export async function _reloadWithoutSaving(user: User): Promise<void> {
     tenantId: coreAccount.tenantId || null,
     providerData: mergeProviderData(user.providerData, newProviderData),
     metadata: new UserMetadata(
-      coreAccount.createdAt?.toString(),
-      coreAccount.lastLoginAt?.toString()
+      coreAccount.createdAt,
+      coreAccount.lastLoginAt
     )
   };
 

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

@@ -24,7 +24,7 @@ import {
 } from '../../api/account_management/account';
 import { FinalizeMfaResponse } from '../../api/authentication/mfa';
 import { IdTokenResponse } from '../../model/id_token';
-import { User, UserParameters } from '../../model/user';
+import { User, UserParameters, MutableUserInfo } from '../../model/user';
 import { PersistedBlob } from '../persistence';
 import { assert } from '../util/assert';
 import { getIdTokenResult } from './id_token_result';
@@ -50,8 +50,8 @@ export class UserMetadata implements externs.UserMetadata {
   readonly lastSignInTime?: string;
 
   constructor(
-    private readonly createdAt?: string,
-    private readonly lastLoginAt?: string
+    private readonly createdAt?: string | number,
+    private readonly lastLoginAt?: string | number
   ) {
     this.lastSignInTime = utcTimestampToDateString(lastLoginAt);
     this.creationTime = utcTimestampToDateString(createdAt);
@@ -76,7 +76,7 @@ export class UserImpl implements User {
   isAnonymous = false;
   tenantId = null;
   readonly metadata: UserMetadata;
-  providerData = [];
+  providerData: MutableUserInfo[] = [];
 
   // Optional fields from UserInfo
   displayName: string | null;
@@ -188,9 +188,7 @@ export class UserImpl implements User {
       photoURL: this.photoURL || undefined,
       phoneNumber: this.phoneNumber || undefined,
       tenantId: this.tenantId || undefined,
-      providerData: this.providerData.map(userInfo =>
-        Object.assign({}, userInfo)
-      ),
+      providerData: this.providerData.map(userInfo => ({ ...userInfo })),
       stsTokenManager: this.stsTokenManager.toJSON(),
       // Redirect event ID must be maintained in case there is a pending
       // redirect event.
@@ -262,9 +260,7 @@ export class UserImpl implements User {
     });
 
     if (providerData && Array.isArray(providerData)) {
-      user.providerData = providerData.map(userInfo =>
-        Object.assign({}, userInfo)
-      );
+      user.providerData = providerData.map(userInfo => ({ ...userInfo }));
     }
 
     if (_redirectEventId) {

packages-exp/auth-exp/src/core/util/time.ts

@@ -30,7 +30,7 @@ export function utcTimestampToDateString(
       return date.toUTCString();
     }
   } catch (e) {
-    // Do nothing. null will be returned.
+    // Do nothing. undefined will be returned.
   }
   return undefined;
 }

packages-exp/auth-exp/src/mfa/mfa_resolver.test.ts

@@ -55,7 +55,7 @@ describe('core/mfa/mfa_resolver/MultiFactorResolver', () => {
       appName: auth.name,
       serverResponse: {
         localId: 'local-id',
-        expiresIn: 3600,
+        expiresIn: '3600',
         mfaPendingCredential: 'mfa-pending-credential',
         mfaInfo: [
           {
@@ -140,7 +140,7 @@ describe('core/mfa/mfa_resolver/MultiFactorResolver', () => {
           );
           expect(userCredential._tokenResponse).to.eql({
             localId: 'local-id',
-            expiresIn: 3600,
+            expiresIn: '3600',
             idToken: 'final-id-token',
             refreshToken: 'final-refresh-token'
           });
@@ -180,7 +180,7 @@ describe('core/mfa/mfa_resolver/MultiFactorResolver', () => {
           );
           expect(userCredential._tokenResponse).to.eql({
             localId: 'local-id',
-            expiresIn: 3600,
+            expiresIn: '3600',
             idToken: 'final-id-token',
             refreshToken: 'final-refresh-token'
           });

packages-exp/auth-types-exp/index.d.ts

@@ -102,7 +102,6 @@ export type NextOrObserver<T> = NextFn<T | null> | Observer<T | null>;
 export interface AuthError extends FirebaseError {
   readonly appName: string;
 
-  readonly credential?: AuthCredential;
   readonly email?: string;
   readonly phoneNumber?: string;
   readonly tenantid?: string;
@@ -339,6 +338,7 @@ export interface MultiFactorAssertion {
  * https://firebase.google.com/docs/reference/js/firebase.auth.multifactorerror
  */
 export interface MultiFactorError extends AuthError {
+  readonly credential: AuthCredential;
   readonly operationType: OperationType;
 }