TF-1360 Fix can not add data to stream controller when re-login

lib/features/push_notification/presentation/config/fcm_configuration.dart

@@ -1,20 +1,21 @@
 
-import 'package:core/utils/build_utils.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/config/firebase_options.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_receiver.dart';
+import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_service.dart';
 
 class FcmConfiguration {
 
   static void initialize() async {
     await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
+    await FcmService.instance.recreateStreamController();
     _initMessageListener();
   }
 
   static void _initMessageListener() {
     FcmReceiver.instance.onForegroundMessage();
     FcmReceiver.instance.onBackgroundMessage();
-    BuildUtils.isWeb ? FcmReceiver.instance.getFcmToken() : null;
+    FcmReceiver.instance.getFcmToken();
     FcmReceiver.instance.onRefreshFcmToken();
   }
 }

lib/features/push_notification/presentation/controller/fcm_controller.dart

@@ -47,7 +47,7 @@ class FcmController extends BaseController {
   GetSessionInteractor? _getSessionInteractor;
 
   FcmController._internal() {
-    _listenFcmMessageStream();
+    _listenFcmStream();
   }
 
   static final FcmController _instance = FcmController._internal();
@@ -59,17 +59,33 @@ class FcmController extends BaseController {
     FcmTokenHandler.instance.initialize();
   }
 
-  void _listenFcmMessageStream() {
-    log('FcmController::_listenFcmMessageStream():');
+  void _listenFcmStream() async {
+    await Future.wait([
+      listenForegroundMessageStream(),
+      listenBackgroundMessageStream(),
+      listenTokenStream()
+    ]);
+  }
+
+  Future<void> listenForegroundMessageStream() {
     FcmService.instance.foregroundMessageStream
       .throttleTime(const Duration(milliseconds: FcmService.durationMessageComing))
       .listen(_handleForegroundMessageAction);
+    return Future.value();
+  }
 
+  Future<void> listenBackgroundMessageStream() {
     FcmService.instance.backgroundMessageStream
       .throttleTime(const Duration(milliseconds: FcmService.durationMessageComing))
       .listen(_handleBackgroundMessageAction);
+    return Future.value();
+  }
 
-    FcmService.instance.fcmTokenStream.listen(FcmTokenHandler.instance.handle);
+  Future<void> listenTokenStream() {
+    FcmService.instance.fcmTokenStream
+      .debounceTime(const Duration(milliseconds: FcmService.durationRefreshToken))
+      .listen(FcmTokenHandler.instance.handleTokenAction);
+    return Future.value();
   }
 
   void _handleForegroundMessageAction(RemoteMessage newRemoteMessage) {
@@ -253,13 +269,6 @@ class FcmController extends BaseController {
     _remoteMessageBackground = null;
   }
 
-  @override
-  void dispose() {
-    _clearRemoteMessageBackground();
-    FcmService.instance.dispose();
-    super.dispose();
-  }
-
   @override
   void onData(Either<Failure, Success> newState) {
     super.onData(newState);

lib/features/push_notification/presentation/controller/fcm_token_handler.dart

@@ -54,14 +54,14 @@ class FcmTokenHandler {
     }
   }
 
-  void handle(String? token) {
-    log('FcmTokenHandler::handle():token: $token');
+  void handleTokenAction(String? token) {
+    log('FcmTokenHandler::handleTokenAction():token: $token');
     if (token != null) {
       _fcmToken = FirebaseToken(token);
       final deviceId = FcmUtils.instance.hashTokenToDeviceId(token);
       _deviceClientId = DeviceClientId(deviceId);
-      log('FcmTokenHandler::handle(): fcmToken: $_fcmToken');
-      log('FcmTokenHandler::handle(): deviceId: $deviceId');
+      log('FcmTokenHandler::handleTokenAction(): fcmToken: $_fcmToken');
+      log('FcmTokenHandler::handleTokenAction(): deviceId: $deviceId');
       _getFcmTokenFromBackend(deviceId);
     } else {
       _getFCMSubscriptionLocalAction();
@@ -171,7 +171,7 @@ class FcmTokenHandler {
       deviceClientId: deviceClientId,
       types: [TypeName.emailType, TypeName.mailboxType, TypeName.emailDelivery]
     );
-    log('FcmTokenHandler::_handleSuccessViewState():firebaseSubscription: $firebaseSubscription');
+    log('FcmTokenHandler::_handleRegisterNewToken():firebaseSubscription: $firebaseSubscription');
     _invokeRegisterNewTokenAction(RegisterNewTokenRequest(
       generateCreationId,
       firebaseSubscription

lib/features/push_notification/presentation/listener/email_change_listener.dart

@@ -9,7 +9,7 @@ import 'package:model/email/presentation_email.dart';
 import 'package:tmail_ui_user/features/base/action/ui_action.dart';
 import 'package:tmail_ui_user/features/email/domain/state/get_stored_state_email_state.dart';
 import 'package:tmail_ui_user/features/email/domain/usecases/get_stored_email_state_interactor.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
+import 'package:tmail_ui_user/features/email/presentation/action/email_ui_action.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
 import 'package:tmail_ui_user/features/push_notification/domain/exceptions/fcm_exception.dart';
 import 'package:tmail_ui_user/features/push_notification/domain/state/get_email_changes_state.dart';
@@ -70,7 +70,7 @@ class EmailChangeListener extends ChangeListener {
   void _synchronizeEmailOnForegroundAction(jmap.State newState) {
     log('EmailChangeListener::_synchronizeEmailAction():newState: $newState');
     if (_dashBoardController != null) {
-      _dashBoardController!.dispatchAction(RefreshChangeEmailAction(newState));
+      _dashBoardController!.dispatchEmailUIAction(RefreshChangeEmailAction(newState));
     }
   }
 

lib/features/push_notification/presentation/listener/mailbox_change_listener.dart

@@ -4,7 +4,7 @@ import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:tmail_ui_user/features/base/action/ui_action.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
+import 'package:tmail_ui_user/features/mailbox/presentation/action/mailbox_ui_action.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
 import 'package:tmail_ui_user/features/push_notification/domain/usecases/store_mailbox_state_to_refresh_interactor.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/action/fcm_action.dart';
@@ -54,7 +54,7 @@ class MailboxChangeListener extends ChangeListener {
   void _synchronizeMailboxOnForegroundAction(jmap.State newState) {
     log('MailboxChangeListener::_synchronizeMailboxOnForegroundAction():newState: $newState');
     if (_dashBoardController != null) {
-      _dashBoardController!.dispatchAction(RefreshChangeMailboxAction(newState));
+      _dashBoardController!.dispatchMailboxUIAction(RefreshChangeMailboxAction(newState));
     }
   }
 

lib/features/push_notification/presentation/notification/local_notification_manager.dart

@@ -11,7 +11,11 @@ import 'package:tmail_ui_user/features/push_notification/presentation/notificati
 
 class LocalNotificationManager {
 
-  LocalNotificationManager._internal();
+  late StreamController<NotificationResponse> localNotificationsController;
+
+  LocalNotificationManager._internal() {
+    localNotificationsController = StreamController<NotificationResponse>.broadcast();
+  }
 
   static final LocalNotificationManager _instance = LocalNotificationManager._internal();
 
@@ -22,8 +26,6 @@ class LocalNotificationManager {
   bool _notificationsEnabled = false;
   bool _isNotificationClickedOnTerminate = false;
 
-  final StreamController<NotificationResponse> localNotificationsController = StreamController<NotificationResponse>.broadcast();
-
   Stream<NotificationResponse> get localNotificationStream => localNotificationsController.stream;
 
   NotificationAppLaunchDetails? _notificationAppLaunchDetails;
@@ -69,7 +71,9 @@ class LocalNotificationManager {
   void _handleReceiveNotificationResponse(NotificationResponse response) {
     log('LocalNotificationManager::handleReceiveNotificationResponse():payload: ${response.payload}');
     if (response.notificationResponseType == NotificationResponseType.selectedNotification) {
-      localNotificationsController.add(response);
+      if (!localNotificationsController.isClosed) {
+        localNotificationsController.add(response);
+      }
     }
   }
 
@@ -171,11 +175,14 @@ class LocalNotificationManager {
     }
   }
 
-  void _closeStream() {
-    localNotificationsController.close();
+  Future<void> recreateStreamController() {
+    if (localNotificationsController.isClosed) {
+      localNotificationsController = StreamController<NotificationResponse>.broadcast();
+    }
+    return Future.value();
   }
 
-  void dispose() {
-    _closeStream();
+  void closeStream() {
+    localNotificationsController.close();
   }
 }

lib/features/push_notification/presentation/services/fcm_receiver.dart

@@ -1,14 +1,12 @@
 
 import 'package:core/utils/app_logger.dart';
+import 'package:core/utils/build_utils.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:tmail_ui_user/features/push_notification/domain/exceptions/fcm_exception.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_service.dart';
+import 'package:tmail_ui_user/main/utils/app_utils.dart';
 
 @pragma('vm:entry-point')
 Future<void> handleFirebaseBackgroundMessage(RemoteMessage message) async {
-  log('FcmReceiver::handleFirebaseBackgroundMessage():messageId: ${message.messageId}');
   log('FcmReceiver::handleFirebaseBackgroundMessage(): ${message.data}');
   FcmService.instance.handleFirebaseBackgroundMessage(message);
 }
@@ -30,12 +28,13 @@ class FcmReceiver {
 
   void getFcmToken() async {
     try {
-      final token = await FirebaseMessaging.instance.getToken(vapidKey: kIsWeb ? dotenv.get('FIREBASE_WEB_VAPID_PUBLIC_KEY', fallback: '') : null);
-      log('FcmReceiver::onFcmToken():token: $token');
-      FcmService.instance.handleRefreshToken(token);
+      final currentToken = await FirebaseMessaging.instance.getToken(vapidKey: AppUtils.fcmVapidPublicKey);
+      log('FcmReceiver::onFcmToken():currentToken: $currentToken');
+      if (BuildUtils.isWeb) {
+        FcmService.instance.handleGetToken(currentToken);
+      }
     } catch(e) {
       log('FcmReceiver::onFcmToken():exception: $e');
-      throw NotLoadedFCMTokenException();
     }
   }
 

lib/features/push_notification/presentation/services/fcm_service.dart

@@ -8,44 +8,84 @@ import 'package:tmail_ui_user/features/push_notification/presentation/controller
 class FcmService {
 
   static const int durationMessageComing = 2000;
+  static const int durationRefreshToken = 2000;
 
-  final StreamController<RemoteMessage> foregroundMessageStreamController = StreamController<RemoteMessage>.broadcast();
+  late StreamController<RemoteMessage> foregroundMessageStreamController;
   Stream<RemoteMessage> get foregroundMessageStream => foregroundMessageStreamController.stream;
 
-  final StreamController<RemoteMessage> backgroundMessageStreamController = StreamController<RemoteMessage>.broadcast();
+  late StreamController<RemoteMessage> backgroundMessageStreamController;
   Stream<RemoteMessage> get backgroundMessageStream => backgroundMessageStreamController.stream;
 
-  final StreamController<String?> fcmTokenStreamController = StreamController<String?>.broadcast();
+  late StreamController<String?> fcmTokenStreamController;
   Stream<String?> get fcmTokenStream => fcmTokenStreamController.stream;
 
-  FcmService._internal();
+  FcmService._internal() {
+    foregroundMessageStreamController = StreamController<RemoteMessage>.broadcast();
+    backgroundMessageStreamController = StreamController<RemoteMessage>.broadcast();
+    fcmTokenStreamController = StreamController<String?>.broadcast();
+  }
 
   static final FcmService _instance = FcmService._internal();
 
   static FcmService get instance => _instance;
 
   void handleFirebaseForegroundMessage(RemoteMessage newRemoteMessage) {
-    log('FcmService::handleFirebaseForegroundMessage():messageId: ${newRemoteMessage.messageId}');
     log('FcmService::handleFirebaseForegroundMessage():message: ${newRemoteMessage.data}');
-    foregroundMessageStreamController.add(newRemoteMessage);
+    if (!foregroundMessageStreamController.isClosed) {
+      foregroundMessageStreamController.add(newRemoteMessage);
+    }
   }
 
   void handleFirebaseBackgroundMessage(RemoteMessage newRemoteMessage) {
     FcmController.instance.initialize();
-    backgroundMessageStreamController.add(newRemoteMessage);
+    if (!backgroundMessageStreamController.isClosed) {
+      backgroundMessageStreamController.add(newRemoteMessage);
+    }
   }
 
-  void handleRefreshToken(String? newToken) {
-    fcmTokenStreamController.add(newToken);
+  void handleGetToken(String? currentToken) async {
+    log('FcmService::handleGetToken():currentToken: $currentToken');
+    if (fcmTokenStreamController.isClosed) {
+      log('FcmService::handleGetToken():fcmTokenStreamController: isClosed');
+      fcmTokenStreamController = StreamController<String?>.broadcast();
+      await FcmController.instance.listenTokenStream();
+    }
+    if (!fcmTokenStreamController.isClosed) {
+      fcmTokenStreamController.add(currentToken);
+    }
   }
 
-  void _closeStream() {
+  void handleRefreshToken(String? newToken) async {
+    log('FcmService::handleRefreshToken():newToken: $newToken');
+    if (fcmTokenStreamController.isClosed) {
+      log('FcmService::handleRefreshToken():fcmTokenStreamController: isClosed');
+      fcmTokenStreamController = StreamController<String?>.broadcast();
+      await FcmController.instance.listenTokenStream();
+    }
+    if (!fcmTokenStreamController.isClosed) {
+      fcmTokenStreamController.add(newToken);
+    }
+  }
+
+  Future<void> recreateStreamController() async {
+    if (foregroundMessageStreamController.isClosed) {
+      foregroundMessageStreamController = StreamController<RemoteMessage>.broadcast();
+      await FcmController.instance.listenForegroundMessageStream();
+    }
+    if (backgroundMessageStreamController.isClosed) {
+      backgroundMessageStreamController = StreamController<RemoteMessage>.broadcast();
+      await FcmController.instance.listenBackgroundMessageStream();
+    }
+    if (fcmTokenStreamController.isClosed) {
+      fcmTokenStreamController = StreamController<String?>.broadcast();
+      await FcmController.instance.listenTokenStream();
+    }
+    return Future.value();
+  }
+
+  void closeStream() {
     foregroundMessageStreamController.close();
     backgroundMessageStreamController.close();
     fcmTokenStreamController.close();
   }
-
-  void dispose() {
-    _closeStream();
-  }
 }