TF-2298 Update expires time when old token has expired

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

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(