TF-1604: Add requiredCapabilities support TeamMailbox for spam report
(cherry picked from commit a05e1df1b9f6730978f2172aad36fb6c3e3249d4)
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
|
||||||
@@ -12,6 +13,7 @@ abstract class SpamReportDataSource {
|
|||||||
Future<bool> deleteLastTimeDismissedSpamReported();
|
Future<bool> deleteLastTimeDismissedSpamReported();
|
||||||
|
|
||||||
Future<UnreadSpamEmailsResponse> findNumberOfUnreadSpamEmails(
|
Future<UnreadSpamEmailsResponse> findNumberOfUnreadSpamEmails(
|
||||||
|
Session session,
|
||||||
AccountId accountId,
|
AccountId accountId,
|
||||||
{
|
{
|
||||||
MailboxFilterCondition? mailboxFilterCondition,
|
MailboxFilterCondition? mailboxFilterCondition,
|
||||||
|
|||||||
+2
@@ -1,4 +1,5 @@
|
|||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
|
||||||
@@ -35,6 +36,7 @@ class SharePreferenceSpamReportDataSourceImpl extends SpamReportDataSource {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<UnreadSpamEmailsResponse> findNumberOfUnreadSpamEmails(
|
Future<UnreadSpamEmailsResponse> findNumberOfUnreadSpamEmails(
|
||||||
|
Session session,
|
||||||
AccountId accountId,
|
AccountId accountId,
|
||||||
{
|
{
|
||||||
MailboxFilterCondition? mailboxFilterCondition,
|
MailboxFilterCondition? mailboxFilterCondition,
|
||||||
|
|||||||
+6
-1
@@ -1,5 +1,6 @@
|
|||||||
|
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
|
||||||
@@ -21,6 +22,7 @@ class SpamReportDataSourceImpl extends SpamReportDataSource {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<UnreadSpamEmailsResponse> findNumberOfUnreadSpamEmails(
|
Future<UnreadSpamEmailsResponse> findNumberOfUnreadSpamEmails(
|
||||||
|
Session session,
|
||||||
AccountId accountId,
|
AccountId accountId,
|
||||||
{
|
{
|
||||||
MailboxFilterCondition? mailboxFilterCondition,
|
MailboxFilterCondition? mailboxFilterCondition,
|
||||||
@@ -29,7 +31,10 @@ class SpamReportDataSourceImpl extends SpamReportDataSource {
|
|||||||
) {
|
) {
|
||||||
return Future.sync(() async {
|
return Future.sync(() async {
|
||||||
final unreadSpamEmailsResponse = await _spamReportApi.getUnreadSpamEmailbox(
|
final unreadSpamEmailsResponse = await _spamReportApi.getUnreadSpamEmailbox(
|
||||||
accountId, mailboxFilterCondition: mailboxFilterCondition, limit: limit);
|
session,
|
||||||
|
accountId,
|
||||||
|
mailboxFilterCondition: mailboxFilterCondition,
|
||||||
|
limit: limit);
|
||||||
return unreadSpamEmailsResponse;
|
return unreadSpamEmailsResponse;
|
||||||
}).catchError(_exceptionThrower.throwException);
|
}).catchError(_exceptionThrower.throwException);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -1,4 +1,5 @@
|
|||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
@@ -32,6 +33,7 @@ class SharePreferenceSpamReportDataSource extends SpamReportDataSource {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<UnreadSpamEmailsResponse> findNumberOfUnreadSpamEmails(
|
Future<UnreadSpamEmailsResponse> findNumberOfUnreadSpamEmails(
|
||||||
|
Session session,
|
||||||
AccountId accountId,
|
AccountId accountId,
|
||||||
{
|
{
|
||||||
MailboxFilterCondition? mailboxFilterCondition,
|
MailboxFilterCondition? mailboxFilterCondition,
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import 'package:jmap_dart_client/http/http_client.dart';
|
import 'package:jmap_dart_client/http/http_client.dart';
|
||||||
import 'package:jmap_dart_client/jmap/account_id.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/request/reference_path.dart';
|
import 'package:jmap_dart_client/jmap/core/request/reference_path.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
import 'package:jmap_dart_client/jmap/jmap_request.dart';
|
import 'package:jmap_dart_client/jmap/jmap_request.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/get/get_mailbox_method.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/get/get_mailbox_method.dart';
|
||||||
@@ -8,6 +10,7 @@ import 'package:jmap_dart_client/jmap/mail/mailbox/get/get_mailbox_response.dart
|
|||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/query/query_mailbox_method.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/query/query_mailbox_method.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/unread_spam_emails_response.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/unread_spam_emails_response.dart';
|
||||||
|
import 'package:tmail_ui_user/main/error/capability_validator.dart';
|
||||||
|
|
||||||
class SpamReportApi {
|
class SpamReportApi {
|
||||||
final HttpClient _httpClient;
|
final HttpClient _httpClient;
|
||||||
@@ -16,6 +19,7 @@ class SpamReportApi {
|
|||||||
SpamReportApi(this._httpClient);
|
SpamReportApi(this._httpClient);
|
||||||
|
|
||||||
Future<UnreadSpamEmailsResponse> getUnreadSpamEmailbox(
|
Future<UnreadSpamEmailsResponse> getUnreadSpamEmailbox(
|
||||||
|
Session session,
|
||||||
AccountId accountId,
|
AccountId accountId,
|
||||||
{
|
{
|
||||||
MailboxFilterCondition? mailboxFilterCondition,
|
MailboxFilterCondition? mailboxFilterCondition,
|
||||||
@@ -36,7 +40,7 @@ class SpamReportApi {
|
|||||||
));
|
));
|
||||||
final getMailboxInvocation = requestBuilder.invocation(getMailBoxMethod);
|
final getMailboxInvocation = requestBuilder.invocation(getMailBoxMethod);
|
||||||
final result = await (requestBuilder
|
final result = await (requestBuilder
|
||||||
..usings(getMailBoxMethod.requiredCapabilities))
|
..usings(_capabilitiesForMailboxMethod(session, accountId)))
|
||||||
.build()
|
.build()
|
||||||
.execute();
|
.execute();
|
||||||
|
|
||||||
@@ -50,4 +54,17 @@ class SpamReportApi {
|
|||||||
throw error;
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import 'package:core/data/model/source_type/data_source_type.dart';
|
import 'package:core/data/model/source_type/data_source_type.dart';
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
|
||||||
@@ -29,6 +30,7 @@ class SpamReportRepositoryImpl extends SpamReportRepository {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<UnreadSpamEmailsResponse> getUnreadSpamMailbox(
|
Future<UnreadSpamEmailsResponse> getUnreadSpamMailbox(
|
||||||
|
Session session,
|
||||||
AccountId accountId,
|
AccountId accountId,
|
||||||
{
|
{
|
||||||
MailboxFilterCondition? mailboxFilterCondition,
|
MailboxFilterCondition? mailboxFilterCondition,
|
||||||
@@ -36,9 +38,10 @@ class SpamReportRepositoryImpl extends SpamReportRepository {
|
|||||||
}
|
}
|
||||||
) {
|
) {
|
||||||
return mapDataSource[DataSourceType.network]!.findNumberOfUnreadSpamEmails(
|
return mapDataSource[DataSourceType.network]!.findNumberOfUnreadSpamEmails(
|
||||||
accountId,
|
session,
|
||||||
mailboxFilterCondition: mailboxFilterCondition,
|
accountId,
|
||||||
limit: limit);
|
mailboxFilterCondition: mailboxFilterCondition,
|
||||||
|
limit: limit);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
|
||||||
@@ -12,6 +13,7 @@ abstract class SpamReportRepository {
|
|||||||
Future<void> deleteLastTimeDismissedSpamReported();
|
Future<void> deleteLastTimeDismissedSpamReported();
|
||||||
|
|
||||||
Future<UnreadSpamEmailsResponse> getUnreadSpamMailbox(
|
Future<UnreadSpamEmailsResponse> getUnreadSpamMailbox(
|
||||||
|
Session session,
|
||||||
AccountId accountId,
|
AccountId accountId,
|
||||||
{
|
{
|
||||||
MailboxFilterCondition? mailboxFilterCondition,
|
MailboxFilterCondition? mailboxFilterCondition,
|
||||||
|
|||||||
+7
-1
@@ -3,6 +3,7 @@ import 'package:core/presentation/state/failure.dart';
|
|||||||
import 'package:core/presentation/state/success.dart';
|
import 'package:core/presentation/state/success.dart';
|
||||||
import 'package:dartz/dartz.dart';
|
import 'package:dartz/dartz.dart';
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/spam_report_repository.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/spam_report_repository.dart';
|
||||||
@@ -15,6 +16,7 @@ class GetUnreadSpamMailboxInteractor {
|
|||||||
GetUnreadSpamMailboxInteractor(this._spamReportRepository);
|
GetUnreadSpamMailboxInteractor(this._spamReportRepository);
|
||||||
|
|
||||||
Stream<Either<Failure, Success>> execute(
|
Stream<Either<Failure, Success>> execute(
|
||||||
|
Session session,
|
||||||
AccountId accountId,
|
AccountId accountId,
|
||||||
{
|
{
|
||||||
UnsignedInt? limit,
|
UnsignedInt? limit,
|
||||||
@@ -29,7 +31,11 @@ class GetUnreadSpamMailboxInteractor {
|
|||||||
final checkTimeCondition = (timeLast.inHours > 0) && (timeLast.inHours > conditionsForDisplayingSpamReportBanner);
|
final checkTimeCondition = (timeLast.inHours > 0) && (timeLast.inHours > conditionsForDisplayingSpamReportBanner);
|
||||||
|
|
||||||
if (checkTimeCondition) {
|
if (checkTimeCondition) {
|
||||||
final response = await _spamReportRepository.getUnreadSpamMailbox(accountId, mailboxFilterCondition: mailboxFilterCondition, limit: limit);
|
final response = await _spamReportRepository.getUnreadSpamMailbox(
|
||||||
|
session,
|
||||||
|
accountId,
|
||||||
|
mailboxFilterCondition: mailboxFilterCondition,
|
||||||
|
limit: limit);
|
||||||
final unreadSpamMailbox = response.unreadSpamMailbox;
|
final unreadSpamMailbox = response.unreadSpamMailbox;
|
||||||
|
|
||||||
if (unreadSpamMailbox!.unreadEmails!.value.value > 0) {
|
if (unreadSpamMailbox!.unreadEmails!.value.value > 0) {
|
||||||
|
|||||||
+1
-1
@@ -1551,7 +1551,7 @@ class MailboxDashBoardController extends ReloadableController {
|
|||||||
|
|
||||||
void showSpamReportBanner() {
|
void showSpamReportBanner() {
|
||||||
if (spamReportController.enableSpamReport) {
|
if (spamReportController.enableSpamReport) {
|
||||||
spamReportController.getUnreadSpamMailboxAction(accountId.value!);
|
spamReportController.getUnreadSpamMailboxAction(sessionCurrent!, accountId.value!);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import 'package:core/utils/app_logger.dart';
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||||
import 'package:model/extensions/mailbox_extension.dart';
|
import 'package:model/extensions/mailbox_extension.dart';
|
||||||
@@ -61,10 +62,13 @@ class SpamReportController extends BaseController {
|
|||||||
_storeLastTimeDismissedSpamReportedAction();
|
_storeLastTimeDismissedSpamReportedAction();
|
||||||
}
|
}
|
||||||
|
|
||||||
void getUnreadSpamMailboxAction(AccountId accountId) {
|
void getUnreadSpamMailboxAction(Session session, AccountId accountId) {
|
||||||
final mailboxFilterCondition = MailboxFilterCondition(role: Role('Spam'));
|
final mailboxFilterCondition = MailboxFilterCondition(role: Role('Spam'));
|
||||||
getSpamReportStateAction();
|
getSpamReportStateAction();
|
||||||
consumeState(_getNumberOfUnreadSpamEmailsInteractor.execute(accountId,mailboxFilterCondition: mailboxFilterCondition));
|
consumeState(_getNumberOfUnreadSpamEmailsInteractor.execute(
|
||||||
|
session,
|
||||||
|
accountId,
|
||||||
|
mailboxFilterCondition: mailboxFilterCondition));
|
||||||
}
|
}
|
||||||
|
|
||||||
void _storeLastTimeDismissedSpamReportedAction() {
|
void _storeLastTimeDismissedSpamReportedAction() {
|
||||||
|
|||||||
Reference in New Issue
Block a user