Merge remote-tracking branch 'origin/master'

Author: EddyVerbruggen

src/firebase.android.ts

@@ -812,15 +812,15 @@ function toLoginResult(user, additionalUserInfo?): User {
 
   const loginResult: User = {
     uid: user.getUid(),
-    name: user.getDisplayName(),
+    displayName: user.getDisplayName(),
     email: user.getEmail(),
     emailVerified: user.isEmailVerified(),
     // provider: user.getProviderId(), // always 'firebase'
     providers: providers,
     anonymous: user.isAnonymous(),
     isAnonymous: user.isAnonymous(),
     phoneNumber: user.getPhoneNumber(),
-    profileImageURL: user.getPhotoUrl() ? user.getPhotoUrl().toString() : null,
+    photoURL: user.getPhotoUrl() ? user.getPhotoUrl().toString() : null,
     metadata: {
       creationTimestamp: user.getMetadata() ? new Date(user.getMetadata().getCreationTimestamp() as number) : null,
       lastSignInTimestamp: user.getMetadata() ? new Date(user.getMetadata().getLastSignInTimestamp() as number) : null

src/firebase.d.ts

@@ -346,12 +346,12 @@ export interface User {
   uid: string;
   email?: string;
   emailVerified: boolean;
-  name?: string;
+  displayName?: string;
   phoneNumber?: string;
   anonymous: boolean;
   isAnonymous: boolean; // This is used by the web API
   providers: Array<Provider>;
-  profileImageURL?: string;
+  photoURL?: string;
   metadata: UserMetadata;
   additionalUserInfo?: AdditionalUserInfo;
 

src/firebase.ios.ts

@@ -677,10 +677,10 @@ function toLoginResult(user, additionalUserInfo?: FIRAdditionalUserInfo): User {
     isAnonymous: user.anonymous,
     // provider: user.providerID, // always 'Firebase'
     providers: providers,
-    profileImageURL: user.photoURL ? user.photoURL.absoluteString : null,
+    photoURL: user.photoURL ? user.photoURL.absoluteString : null,
     email: user.email,
     emailVerified: user.emailVerified,
-    name: user.displayName,
+    displayName: user.displayName,
     phoneNumber: user.phoneNumber,
     refreshToken: user.refreshToken,
     metadata: {