From 019dbe6e03c013f69be1f70332d09a654a1fad72 Mon Sep 17 00:00:00 2001 From: Florent Azavant Date: Fri, 29 Nov 2024 12:30:22 +0100 Subject: [PATCH] TF-3189 subaddressing features only shown if supported by the server --- .../mixin/mailbox_widget_mixin.dart | 64 ++++++++++++----- .../presentation/search_mailbox_view.dart | 14 +++- model/lib/mailbox/mailbox_constants.dart | 1 + .../mailbox_widget_mixin_test.dart | 69 +++++++++++++++++++ 4 files changed, 130 insertions(+), 18 deletions(-) create mode 100644 test/features/mailbox/presentation/mailbox_widget_mixin_test.dart diff --git a/lib/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart b/lib/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart index 06f2b5fa7..1a3b98526 100644 --- a/lib/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart +++ b/lib/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart @@ -4,9 +4,11 @@ import 'package:core/utils/direction_utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; -import 'package:model/extensions/presentation_mailbox_extension.dart'; -import 'package:model/mailbox/expand_mode.dart'; -import 'package:model/mailbox/presentation_mailbox.dart'; +import 'package:jmap_dart_client/jmap/account_id.dart'; +import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart'; +import 'package:jmap_dart_client/jmap/core/session/session.dart'; +import 'package:model/mailbox/mailbox_constants.dart'; +import 'package:model/model.dart'; import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart'; import 'package:tmail_ui_user/features/base/widget/popup_item_widget.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_controller.dart'; @@ -15,6 +17,8 @@ import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_action import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_categories.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_utils.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_bottom_sheet_action_tile_builder.dart'; +import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/app_dashboard/app_list_dashboard_item.dart'; +import 'package:tmail_ui_user/main/error/capability_validator.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; mixin MailboxWidgetMixin { @@ -53,7 +57,7 @@ mixin MailboxWidgetMixin { ]; } - List _listActionForPersonalMailbox(PresentationMailbox mailbox) { + List _listActionForPersonalMailbox(PresentationMailbox mailbox, bool subaddressingSupported) { return [ if (PlatformInfo.isWeb && mailbox.isSubscribedMailbox) MailboxActions.openInNewTab, @@ -62,12 +66,14 @@ mixin MailboxWidgetMixin { MailboxActions.markAsRead, MailboxActions.move, MailboxActions.rename, - if (mailbox.isSubaddressingAllowed) - MailboxActions.disallowSubaddressing - else - MailboxActions.allowSubaddressing, - if (mailbox.isSubaddressingAllowed) - MailboxActions.copySubaddress, + if (subaddressingSupported) ...[ + if (mailbox.isSubaddressingAllowed) + MailboxActions.disallowSubaddressing + else + MailboxActions.allowSubaddressing, + if (mailbox.isSubaddressingAllowed) + MailboxActions.copySubaddress, + ], if (mailbox.isSubscribedMailbox) MailboxActions.disableMailbox else @@ -93,12 +99,13 @@ mixin MailboxWidgetMixin { List _listActionForAllMailboxType( PresentationMailbox mailbox, bool spamReportEnabled, - bool deletedMessageVaultSupported + bool deletedMessageVaultSupported, + bool subaddressingSupported, ) { if (mailbox.isDefault) { return _listActionForDefaultMailbox(mailbox, spamReportEnabled, deletedMessageVaultSupported); } else if (mailbox.isPersonal) { - return _listActionForPersonalMailbox(mailbox); + return _listActionForPersonalMailbox(mailbox, subaddressingSupported); } else { return _listActionForTeamMailbox(mailbox); } @@ -114,10 +121,15 @@ mixin MailboxWidgetMixin { controller.mailboxDashBoardController.sessionCurrent, controller.mailboxDashBoardController.accountId.value); + final bool subaddressingSupported = isSubaddressingSupported( + controller.mailboxDashBoardController.sessionCurrent, + controller.mailboxDashBoardController.accountId.value); + final contextMenuActions = listContextMenuItemAction( mailbox, controller.mailboxDashBoardController.enableSpamReport, - deletedMessageVaultSupported + deletedMessageVaultSupported, + subaddressingSupported, ); if (contextMenuActions.isEmpty) { @@ -189,9 +201,10 @@ mixin MailboxWidgetMixin { List listContextMenuItemAction( PresentationMailbox mailbox, bool spamReportEnabled, - bool deletedMessageVaultSupported + bool deletedMessageVaultSupported, + bool subaddressingSupported, ) { - final mailboxActionsSupported = _listActionForAllMailboxType(mailbox, spamReportEnabled, deletedMessageVaultSupported); + final mailboxActionsSupported = _listActionForAllMailboxType(mailbox, spamReportEnabled, deletedMessageVaultSupported, subaddressingSupported); final listContextMenuItemAction = mailboxActionsSupported .map((action) => ContextMenuItemMailboxAction(action, action.getContextMenuItemState(mailbox))) @@ -212,10 +225,15 @@ mixin MailboxWidgetMixin { controller.mailboxDashBoardController.sessionCurrent, controller.mailboxDashBoardController.accountId.value); + final bool subaddressingSupported = isSubaddressingSupported( + controller.mailboxDashBoardController.sessionCurrent, + controller.mailboxDashBoardController.accountId.value); + final contextMenuActions = listContextMenuItemAction( mailbox, controller.mailboxDashBoardController.enableSpamReport, - deletedMessageVaultSupported + deletedMessageVaultSupported, + subaddressingSupported, ); if (contextMenuActions.isEmpty) { @@ -268,6 +286,20 @@ mixin MailboxWidgetMixin { .toList(); } + static bool isSubaddressingSupported(Session? session, AccountId? accountId) { + if (session == null || accountId == null) { + return false; + } + if (!CapabilityIdentifier.jmapTeamMailboxes.isSupported(session, accountId)) { + return false; + } + + return (session.getCapabilityProperties(accountId, CapabilityIdentifier.jmapTeamMailboxes) + ?.props[0] as Map?) + ?[subaddressingSupported] + ?? false; + } + PopupMenuItem _buildPopupMenuItem( BuildContext context, ImagePaths imagePaths, diff --git a/lib/features/search/mailbox/presentation/search_mailbox_view.dart b/lib/features/search/mailbox/presentation/search_mailbox_view.dart index fb9470180..8899f4ff2 100644 --- a/lib/features/search/mailbox/presentation/search_mailbox_view.dart +++ b/lib/features/search/mailbox/presentation/search_mailbox_view.dart @@ -201,10 +201,15 @@ class SearchMailboxView extends GetWidget controller.dashboardController.sessionCurrent, controller.dashboardController.accountId.value); + final bool subaddressingSupported = MailboxWidgetMixin.isSubaddressingSupported( + controller.dashboardController.sessionCurrent, + controller.dashboardController.accountId.value); + final contextMenuActions = listContextMenuItemAction( mailbox, controller.dashboardController.enableSpamReport, - deletedMessageVaultSupported + deletedMessageVaultSupported, + subaddressingSupported, ); return contextMenuActions .map((action) => _mailboxFocusedMenuItem(context, action, mailbox)) @@ -262,10 +267,15 @@ class SearchMailboxView extends GetWidget controller.dashboardController.sessionCurrent, controller.dashboardController.accountId.value); + final bool subaddressingSupported = MailboxWidgetMixin.isSubaddressingSupported( + controller.dashboardController.sessionCurrent, + controller.dashboardController.accountId.value); + final contextMenuActions = listContextMenuItemAction( mailbox, controller.dashboardController.enableSpamReport, - deletedMessageVaultSupported + deletedMessageVaultSupported, + subaddressingSupported, ); if (contextMenuActions.isEmpty) { diff --git a/model/lib/mailbox/mailbox_constants.dart b/model/lib/mailbox/mailbox_constants.dart index ae75773f9..dd945ace5 100644 --- a/model/lib/mailbox/mailbox_constants.dart +++ b/model/lib/mailbox/mailbox_constants.dart @@ -1,2 +1,3 @@ const String anyoneIdentifier = 'anyone'; const String postingRight = 'p'; +const String subaddressingSupported = "subaddressingSupported"; diff --git a/test/features/mailbox/presentation/mailbox_widget_mixin_test.dart b/test/features/mailbox/presentation/mailbox_widget_mixin_test.dart new file mode 100644 index 000000000..8fbf9da27 --- /dev/null +++ b/test/features/mailbox/presentation/mailbox_widget_mixin_test.dart @@ -0,0 +1,69 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:jmap_dart_client/jmap/account_id.dart'; +import 'package:jmap_dart_client/jmap/core/account/account.dart'; +import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart'; +import 'package:jmap_dart_client/jmap/core/capability/default_capability.dart'; +import 'package:jmap_dart_client/jmap/core/id.dart'; +import 'package:jmap_dart_client/jmap/core/session/session.dart'; +import 'package:jmap_dart_client/jmap/core/state.dart'; +import 'package:jmap_dart_client/jmap/core/user_name.dart'; +import 'package:tmail_ui_user/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart'; + +void main() { + group('MailboxWidgetMixin::isSubaddressingSupported::test', () { + + test( + 'should return true ' + 'when the server advertizes true', + () { + + // arrange + final session = Session( + {CapabilityIdentifier.jmapTeamMailboxes: DefaultCapability({"subaddressingSupported": true})}, + {AccountId(Id("1")): Account(AccountName("name"), true, false, {CapabilityIdentifier.jmapTeamMailboxes: DefaultCapability({"subaddressingSupported": true})})}, + {}, UserName(''), Uri(), Uri(), Uri(), Uri(), State('')); + + // act + final subaddressingSupported = MailboxWidgetMixin.isSubaddressingSupported(session, AccountId(Id("1"))); + + // assert + expect(subaddressingSupported, true); + }); + + test( + 'should return false ' + 'when the server advertizes false', + () { + + // arrange + final session = Session( + {CapabilityIdentifier.jmapTeamMailboxes: DefaultCapability({"subaddressingSupported": false})}, + {AccountId(Id("1")): Account(AccountName("name"), true, false, {CapabilityIdentifier.jmapTeamMailboxes: DefaultCapability({"subaddressingSupported": false})})}, + {}, UserName(''), Uri(), Uri(), Uri(), Uri(), State('')); + + // act + final subaddressingSupported = MailboxWidgetMixin.isSubaddressingSupported(session, AccountId(Id("1"))); + + // assert + expect(subaddressingSupported, false); + }); + + test( + 'should return false ' + 'when the server advertizes nothing', + () { + + // arrange + final session = Session( + {CapabilityIdentifier.jmapTeamMailboxes: DefaultCapability({})}, + {AccountId(Id("1")): Account(AccountName("name"), true, false, {CapabilityIdentifier.jmapTeamMailboxes: DefaultCapability({})})}, + {}, UserName(''), Uri(), Uri(), Uri(), Uri(), State('')); + + // act + final subaddressingSupported = MailboxWidgetMixin.isSubaddressingSupported(session, AccountId(Id("1"))); + + // assert + expect(subaddressingSupported, false); + }); + }); +} \ No newline at end of file