TF-2298 Update expires time when old token has expired

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

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];
-}