feat: update tests

packages/firebase_auth/firebase_auth/lib/src/user.dart

@@ -30,6 +30,17 @@ class User {
     return _delegate.email;
   }
 
+  /// Returns whether the users email address has been verified.
+  ///
+  /// To send a verification email, see [sendEmailVerification].
+  ///
+  /// Once verified, call [reload] to ensure the latest user information is
+  /// retrieved from Firebase.
+  @Deprecated('Use isEmailVerified instead')
+  bool get emailVerified {
+    return _delegate.isEmailVerified;
+  }
+
   /// Returns whether the users email address has been verified.
   ///
   /// To send a verification email, see [sendEmailVerification].
@@ -638,6 +649,18 @@ class User {
     return _delegate.updateProfile(<String, String?>{'photoURL': photoURL});
   }
 
+  /// Updates a user's profile data.
+  @Deprecated(
+    'Will be removed in version 2.0.0. '
+    'Use updatePhotoURL and updateDisplayName instead.',
+  )
+  Future<void> updateProfile({String? displayName, String? photoURL}) {
+    return _delegate.updateProfile(<String, String?>{
+      'displayName': displayName,
+      'photoURL': photoURL,
+    });
+  }
+
   /// Sends a verification email to a new email address. The user's email will
   /// be updated to the new one after being verified.
   ///

packages/firebase_auth/firebase_auth/test/firebase_auth_test.dart

@@ -43,24 +43,25 @@ void main() {
   final int kMockLastSignInTimestamp =
       DateTime.now().subtract(const Duration(days: 1)).millisecondsSinceEpoch;
 
-  Map<String, dynamic> kMockUser = <String, dynamic>{
-    'isAnonymous': true,
-    'emailVerified': false,
-    'displayName': 'displayName',
-    'metadata': <String, int>{
-      'creationTime': kMockCreationTimestamp,
-      'lastSignInTime': kMockLastSignInTimestamp,
-    },
-    'providerData': <Map<String, String>>[
-      <String, String>{
+  final kMockUser = PigeonUserDetails(
+    userInfo: PigeonUserInfo(
+      uid: '12345',
+      displayName: 'displayName',
+      creationTimestamp: kMockCreationTimestamp,
+      lastSignInTimestamp: kMockLastSignInTimestamp,
+      isAnonymous: true,
+      isEmailVerified: false,
+    ),
+    providerData: [
+      {
         'providerId': 'firebase',
         'uid': '12345',
         'displayName': 'Flutter Test User',
         'photoURL': 'http://www.example.com/',
         'email': 'test@example.com',
-      },
+      }
     ],
-  };
+  );
 
   MockUserPlatform? mockUserPlatform;
   MockUserCredentialPlatform? mockUserCredPlatform;
@@ -72,7 +73,7 @@ void main() {
   MockFirebaseAuth mockAuthPlatform = MockFirebaseAuth();
 
   group('$FirebaseAuth', () {
-    Map<String, dynamic> user;
+    PigeonUserDetails user;
     // used to generate a unique application name for each test
     var testCount = 0;
 
@@ -171,7 +172,7 @@ void main() {
       when(mockAuthPlatform.userChanges()).thenAnswer((_) =>
           Stream<UserPlatform>.fromIterable(<UserPlatform>[mockUserPlatform!]));
 
-      TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
           .setMockMethodCallHandler(MethodChannelFirebaseAuth.channel,
               (call) async {
         return <String, dynamic>{'user': user};
@@ -247,8 +248,12 @@ void main() {
     group('checkActionCode()', () {
       test('should call delegate method', () async {
         // Necessary as we otherwise get a "null is not a Future<void>" error
-        when(mockAuthPlatform.checkActionCode(any))
-            .thenAnswer((i) async => ActionCodeInfo(data: {}, operation: 0));
+        when(mockAuthPlatform.checkActionCode(any)).thenAnswer(
+          (i) async => ActionCodeInfo(
+            data: ActionCodeInfoData(email: null, previousEmail: null),
+            operation: ActionCodeInfoOperation.unknown,
+          ),
+        );
 
         await auth.checkActionCode(kMockActionCode);
         verify(mockAuthPlatform.checkActionCode(kMockActionCode));
@@ -377,7 +382,7 @@ void main() {
         final ActionCodeSettings kMockActionCodeSettingsNull =
             ActionCodeSettings(url: kMockURL);
         final ActionCodeSettings kMockActionCodeSettingsFalse =
-            ActionCodeSettings(url: kMockURL, handleCodeInApp: false);
+            ActionCodeSettings(url: kMockURL);
 
         // when handleCodeInApp is null
         expect(
@@ -840,7 +845,7 @@ class MockFirebaseAuth extends Mock
 
   @override
   FirebaseAuthPlatform setInitialValues({
-    Map<String, dynamic>? currentUser,
+    PigeonUserDetails? currentUser,
     String? languageCode,
   }) {
     return super.noSuchMethod(
@@ -1034,7 +1039,7 @@ class FakeFirebaseAuthPlatform extends Fake
 
   @override
   FirebaseAuthPlatform setInitialValues({
-    Map<String, dynamic>? currentUser,
+    PigeonUserDetails? currentUser,
     String? languageCode,
   }) {
     return this;
@@ -1045,7 +1050,7 @@ class MockUserPlatform extends Mock
     with MockPlatformInterfaceMixin
     implements TestUserPlatform {
   MockUserPlatform(FirebaseAuthPlatform auth, MultiFactorPlatform multiFactor,
-      Map<String, dynamic> _user) {
+      PigeonUserDetails _user) {
     TestUserPlatform(auth, multiFactor, _user);
   }
 }
@@ -1096,7 +1101,7 @@ class TestFirebaseAuthPlatform extends FirebaseAuthPlatform {
 
   @override
   FirebaseAuthPlatform setInitialValues({
-    Map<String, dynamic>? currentUser,
+    PigeonUserDetails? currentUser,
     String? languageCode,
   }) {
     return this;
@@ -1165,7 +1170,7 @@ class TestAuthProvider extends AuthProvider {
 
 class TestUserPlatform extends UserPlatform {
   TestUserPlatform(FirebaseAuthPlatform auth, MultiFactorPlatform multiFactor,
-      Map<String, dynamic> data)
+      PigeonUserDetails data)
       : super(auth, multiFactor, data);
 }
 

packages/firebase_auth/firebase_auth/test/user_test.dart

@@ -31,42 +31,41 @@ void main() {
 
   FirebaseAuth? auth;
 
-  const Map<String, dynamic> kMockIdTokenResult = <String, dynamic>{
-    'token': '12345',
-    'expirationTimestamp': 123456,
-    'authTimestamp': 1234567,
-    'issuedAtTimestamp': 12345678,
-    'signInProvider': 'password',
-    'claims': <dynamic, dynamic>{
+  final kMockIdTokenResult = PigeonIdTokenResult(
+    token: '12345',
+    expirationTimestamp: 123456,
+    authTimestamp: 1234567,
+    issuedAtTimestamp: 12345678,
+    signInProvider: 'password',
+    claims: {
       'claim1': 'value1',
     },
-  };
+  );
 
   final int kMockCreationTimestamp =
       DateTime.now().subtract(const Duration(days: 2)).millisecondsSinceEpoch;
   final int kMockLastSignInTimestamp =
       DateTime.now().subtract(const Duration(days: 1)).millisecondsSinceEpoch;
 
-  Map<String, dynamic> kMockUser = <String, dynamic>{
-    'isAnonymous': true,
-    'emailVerified': false,
-    'uid': '42',
-    'displayName': 'displayName',
-    'metadata': <String, int>{
-      'creationTime': kMockCreationTimestamp,
-      'lastSignInTime': kMockLastSignInTimestamp,
-    },
-    'providerData': <Map<String, String>>[
-      <String, String>{
+  final kMockUser = PigeonUserDetails(
+    userInfo: PigeonUserInfo(
+      uid: '12345',
+      displayName: 'displayName',
+      creationTimestamp: kMockCreationTimestamp,
+      lastSignInTimestamp: kMockLastSignInTimestamp,
+      isAnonymous: true,
+      isEmailVerified: false,
+    ),
+    providerData: [
+      {
         'providerId': 'firebase',
         'uid': '12345',
         'displayName': 'Flutter Test User',
         'photoURL': 'http://www.example.com/',
         'email': 'test@example.com',
-      },
+      }
     ],
-  };
-
+  );
   MockUserPlatform? mockUserPlatform;
   MockUserCredentialPlatform? mockUserCredPlatform;
 
@@ -84,7 +83,7 @@ void main() {
   var mockAuthPlatform = MockFirebaseAuth();
 
   group('$User', () {
-    Map<String, dynamic>? user;
+    PigeonUserDetails? user;
 
     // used to generate a unique application name for each test
     var testCount = 0;
@@ -130,7 +129,7 @@ void main() {
         languageCode: anyNamed('languageCode'),
       )).thenAnswer((_) => mockAuthPlatform);
 
-      TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
           .setMockMethodCallHandler(MethodChannelFirebaseAuth.channel,
               (call) async {
         switch (call.method) {
@@ -387,7 +386,7 @@ class MockFirebaseAuth extends Mock
 
   @override
   FirebaseAuthPlatform setInitialValues({
-    Map<String, dynamic>? currentUser,
+    PigeonUserDetails? currentUser,
     String? languageCode,
   }) {
     return super.noSuchMethod(
@@ -404,7 +403,7 @@ class MockFirebaseAuth extends Mock
 class MockUserPlatform extends Mock
     with MockPlatformInterfaceMixin
     implements TestUserPlatform {
-  MockUserPlatform(FirebaseAuthPlatform auth, Map<String, dynamic> _user) {
+  MockUserPlatform(FirebaseAuthPlatform auth, PigeonUserDetails _user) {
     TestUserPlatform(auth, TestMultiFactorPlatform(auth), _user);
   }
 
@@ -564,7 +563,7 @@ class TestFirebaseAuthPlatform extends FirebaseAuthPlatform {
 
   @override
   FirebaseAuthPlatform setInitialValues({
-    Map<String, dynamic>? currentUser,
+    PigeonUserDetails? currentUser,
     String? languageCode,
   }) {
     return this;
@@ -573,7 +572,7 @@ class TestFirebaseAuthPlatform extends FirebaseAuthPlatform {
 
 class TestUserPlatform extends UserPlatform {
   TestUserPlatform(FirebaseAuthPlatform auth, MultiFactorPlatform multiFactor,
-      Map<String, dynamic> data)
+      PigeonUserDetails data)
       : super(auth, multiFactor, data);
 }
 

packages/firebase_auth/firebase_auth_platform_interface/lib/src/action_code_info.dart

@@ -12,12 +12,14 @@ class ActionCodeInfo {
   @protected
   ActionCodeInfo({
     required this.operation,
-    required this.data,
-  });
+    required ActionCodeInfoData data,
+  }) : _data = data;
 
   ActionCodeInfoOperation operation;
 
-  ActionCodeInfoData data;
+  ActionCodeInfoData _data;
+
+  Map<String, dynamic> get data => _data.toMap();
 }
 
 /// The data associated with the action code.
@@ -37,4 +39,12 @@ class ActionCodeInfoData {
 
   /// The previous email associated with the action code.
   final String? previousEmail;
+
+  /// Converts the [ActionCodeInfoData] instance to a [Map].
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'email': email,
+      'previousEmail': previousEmail,
+    };
+  }
 }