TF-2298 Update expires time when old token has expired

Signed-off-by: dab246 <tdvu@linagora.com>
(cherry picked from commit fb26afe8f52df6e16476aea8a68f9f92c5c4b001)

fcm/lib/converter/fcm_token_nullable_converter.dart

@@ -0,0 +1,12 @@
+import 'package:fcm/model/fcm_token.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+class FcmTokenNullableConverter implements JsonConverter<FcmToken?, String?> {
+  const FcmTokenNullableConverter();
+
+  @override
+  FcmToken? fromJson(String? json) => json != null ? FcmToken(json) : null;
+
+  @override
+  String? toJson(FcmToken? object) => object?.value;
+}

fcm/lib/converter/firebase_expired_time_nullable_converter.dart

@@ -1,20 +0,0 @@
-import 'package:fcm/model/firebase_expired_time.dart';
-import 'package:jmap_dart_client/http/converter/utc_date_converter.dart';
-import 'package:jmap_dart_client/http/converter/utc_date_nullable_converter.dart';
-import 'package:json_annotation/json_annotation.dart';
-
-class FirebaseExpiredTimeNullableConverter implements JsonConverter<FirebaseExpiredTime?, String?> {
-  const FirebaseExpiredTimeNullableConverter();
-
-  @override
-  FirebaseExpiredTime? fromJson(String? json) {
-    if (json != null) {
-      return FirebaseExpiredTime(const UTCDateConverter().fromJson(json));
-    } else {
-      return null;
-    }
-  }
-
-  @override
-  String? toJson(FirebaseExpiredTime? object) => const UTCDateNullableConverter().toJson(object?.value);
-}

fcm/lib/converter/firebase_registration_expired_time_nullable_converter.dart

@@ -0,0 +1,20 @@
+import 'package:fcm/model/firebase_registration_expired_time.dart';
+import 'package:jmap_dart_client/http/converter/utc_date_converter.dart';
+import 'package:jmap_dart_client/http/converter/utc_date_nullable_converter.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+class FirebaseRegistrationExpiredTimeNullableConverter implements JsonConverter<FirebaseRegistrationExpiredTime?, String?> {
+  const FirebaseRegistrationExpiredTimeNullableConverter();
+
+  @override
+  FirebaseRegistrationExpiredTime? fromJson(String? json) {
+    if (json != null) {
+      return FirebaseRegistrationExpiredTime(const UTCDateConverter().fromJson(json));
+    } else {
+      return null;
+    }
+  }
+
+  @override
+  String? toJson(FirebaseRegistrationExpiredTime? object) => const UTCDateNullableConverter().toJson(object?.value);
+}

fcm/lib/converter/firebase_registration_id_nullable_converter.dart

@@ -0,0 +1,13 @@
+import 'package:fcm/model/firebase_registration_id.dart';
+import 'package:jmap_dart_client/jmap/core/id.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+class FirebaseRegistrationIdNullableConverter implements JsonConverter<FirebaseRegistrationId?, String?> {
+  const FirebaseRegistrationIdNullableConverter();
+
+  @override
+  FirebaseRegistrationId? fromJson(String? json) => json != null ? FirebaseRegistrationId(Id(json)) : null;
+
+  @override
+  String? toJson(FirebaseRegistrationId? object) => object?.id.value;
+}

fcm/lib/converter/firebase_subscription_id_nullable_converter.dart

@@ -1,13 +0,0 @@
-import 'package:fcm/model/firebase_subscription_id.dart';
-import 'package:jmap_dart_client/jmap/core/id.dart';
-import 'package:json_annotation/json_annotation.dart';
-
-class FirebaseSubscriptionIdNullableConverter implements JsonConverter<FirebaseSubscriptionId?, String?> {
-  const FirebaseSubscriptionIdNullableConverter();
-
-  @override
-  FirebaseSubscriptionId? fromJson(String? json) => json != null ? FirebaseSubscriptionId(Id(json)) : null;
-
-  @override
-  String? toJson(FirebaseSubscriptionId? object) => object?.id.value;
-}

fcm/lib/converter/firebase_token_nullable_converter.dart

@@ -1,12 +0,0 @@
-import 'package:fcm/model/firebase_token.dart';
-import 'package:json_annotation/json_annotation.dart';
-
-class FirebaseTokenNullableConverter implements JsonConverter<FirebaseToken?, String?> {
-  const FirebaseTokenNullableConverter();
-
-  @override
-  FirebaseToken? fromJson(String? json) => json != null ? FirebaseToken(json) : null;
-
-  @override
-  String? toJson(FirebaseToken? object) => object?.value;
-}

fcm/lib/method/get/firebase_registration_get_method.dart

@@ -7,14 +7,14 @@ import 'package:jmap_dart_client/jmap/core/request/request_invocation.dart';
 import 'package:jmap_dart_client/jmap/core/request/result_reference.dart';
 import 'package:json_annotation/json_annotation.dart';
 
-part 'firebase_subscription_get_method.g.dart';
+part 'firebase_registration_get_method.g.dart';
 
 @IdConverter()
 @PropertiesConverter()
 @JsonSerializable(explicitToJson: true)
-class FirebaseSubscriptionGetMethod extends GetMethodNoNeedAccountId {
+class FirebaseRegistrationGetMethod extends GetMethodNoNeedAccountId {
 
-  FirebaseSubscriptionGetMethod() : super();
+  FirebaseRegistrationGetMethod() : super();
 
   @override
   MethodName get methodName => MethodName('FirebaseRegistration/get');
@@ -28,8 +28,8 @@ class FirebaseSubscriptionGetMethod extends GetMethodNoNeedAccountId {
   @override
   List<Object?> get props => [methodName, ids, requiredCapabilities];
 
-  factory FirebaseSubscriptionGetMethod.fromJson(Map<String, dynamic> json) => _$FirebaseSubscriptionGetMethodFromJson(json);
+  factory FirebaseRegistrationGetMethod.fromJson(Map<String, dynamic> json) => _$FirebaseRegistrationGetMethodFromJson(json);
 
   @override
-  Map<String, dynamic> toJson() => _$FirebaseSubscriptionGetMethodToJson(this);
+  Map<String, dynamic> toJson() => _$FirebaseRegistrationGetMethodToJson(this);
 }

fcm/lib/method/get/firebase_registration_get_response.dart

@@ -0,0 +1,29 @@
+import 'package:fcm/model/firebase_registration.dart';
+import 'package:jmap_dart_client/http/converter/id_converter.dart';
+import 'package:jmap_dart_client/jmap/core/id.dart';
+import 'package:jmap_dart_client/jmap/core/method/response/get_response.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'firebase_registration_get_response.g.dart';
+
+@IdConverter()
+@JsonSerializable(explicitToJson: true)
+class FirebaseRegistrationGetResponse extends GetResponseNoAccountId<FirebaseRegistration> {
+
+  FirebaseRegistrationGetResponse(
+    List<FirebaseRegistration> list,
+    List<Id>? notFound
+  ) : super(list, notFound);
+
+  factory FirebaseRegistrationGetResponse.fromJson(Map<String, dynamic> json) =>
+    _$FirebaseRegistrationGetResponseFromJson(json);
+
+  static FirebaseRegistrationGetResponse deserialize(Map<String, dynamic> json) {
+    return FirebaseRegistrationGetResponse.fromJson(json);
+  }
+
+  Map<String, dynamic> toJson() => _$FirebaseRegistrationGetResponseToJson(this);
+
+  @override
+  List<Object?> get props => [list, notFound];
+}

fcm/lib/method/get/firebase_subscription_get_response.dart

@@ -1,29 +0,0 @@
-import 'package:fcm/model/firebase_subscription.dart';
-import 'package:jmap_dart_client/http/converter/id_converter.dart';
-import 'package:jmap_dart_client/jmap/core/id.dart';
-import 'package:jmap_dart_client/jmap/core/method/response/get_response.dart';
-import 'package:json_annotation/json_annotation.dart';
-
-part 'firebase_subscription_get_response.g.dart';
-
-@IdConverter()
-@JsonSerializable(explicitToJson: true)
-class FirebaseSubscriptionGetResponse extends GetResponseNoAccountId<FirebaseSubscription> {
-
-  FirebaseSubscriptionGetResponse(
-    List<FirebaseSubscription> list,
-    List<Id>? notFound
-  ) : super(list, notFound);
-
-  factory FirebaseSubscriptionGetResponse.fromJson(Map<String, dynamic> json) =>
-    _$FirebaseSubscriptionGetResponseFromJson(json);
-
-  static FirebaseSubscriptionGetResponse deserialize(Map<String, dynamic> json) {
-    return FirebaseSubscriptionGetResponse.fromJson(json);
-  }
-
-  Map<String, dynamic> toJson() => _$FirebaseSubscriptionGetResponseToJson(this);
-
-  @override
-  List<Object?> get props => [list, notFound];
-}

fcm/lib/method/set/firebase_registration_set_method.dart

@@ -1,4 +1,4 @@
-import 'package:fcm/model/firebase_subscription.dart';
+import 'package:fcm/model/firebase_registration.dart';
 import 'package:fcm/model/firebase_capability.dart';
 import 'package:jmap_dart_client/http/converter/id_converter.dart';
 import 'package:jmap_dart_client/http/converter/set/set_method_properties_converter.dart';
@@ -6,9 +6,9 @@ import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart
 import 'package:jmap_dart_client/jmap/core/method/request/set_method.dart';
 import 'package:jmap_dart_client/jmap/core/request/request_invocation.dart';
 
-class FirebaseSubscriptionSetMethod extends SetMethodNoNeedAccountId<FirebaseSubscription> {
+class FirebaseRegistrationSetMethod extends SetMethodNoNeedAccountId<FirebaseRegistration> {
 
-  FirebaseSubscriptionSetMethod() : super();
+  FirebaseRegistrationSetMethod() : super();
 
   @override
   MethodName get methodName => MethodName('FirebaseRegistration/set');

fcm/lib/method/set/firebase_registration_set_response.dart

@@ -1,13 +1,13 @@
-import 'package:fcm/model/firebase_subscription.dart';
+import 'package:fcm/model/firebase_registration.dart';
 import 'package:jmap_dart_client/http/converter/id_converter.dart';
 import 'package:jmap_dart_client/jmap/core/error/set_error.dart';
 import 'package:jmap_dart_client/jmap/core/id.dart';
 import 'package:jmap_dart_client/jmap/core/method/response/set_response.dart';
 
-class FirebaseSubscriptionSetResponse extends SetResponseNoAccount<FirebaseSubscription> {
-  FirebaseSubscriptionSetResponse({
-    Map<Id, FirebaseSubscription>? created,
-    Map<Id, FirebaseSubscription?>? updated,
+class FirebaseRegistrationSetResponse extends SetResponseNoAccount<FirebaseRegistration> {
+  FirebaseRegistrationSetResponse({
+    Map<Id, FirebaseRegistration>? created,
+    Map<Id, FirebaseRegistration?>? updated,
     Set<Id>? destroyed,
     Map<Id, SetError>? notCreated,
     Map<Id, SetError>? notUpdated,
@@ -21,15 +21,15 @@ class FirebaseSubscriptionSetResponse extends SetResponseNoAccount<FirebaseSubsc
     notDestroyed: notDestroyed
   );
 
-  static FirebaseSubscriptionSetResponse deserialize(Map<String, dynamic> json) {
-    return FirebaseSubscriptionSetResponse(
+  static FirebaseRegistrationSetResponse deserialize(Map<String, dynamic> json) {
+    return FirebaseRegistrationSetResponse(
       created: (json['created'] as Map<String, dynamic>?)?.map((key, value) => MapEntry(
         const IdConverter().fromJson(key),
-        FirebaseSubscription.fromJson(value as Map<String, dynamic>)
+        FirebaseRegistration.fromJson(value as Map<String, dynamic>)
       )),
       updated: (json['updated'] as Map<String, dynamic>?)?.map((key, value) => MapEntry(
         const IdConverter().fromJson(key),
-        value != null ? FirebaseSubscription.fromJson(value as Map<String, dynamic>) : null
+        value != null ? FirebaseRegistration.fromJson(value as Map<String, dynamic>) : null
       )),
       destroyed: (json['destroyed'] as List<dynamic>?)?.map((id) => const IdConverter().fromJson(id)).toSet(),
       notCreated: (json['notCreated'] as Map<String, dynamic>?)?.map((key, value) => MapEntry(

fcm/lib/model/fcm_token.dart

@@ -1,11 +1,11 @@
 
 import 'package:equatable/equatable.dart';
 
-class FirebaseToken with EquatableMixin {
+class FcmToken with EquatableMixin {
 
   final String value;
 
-  FirebaseToken(this.value);
+  FcmToken(this.value);
 
   @override
   List<Object?> get props => [value];

fcm/lib/model/firebase_registration.dart

@@ -0,0 +1,45 @@
+
+import 'package:equatable/equatable.dart';
+import 'package:fcm/converter/device_client_id_nullable_converter.dart';
+import 'package:fcm/converter/firebase_registration_expired_time_nullable_converter.dart';
+import 'package:fcm/converter/firebase_registration_id_nullable_converter.dart';
+import 'package:fcm/converter/fcm_token_nullable_converter.dart';
+import 'package:fcm/converter/type_name_converter.dart';
+import 'package:fcm/model/device_client_id.dart';
+import 'package:fcm/model/firebase_registration_expired_time.dart';
+import 'package:fcm/model/firebase_registration_id.dart';
+import 'package:fcm/model/fcm_token.dart';
+import 'package:fcm/model/type_name.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'firebase_registration.g.dart';
+
+@DeviceClientIdNullableConverter()
+@FirebaseRegistrationIdNullableConverter()
+@FcmTokenNullableConverter()
+@FirebaseRegistrationExpiredTimeNullableConverter()
+@TypeNameConverter()
+@JsonSerializable(explicitToJson: true, includeIfNull: false)
+class FirebaseRegistration with EquatableMixin {
+
+  final FirebaseRegistrationId? id;
+  final FcmToken? token;
+  final DeviceClientId? deviceClientId;
+  final FirebaseRegistrationExpiredTime? expires;
+  final List<TypeName>? types;
+
+  FirebaseRegistration({
+    this.id,
+    this.token,
+    this.deviceClientId,
+    this.expires,
+    this.types
+  });
+
+  factory FirebaseRegistration.fromJson(Map<String, dynamic> json) => _$FirebaseRegistrationFromJson(json);
+
+  Map<String, dynamic> toJson() => _$FirebaseRegistrationToJson(this);
+
+  @override
+  List<Object?> get props => [id, token, deviceClientId, expires, types];
+}

fcm/lib/model/firebase_registration_expired_time.dart

@@ -2,11 +2,11 @@
 import 'package:equatable/equatable.dart';
 import 'package:jmap_dart_client/jmap/core/utc_date.dart';
 
-class FirebaseExpiredTime with EquatableMixin {
+class FirebaseRegistrationExpiredTime with EquatableMixin {
 
   final UTCDate value;
 
-  FirebaseExpiredTime(this.value);
+  FirebaseRegistrationExpiredTime(this.value);
 
   @override
   List<Object?> get props => [value];

fcm/lib/model/firebase_registration_id.dart

@@ -2,11 +2,11 @@
 import 'package:equatable/equatable.dart';
 import 'package:jmap_dart_client/jmap/core/id.dart';
 
-class FirebaseSubscriptionId with EquatableMixin {
+class FirebaseRegistrationId with EquatableMixin {
 
   final Id id;
 
-  FirebaseSubscriptionId(this.id);
+  FirebaseRegistrationId(this.id);
 
   @override
   List<Object?> get props => [id];

fcm/lib/model/firebase_subscription.dart

@@ -1,45 +0,0 @@
-
-import 'package:equatable/equatable.dart';
-import 'package:fcm/converter/device_client_id_nullable_converter.dart';
-import 'package:fcm/converter/firebase_expired_time_nullable_converter.dart';
-import 'package:fcm/converter/firebase_subscription_id_nullable_converter.dart';
-import 'package:fcm/converter/firebase_token_nullable_converter.dart';
-import 'package:fcm/converter/type_name_converter.dart';
-import 'package:fcm/model/device_client_id.dart';
-import 'package:fcm/model/firebase_expired_time.dart';
-import 'package:fcm/model/firebase_subscription_id.dart';
-import 'package:fcm/model/firebase_token.dart';
-import 'package:fcm/model/type_name.dart';
-import 'package:json_annotation/json_annotation.dart';
-
-part 'firebase_subscription.g.dart';
-
-@DeviceClientIdNullableConverter()
-@FirebaseSubscriptionIdNullableConverter()
-@FirebaseTokenNullableConverter()
-@FirebaseExpiredTimeNullableConverter()
-@TypeNameConverter()
-@JsonSerializable(explicitToJson: true, includeIfNull: false)
-class FirebaseSubscription with EquatableMixin {
-
-  final FirebaseSubscriptionId? id;
-  final FirebaseToken? token;
-  final DeviceClientId? deviceClientId;
-  final FirebaseExpiredTime? expires;
-  final List<TypeName>? types;
-
-  FirebaseSubscription({
-    this.id,
-    this.token,
-    this.deviceClientId,
-    this.expires,
-    this.types
-  });
-
-  factory FirebaseSubscription.fromJson(Map<String, dynamic> json) => _$FirebaseSubscriptionFromJson(json);
-
-  Map<String, dynamic> toJson() => _$FirebaseSubscriptionToJson(this);
-
-  @override
-  List<Object?> get props => [id, token, deviceClientId, expires, types];
-}

fcm/test/method/firebase_registration_get_method_test.dart

@@ -1,10 +1,10 @@
 import 'package:dio/dio.dart';
-import 'package:fcm/method/get/firebase_subscription_get_method.dart';
-import 'package:fcm/method/get/firebase_subscription_get_response.dart';
+import 'package:fcm/method/get/firebase_registration_get_method.dart';
+import 'package:fcm/method/get/firebase_registration_get_response.dart';
 import 'package:fcm/model/device_client_id.dart';
-import 'package:fcm/model/firebase_expired_time.dart';
-import 'package:fcm/model/firebase_subscription.dart';
-import 'package:fcm/model/firebase_subscription_id.dart';
+import 'package:fcm/model/firebase_registration_expired_time.dart';
+import 'package:fcm/model/firebase_registration.dart';
+import 'package:fcm/model/firebase_registration_id.dart';
 import 'package:fcm/model/type_name.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http_mock_adapter/http_mock_adapter.dart';
@@ -14,22 +14,22 @@ import 'package:jmap_dart_client/jmap/core/utc_date.dart';
 import 'package:jmap_dart_client/jmap/jmap_request.dart';
 
 void main() {
-  group('test to json firebase subscription get method', () {
-    final expectFirebaseSubscription1 = FirebaseSubscription(
-      id: FirebaseSubscriptionId(Id('e50b2c1d-9553-41a3-b0a7-a7d26b599ee1')),
+  group('test to json firebase registration get method', () {
+    final expectFirebaseRegistration1 = FirebaseRegistration(
+      id: FirebaseRegistrationId(Id('e50b2c1d-9553-41a3-b0a7-a7d26b599ee1')),
       deviceClientId: DeviceClientId('b37ff8001ca0'),
-      expires: FirebaseExpiredTime(UTCDate(DateTime.parse('2018-07-31T00:13:21Z'))),
+      expires: FirebaseRegistrationExpiredTime(UTCDate(DateTime.parse('2018-07-31T00:13:21Z'))),
       types: [TypeName.mailboxType],
     );
 
-    final expectFirebaseSubscription2 = FirebaseSubscription(
-      id: FirebaseSubscriptionId(Id('f2d0aab5-e976-4e8b-ad4b-b380a5b987e4')),
+    final expectFirebaseRegistration2 = FirebaseRegistration(
+      id: FirebaseRegistrationId(Id('f2d0aab5-e976-4e8b-ad4b-b380a5b987e4')),
       deviceClientId: DeviceClientId('X8980fc'),
-      expires: FirebaseExpiredTime(UTCDate(DateTime.parse('2018-07-12T05:55:00Z'))),
+      expires: FirebaseRegistrationExpiredTime(UTCDate(DateTime.parse('2018-07-12T05:55:00Z'))),
       types: [TypeName.mailboxType, TypeName.emailType, TypeName.emailDelivery],
     );
 
-    test('firebase subscription get method and response parsing', () async {
+    test('firebase registration get method and response parsing', () async {
       final baseOption = BaseOptions(method: 'POST');
       final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com/jmap';
       final dioAdapter = DioAdapter(dio: dio);
@@ -84,20 +84,20 @@ void main() {
       final processingInvocation = ProcessingInvocation();
       final requestBuilder = JmapRequestBuilder(httpClient, processingInvocation);
 
-      final firebaseSubscriptionGetMethod = FirebaseSubscriptionGetMethod();
-      final firebaseSubscriptionGetInvocation = requestBuilder.invocation(firebaseSubscriptionGetMethod);
+      final firebaseRegistrationGetMethod = FirebaseRegistrationGetMethod();
+      final firebaseRegistrationGetInvocation = requestBuilder.invocation(firebaseRegistrationGetMethod);
       final response = await (requestBuilder
-          ..usings(firebaseSubscriptionGetMethod.requiredCapabilities))
+          ..usings(firebaseRegistrationGetMethod.requiredCapabilities))
         .build()
         .execute();
 
-      final resultList = response.parse<FirebaseSubscriptionGetResponse>(
-        firebaseSubscriptionGetInvocation.methodCallId,
-        FirebaseSubscriptionGetResponse.deserialize
+      final resultList = response.parse<FirebaseRegistrationGetResponse>(
+        firebaseRegistrationGetInvocation.methodCallId,
+        FirebaseRegistrationGetResponse.deserialize
       );
 
       expect(resultList?.list.length, equals(2));
-      expect(resultList?.list, containsAll([expectFirebaseSubscription1, expectFirebaseSubscription2]));
+      expect(resultList?.list, containsAll([expectFirebaseRegistration1, expectFirebaseRegistration2]));
     });
   });
 }

fcm/test/method/firebase_registration_set_method_test.dart

@@ -1,11 +1,11 @@
 import 'package:dio/dio.dart';
-import 'package:fcm/method/set/firebase_subscription_set_method.dart';
-import 'package:fcm/method/set/firebase_subscription_set_response.dart';
+import 'package:fcm/method/set/firebase_registration_set_method.dart';
+import 'package:fcm/method/set/firebase_registration_set_response.dart';
 import 'package:fcm/model/device_client_id.dart';
-import 'package:fcm/model/firebase_expired_time.dart';
-import 'package:fcm/model/firebase_subscription.dart';
-import 'package:fcm/model/firebase_subscription_id.dart';
-import 'package:fcm/model/firebase_token.dart';
+import 'package:fcm/model/firebase_registration_expired_time.dart';
+import 'package:fcm/model/firebase_registration.dart';
+import 'package:fcm/model/firebase_registration_id.dart';
+import 'package:fcm/model/fcm_token.dart';
 import 'package:fcm/model/type_name.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http_mock_adapter/http_mock_adapter.dart';
@@ -15,13 +15,13 @@ import 'package:jmap_dart_client/jmap/core/utc_date.dart';
 import 'package:jmap_dart_client/jmap/jmap_request.dart';
 
 void main() {
-  group('test to json firebase subscription set method', () {
-    final expectedFirebaseSubscriptionCreated = FirebaseSubscription(
-      id: FirebaseSubscriptionId(Id('175dbd70-93d1-11ec-984e-e3f8b83572b4')),
-      expires: FirebaseExpiredTime(UTCDate(DateTime.parse('2022-03-31T02:14:29Z'))),
+  group('test to json firebase registration set method', () {
+    final expectedFirebaseRegistrationCreated = FirebaseRegistration(
+      id: FirebaseRegistrationId(Id('175dbd70-93d1-11ec-984e-e3f8b83572b4')),
+      expires: FirebaseRegistrationExpiredTime(UTCDate(DateTime.parse('2022-03-31T02:14:29Z'))),
     );
 
-    test('firebase subscription set method and response parsing', () async {
+    test('firebase registration set method and response parsing', () async {
       final baseOption  = BaseOptions(method: 'POST');
       final dio = Dio(baseOption)
         ..options.baseUrl = 'http://domain.com/jmap';
@@ -75,31 +75,31 @@ void main() {
 
       final createRequestId = Id('dab246');
 
-      final firebaseSubscriptionSetMethod = FirebaseSubscriptionSetMethod()
+      final firebaseRegistrationSetMethod = FirebaseRegistrationSetMethod()
         ..addCreate(
           createRequestId,
-          FirebaseSubscription(
+          FirebaseRegistration(
             deviceClientId: DeviceClientId('a123-b123-c123'),
-            token: FirebaseToken('token1'),
+            token: FcmToken('token1'),
             types: [TypeName.mailboxType]
           )
         );
 
       final httpClient = HttpClient(dio);
       final requestBuilder = JmapRequestBuilder(httpClient, ProcessingInvocation());
-      final firebaseSubscriptionSetInvocation = requestBuilder.invocation(firebaseSubscriptionSetMethod);
+      final firebaseRegistrationSetInvocation = requestBuilder.invocation(firebaseRegistrationSetMethod);
       final response = await (requestBuilder
-          ..usings(firebaseSubscriptionSetMethod.requiredCapabilities))
+          ..usings(firebaseRegistrationSetMethod.requiredCapabilities))
         .build()
         .execute();
 
-      final firebaseSubscriptionSetResponse = response.parse<FirebaseSubscriptionSetResponse>(
-        firebaseSubscriptionSetInvocation.methodCallId,
-        FirebaseSubscriptionSetResponse.deserialize);
+      final firebaseRegistrationSetResponse = response.parse<FirebaseRegistrationSetResponse>(
+        firebaseRegistrationSetInvocation.methodCallId,
+        FirebaseRegistrationSetResponse.deserialize);
 
       expect(
-        firebaseSubscriptionSetResponse!.created![createRequestId]!.id,
-        equals(expectedFirebaseSubscriptionCreated.id)
+        firebaseRegistrationSetResponse!.created![createRequestId]!.id,
+        equals(expectedFirebaseRegistrationCreated.id)
       );
     });
   });