TF-1604: Add method check and get capability is support TeamMailboxes

(cherry picked from commit 078e1ce36fc9c5f1c2d854667d1da52b44fea199)

lib/features/base/base_controller.dart

@@ -232,7 +232,7 @@ abstract class BaseController extends GetxController
           await LocalNotificationManager.instance.setUp();
         }
         FcmInteractorBindings().dependencies();
-        FcmController.instance.initialize(session: session,accountId: accountId);
+        FcmController.instance.initialize(session: session, accountId: accountId);
       } else {
         throw NotSupportFCMException();
       }

lib/features/email/data/network/email_api.dart

@@ -67,23 +67,6 @@ class EmailAPI with HandleSetErrorMixin {
 
   EmailAPI(this._httpClient, this._downloadManager, this._dioClient, this._uuid);
 
-  Set<CapabilityIdentifier> _capabilitiesForEmailMethod(Session session, AccountId accountId) {
-    final getMailboxCreated = GetEmailMethod(accountId);
-    try {
-      requireCapability(
-          session,
-          accountId,
-          [CapabilityIdentifier.jmapTeamMailboxes]);
-      return {
-        CapabilityIdentifier.jmapCore,
-        CapabilityIdentifier.jmapMail,
-        CapabilityIdentifier.jmapTeamMailboxes
-      };
-    } catch (_) {
-      return getMailboxCreated.requiredCapabilities;
-    }
-  }
-
   Future<Email> getEmailContent(Session session, AccountId accountId, EmailId emailId) async {
     final processingInvocation = ProcessingInvocation();
 
@@ -103,8 +86,14 @@ class EmailAPI with HandleSetErrorMixin {
 
     final getEmailInvocation = jmapRequestBuilder.invocation(getEmailMethod);
 
+    final capabilitiesSupportTeamMailboxes = getEmailMethod.requiredCapabilities.add(CapabilityIdentifier.jmapTeamMailboxes) as Set<CapabilityIdentifier>;
+
+    final capabilities = [CapabilityIdentifier.jmapTeamMailboxes].isSupportTeamMailboxes(session, accountId)
+      ? capabilitiesSupportTeamMailboxes
+      : getEmailMethod.requiredCapabilities;
+
     final result = await (jmapRequestBuilder
-        ..usings(_capabilitiesForEmailMethod(session, accountId)))
+        ..usings(capabilities))
       .build()
       .execute();
 

lib/features/mailbox/data/network/mailbox_api.dart

@@ -52,7 +52,9 @@ class MailboxAPI with HandleSetErrorMixin {
 
     final queryInvocation = jmapRequestBuilder.invocation(getMailboxCreated);
 
-    final capabilities = _capabilitiesForMailboxMethod(session, accountId);
+    final capabilities = [CapabilityIdentifier.jmapTeamMailboxes].isSupportTeamMailboxes(session, accountId)
+      ? getMailboxCreated.requiredCapabilitiesSupportTeamMailboxes
+      : getMailboxCreated.requiredCapabilities;
 
     final result = await (jmapRequestBuilder
         ..usings(capabilities))
@@ -66,19 +68,6 @@ class MailboxAPI with HandleSetErrorMixin {
     return MailboxResponse(mailboxes: resultCreated?.list, state: resultCreated?.state);
   }
 
-  Set<CapabilityIdentifier> _capabilitiesForMailboxMethod(Session session, AccountId accountId) {
-    final getMailboxCreated = GetMailboxMethod(accountId);
-    try {
-     requireCapability(
-        session,
-        accountId,
-        [CapabilityIdentifier.jmapTeamMailboxes]);
-      return getMailboxCreated.requiredCapabilitiesSupportTeamMailboxes;
-    } catch (_) {
-      return getMailboxCreated.requiredCapabilities;
-    }
-  }
-
   Future<MailboxChangeResponse> getChanges(Session session, AccountId accountId, State sinceState) async {
     final processingInvocation = ProcessingInvocation();
 
@@ -104,7 +93,9 @@ class MailboxAPI with HandleSetErrorMixin {
     final getMailboxUpdatedInvocation = jmapRequestBuilder.invocation(getMailboxUpdated);
     final getMailboxCreatedInvocation = jmapRequestBuilder.invocation(getMailboxCreated);
 
-    final capabilities = _capabilitiesForMailboxMethod(session, accountId);
+    final capabilities = [CapabilityIdentifier.jmapTeamMailboxes].isSupportTeamMailboxes(session, accountId)
+      ? getMailboxUpdated.requiredCapabilitiesSupportTeamMailboxes
+      : getMailboxUpdated.requiredCapabilities;
 
     final result = await (jmapRequestBuilder
         ..usings(capabilities))
@@ -150,8 +141,12 @@ class MailboxAPI with HandleSetErrorMixin {
 
     final setMailboxInvocation = requestBuilder.invocation(setMailboxMethod);
 
+    final capabilities = [CapabilityIdentifier.jmapTeamMailboxes].isSupportTeamMailboxes(session, accountId)
+      ? setMailboxMethod.requiredCapabilities.add(CapabilityIdentifier.jmapTeamMailboxes) as Set<CapabilityIdentifier>
+      : setMailboxMethod.requiredCapabilities;
+
     final response = await (requestBuilder
-          ..usings(_capabilitiesForMailboxMethod(session, accountId)))
+          ..usings(capabilities))
         .build()
         .execute();
 
@@ -217,8 +212,12 @@ class MailboxAPI with HandleSetErrorMixin {
         .map(requestBuilder.invocation)
         .toList();
 
+      final capabilities = [CapabilityIdentifier.jmapTeamMailboxes].isSupportTeamMailboxes(session, accountId)
+        ? {CapabilityIdentifier.jmapCore, CapabilityIdentifier.jmapMail, CapabilityIdentifier.jmapTeamMailboxes}
+        : {CapabilityIdentifier.jmapCore, CapabilityIdentifier.jmapMail};
+
       final response = await (requestBuilder
-          ..usings(_capabilitiesForMailboxMethod(session, accountId)))
+          ..usings(capabilities))
         .build()
         .execute();
 
@@ -259,8 +258,12 @@ class MailboxAPI with HandleSetErrorMixin {
 
     final setMailboxInvocation = requestBuilder.invocation(setMailboxMethod);
 
+    final capabilities = [CapabilityIdentifier.jmapTeamMailboxes].isSupportTeamMailboxes(session, accountId)
+      ? setMailboxMethod.requiredCapabilities.add(CapabilityIdentifier.jmapTeamMailboxes) as Set<CapabilityIdentifier>
+      : setMailboxMethod.requiredCapabilities;
+
     final response = await (requestBuilder
-          ..usings(_capabilitiesForMailboxMethod(session, accountId)))
+          ..usings(capabilities))
         .build()
         .execute();
 
@@ -287,8 +290,12 @@ class MailboxAPI with HandleSetErrorMixin {
 
     final setMailboxInvocation = requestBuilder.invocation(setMailboxMethod);
 
+    final capabilities = [CapabilityIdentifier.jmapTeamMailboxes].isSupportTeamMailboxes(session, accountId)
+      ? setMailboxMethod.requiredCapabilities.add(CapabilityIdentifier.jmapTeamMailboxes) as Set<CapabilityIdentifier>
+      : setMailboxMethod.requiredCapabilities;
+
     final response = await (requestBuilder
-        ..usings(_capabilitiesForMailboxMethod(session, accountId)))
+        ..usings(capabilities))
       .build()
       .execute();
 
@@ -315,8 +322,12 @@ class MailboxAPI with HandleSetErrorMixin {
 
     final setMailboxInvocation = requestBuilder.invocation(setMailboxMethod);
 
+    final capabilities = [CapabilityIdentifier.jmapTeamMailboxes].isSupportTeamMailboxes(session, accountId)
+      ? setMailboxMethod.requiredCapabilities.add(CapabilityIdentifier.jmapTeamMailboxes) as Set<CapabilityIdentifier>
+      : setMailboxMethod.requiredCapabilities;
+
     final response = await (requestBuilder
-        ..usings(_capabilitiesForMailboxMethod(session, accountId)))
+        ..usings(capabilities))
       .build()
       .execute();
 
@@ -346,8 +357,12 @@ class MailboxAPI with HandleSetErrorMixin {
 
     final setMailboxInvocation = requestBuilder.invocation(setMailboxMethod);
 
+    final capabilities = [CapabilityIdentifier.jmapTeamMailboxes].isSupportTeamMailboxes(session, accountId)
+      ? setMailboxMethod.requiredCapabilities.add(CapabilityIdentifier.jmapTeamMailboxes) as Set<CapabilityIdentifier>
+      : setMailboxMethod.requiredCapabilities;
+
     final response = await (requestBuilder
-        ..usings(_capabilitiesForMailboxMethod(session, accountId)))
+        ..usings(capabilities))
       .build()
       .execute();
 

lib/features/mailbox_dashboard/data/network/spam_report_api.dart

@@ -39,8 +39,13 @@ class SpamReportApi {
           ReferencePath.idsPath,
         ));
     final getMailboxInvocation = requestBuilder.invocation(getMailBoxMethod);
+
+    final capabilities = [CapabilityIdentifier.jmapTeamMailboxes].isSupportTeamMailboxes(session, accountId)
+      ? getMailBoxMethod.requiredCapabilitiesSupportTeamMailboxes
+      : getMailBoxMethod.requiredCapabilities;
+
     final result = await (requestBuilder
-            ..usings(_capabilitiesForMailboxMethod(session, accountId)))
+            ..usings(capabilities))
           .build()
           .execute();
 
@@ -54,17 +59,4 @@ class SpamReportApi {
       throw error;
     });
   }
-
-  Set<CapabilityIdentifier> _capabilitiesForMailboxMethod(Session session, AccountId accountId) {
-    final getMailboxCreated = GetMailboxMethod(accountId);
-    try {
-      requireCapability(
-        session,
-        accountId,
-        [CapabilityIdentifier.jmapTeamMailboxes]);
-      return getMailboxCreated.requiredCapabilitiesSupportTeamMailboxes;
-    } catch (_) {
-      return getMailboxCreated.requiredCapabilities;
-    }
-  }
 }

lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_controller.dart

@@ -124,7 +124,7 @@ class MailboxVisibilityController extends BaseMailboxController {
 
   void _subscribeMailboxAction(SubscribeMailboxRequest subscribeMailboxRequest) {
     final accountId = _accountDashBoardController.accountId.value;
-    final session = _accountDashBoardController.sessionCurrent.value;
+    final session = _accountDashBoardController.sessionCurrent;
     if (session != null && accountId != null) {
       final subscribeRequest = generateSubscribeRequest(
         subscribeMailboxRequest.mailboxId,

lib/l10n/intl_messages.arb

@@ -1,5 +1,5 @@
 {
-  "@@last_modified": "2023-03-10T14:00:31.546227",
+  "@@last_modified": "2023-03-22T15:16:03.053821",
   "initializing_data": "Initializing data...",
   "@initializing_data": {
     "type": "text",

lib/main/error/capability_validator.dart

@@ -28,6 +28,16 @@ void requireCapability(Session session, AccountId accountId, List<CapabilityIden
 
 extension CapabilityIdentifierExtension on List<CapabilityIdentifier> {
 
+  bool isSupportTeamMailboxes(Session session, AccountId accountId) {
+    try {
+      requireCapability(session, accountId, this);
+      return true;
+    } catch (error) {
+      logError('CapabilityIdentifierExtension::isSupported(): $error');
+      return false;
+    }
+  }
+
   bool isSupported(Session session, AccountId accountId) {
     try {
       requireCapability(session, accountId, this);