fixup! TF-3157 Remove unnecessary background service worker

linagora · Nov 5, 2024 · 89b6fc4 · 89b6fc4
1 parent e197413
commit 89b6fc4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 50 deletions.
diff --git a/core/lib/data/constants/constant.dart b/core/lib/data/constants/constant.dart
@@ -7,5 +7,4 @@ class Constant {
   static const octetStreamMimeType = 'application/octet-stream';
   static const pdfExtension = '.pdf';
   static const imageType = 'image';
-  static const wsServiceWorkerBroadcastChannel = 'background-message';
 }
diff --git a/lib/features/push_notification/presentation/services/fcm_receiver.dart b/lib/features/push_notification/presentation/services/fcm_receiver.dart
@@ -1,11 +1,7 @@
 import 'package:core/utils/app_logger.dart';
-import 'package:core/utils/broadcast_channel/broadcast_channel.dart';
-import 'package:core/utils/platform_info.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/controller/fcm_message_controller.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_service.dart';
-import 'package:tmail_ui_user/main/utils/app_config.dart';
-import 'package:universal_html/html.dart' as html show MessageEvent, DomException;
 
 @pragma('vm:entry-point')
 Future<void> handleFirebaseBackgroundMessage(RemoteMessage message) async {
@@ -23,32 +19,11 @@ class FcmReceiver {
 
   static const int MAX_COUNT_RETRY_TO_GET_FCM_TOKEN = 3;
 
-  int _countRetryToGetFcmToken = 0;
-
   Future onInitialFcmListener() async {
-    _countRetryToGetFcmToken = 0;
     _onForegroundMessage();
     _onBackgroundMessage();
 
-    if (PlatformInfo.isWeb) {
-      _onMessageBroadcastChannel();
-      await _requestNotificationPermissionOnWeb();
-    } else {
-      await _onHandleFcmToken();
-    }
-  }
-
-  Future<void> _requestNotificationPermissionOnWeb() async {
-    NotificationSettings notificationSetting = await FirebaseMessaging.instance.getNotificationSettings();
-    log('FcmReceiver::_requestNotificationPermissionOnWeb: authorizationStatus = ${notificationSetting.authorizationStatus}');
-    if (notificationSetting.authorizationStatus != AuthorizationStatus.authorized) {
-      notificationSetting = await FirebaseMessaging.instance.requestPermission();
-      if (notificationSetting.authorizationStatus == AuthorizationStatus.authorized) {
-        await _onHandleFcmToken();
-      }
-    } else {
-      await _onHandleFcmToken();
-    }
+    await _onHandleFcmToken();
   }
 
   void _onForegroundMessage() {
@@ -59,38 +34,17 @@ class FcmReceiver {
     FirebaseMessaging.onBackgroundMessage(handleFirebaseBackgroundMessage);
   }
 
-  void _onMessageBroadcastChannel() {
-    final broadcast = BroadcastChannel('background-message');
-    broadcast.onMessage.listen((event) {
-      if (event is html.MessageEvent) {
-        FcmService.instance.handleMessageEventBroadcastChannel(event);
-      }
-    });
-  }
-
   Future<String?> _getInitialToken() async {
     try {
-      final vapidKey = PlatformInfo.isWeb ? AppConfig.fcmVapidPublicKeyWeb : null;
-      final token = await FirebaseMessaging.instance.getToken(vapidKey: vapidKey);
+      final token = await FirebaseMessaging.instance.getToken(vapidKey: null);
       log('FcmReceiver::_getInitialToken:token: $token');
       return token;
     } catch (e) {
       logError('FcmReceiver::_getInitialToken: TYPE = ${e.runtimeType} | Exception = $e');
-      if (PlatformInfo.isWeb
-          && e is html.DomException
-          && _countRetryToGetFcmToken < MAX_COUNT_RETRY_TO_GET_FCM_TOKEN) {
-        return await _retryGetToken();
-      }
       return null;
     }
   }
 
-  Future<String?> _retryGetToken() async {
-    _countRetryToGetFcmToken++;
-    log('FcmReceiver::_retryGetToken: CountRetry = $_countRetryToGetFcmToken');
-    return await _getInitialToken();
-  }
-
   Future _onHandleFcmToken() async {
     final token = await _getInitialToken();
     FcmService.instance.handleToken(token);

diff --git a/lib/main/utils/app_config.dart b/lib/main/utils/app_config.dart
@@ -36,7 +36,6 @@ class AppConfig {
       return supportedOtherPlatform == 'supported';
     }
   }
-  static String get fcmVapidPublicKeyWeb => dotenv.get('FIREBASE_WEB_VAPID_PUBLIC_KEY', fallback: '');
   static List<String> get oidcScopes {
     try {
       final envScopes = dotenv.get('OIDC_SCOPES', fallback: '');