TF-1310: Check capability of TeamMailboxes in session
This commit is contained in:
@@ -13,6 +13,7 @@ import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/error/method/error_method_response.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/mail/mailbox/mailbox.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
|
||||
import 'package:model/mailbox/expand_mode.dart';
|
||||
@@ -74,6 +75,7 @@ class DestinationPickerController extends BaseMailboxController {
|
||||
TextEditingController? searchInputController;
|
||||
FocusNode? searchFocus;
|
||||
DestinationPickerArguments? arguments;
|
||||
Session? _session;
|
||||
AccountId? accountId;
|
||||
MailboxId? mailboxIdSelected;
|
||||
OnSelectedMailboxCallback? onSelectedMailboxCallback;
|
||||
@@ -156,7 +158,7 @@ class DestinationPickerController extends BaseMailboxController {
|
||||
|
||||
void getAllMailboxAction() {
|
||||
if (accountId != null) {
|
||||
consumeState(_getAllMailboxInteractor.execute(accountId!));
|
||||
consumeState(_getAllMailboxInteractor.execute(_session!, accountId!));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_request.dart';
|
||||
|
||||
abstract class MailboxDataSource {
|
||||
Future<MailboxResponse> getAllMailbox(AccountId accountId, {Properties? properties});
|
||||
Future<MailboxResponse> getAllMailbox(Session session, AccountId accountId, {Properties? properties});
|
||||
|
||||
Future<List<Mailbox>> getAllMailboxCache();
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ class MailboxCacheDataSourceImpl extends MailboxDataSource {
|
||||
MailboxCacheDataSourceImpl(this._mailboxCacheManager, this._exceptionThrower);
|
||||
|
||||
@override
|
||||
Future<MailboxResponse> getAllMailbox(AccountId accountId, {Properties? properties}) {
|
||||
Future<MailboxResponse> getAllMailbox(Session session, AccountId accountId, {Properties? properties}) {
|
||||
throw UnimplementedError();
|
||||
}
|
||||
|
||||
|
||||
@@ -30,9 +30,9 @@ class MailboxDataSourceImpl extends MailboxDataSource {
|
||||
MailboxDataSourceImpl(this.mailboxAPI, this._mailboxIsolateWorker, this._exceptionThrower);
|
||||
|
||||
@override
|
||||
Future<MailboxResponse> getAllMailbox(AccountId accountId, {Properties? properties}) {
|
||||
Future<MailboxResponse> getAllMailbox(Session session, AccountId accountId, {Properties? properties}) {
|
||||
return Future.sync(() async {
|
||||
return await mailboxAPI.getAllMailbox(accountId, properties: properties);
|
||||
return await mailboxAPI.getAllMailbox(session, accountId, properties: properties);
|
||||
}).catchError((error) {
|
||||
_exceptionThrower.throwException(error);
|
||||
});
|
||||
|
||||
@@ -38,7 +38,7 @@ class MailboxAPI with HandleSetErrorMixin {
|
||||
|
||||
MailboxAPI(this.httpClient);
|
||||
|
||||
Future<MailboxResponse> getAllMailbox(AccountId accountId, {Properties? properties}) async {
|
||||
Future<MailboxResponse> getAllMailbox(Session session, AccountId accountId, {Properties? properties}) async {
|
||||
final processingInvocation = ProcessingInvocation();
|
||||
|
||||
final jmapRequestBuilder = JmapRequestBuilder(httpClient, processingInvocation);
|
||||
@@ -47,8 +47,10 @@ class MailboxAPI with HandleSetErrorMixin {
|
||||
|
||||
final queryInvocation = jmapRequestBuilder.invocation(getMailboxCreated);
|
||||
|
||||
final capabilities = checkCapabilities(session, accountId);
|
||||
|
||||
final result = await (jmapRequestBuilder
|
||||
..usings(getMailboxCreated.requiredCapabilities))
|
||||
..usings(capabilities))
|
||||
.build()
|
||||
.execute();
|
||||
|
||||
@@ -59,6 +61,23 @@ class MailboxAPI with HandleSetErrorMixin {
|
||||
return MailboxResponse(mailboxes: resultCreated?.list, state: resultCreated?.state);
|
||||
}
|
||||
|
||||
Set<CapabilityIdentifier> checkCapabilities(Session session, AccountId accountId) {
|
||||
final getMailboxCreated = GetMailboxMethod(accountId);
|
||||
try {
|
||||
requireCapability(
|
||||
session,
|
||||
accountId,
|
||||
[
|
||||
CapabilityIdentifier.jmapCore,
|
||||
CapabilityIdentifier.jmapMail,
|
||||
CapabilityIdentifier.jmapTeamMailboxes
|
||||
]);
|
||||
return getMailboxCreated.requiredCapabilitiesSupportTeamMailboxes;
|
||||
} catch (_) {
|
||||
return getMailboxCreated.requiredCapabilities;
|
||||
}
|
||||
}
|
||||
|
||||
Future<MailboxChangeResponse> getChanges(AccountId accountId, State sinceState) async {
|
||||
final processingInvocation = ProcessingInvocation();
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ class MailboxRepositoryImpl extends MailboxRepository {
|
||||
);
|
||||
|
||||
@override
|
||||
Stream<MailboxResponse> getAllMailbox(AccountId accountId, {Properties? properties}) async* {
|
||||
Stream<MailboxResponse> getAllMailbox(Session session, AccountId accountId, {Properties? properties}) async* {
|
||||
final localMailboxResponse = await Future.wait([
|
||||
mapDataSource[DataSourceType.local]!.getAllMailboxCache(),
|
||||
stateDataSource.getState(StateType.mailbox)
|
||||
@@ -70,7 +70,7 @@ class MailboxRepositoryImpl extends MailboxRepository {
|
||||
]);
|
||||
}
|
||||
} else {
|
||||
final mailboxResponse = await mapDataSource[DataSourceType.network]!.getAllMailbox(accountId);
|
||||
final mailboxResponse = await mapDataSource[DataSourceType.network]!.getAllMailbox(session, accountId,);
|
||||
|
||||
await Future.wait([
|
||||
mapDataSource[DataSourceType.local]!.update(created: mailboxResponse.mailboxes),
|
||||
|
||||
@@ -17,7 +17,7 @@ import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_request.dart';
|
||||
|
||||
abstract class MailboxRepository {
|
||||
Stream<MailboxResponse> getAllMailbox(AccountId accountId, {Properties? properties});
|
||||
Stream<MailboxResponse> getAllMailbox(Session session, AccountId accountId, {Properties? properties});
|
||||
|
||||
Stream<MailboxResponse> refresh(AccountId accountId, State currentState);
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ import 'package:core/core.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:model/model.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
|
||||
@@ -12,12 +13,15 @@ class GetAllMailboxInteractor {
|
||||
|
||||
GetAllMailboxInteractor(this._mailboxRepository);
|
||||
|
||||
Stream<Either<Failure, Success>> execute(AccountId accountId, {Properties? properties}) async* {
|
||||
Stream<Either<Failure, Success>> execute(Session session, AccountId accountId, {Properties? properties}) async* {
|
||||
try {
|
||||
yield Right<Failure, Success>(LoadingState());
|
||||
|
||||
yield* _mailboxRepository
|
||||
.getAllMailbox(accountId, properties: properties)
|
||||
.getAllMailbox(
|
||||
session,
|
||||
accountId,
|
||||
properties: properties)
|
||||
.map(_toGetMailboxState);
|
||||
} catch (e) {
|
||||
yield Left<Failure, Success>(GetAllMailboxFailure(e));
|
||||
|
||||
@@ -9,6 +9,7 @@ import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/error/method/error_method_response.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' as jmap;
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
@@ -203,7 +204,7 @@ class MailboxController extends BaseMailboxController {
|
||||
void _registerObxStreamListener() {
|
||||
ever(mailboxDashBoardController.accountId, (accountId) {
|
||||
if (accountId is AccountId) {
|
||||
getAllMailboxAction(accountId);
|
||||
getAllMailboxAction(mailboxDashBoardController.sessionCurrent!, accountId);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -297,15 +298,16 @@ class MailboxController extends BaseMailboxController {
|
||||
}
|
||||
}
|
||||
|
||||
void getAllMailboxAction(AccountId accountId) async {
|
||||
consumeState(_getAllMailboxInteractor.execute(accountId));
|
||||
void getAllMailboxAction(Session session, AccountId accountId) async {
|
||||
consumeState(_getAllMailboxInteractor.execute(session, accountId));
|
||||
}
|
||||
|
||||
void refreshAllMailbox() {
|
||||
if (!isSearchActive()) {
|
||||
final session = mailboxDashBoardController.sessionCurrent;
|
||||
final accountId = mailboxDashBoardController.accountId.value;
|
||||
if (accountId != null) {
|
||||
consumeState(_getAllMailboxInteractor.execute(accountId));
|
||||
if (session != null && accountId != null) {
|
||||
consumeState(_getAllMailboxInteractor.execute(session, accountId));
|
||||
}
|
||||
} else {
|
||||
_searchMailboxAction(allMailboxes, searchQuery.value);
|
||||
@@ -1181,6 +1183,6 @@ class MailboxController extends BaseMailboxController {
|
||||
mailboxListScrollController.animateTo(
|
||||
mailboxListScrollController.offset,
|
||||
duration: const Duration(milliseconds: 300),
|
||||
curve: Curves.fastOutSlowIn);
|
||||
curve: Curves.fastOutSlowIn);
|
||||
}
|
||||
}
|
||||
@@ -191,7 +191,7 @@ class RulesFilterCreatorController extends BaseMailboxController {
|
||||
|
||||
void _getAllMailboxAction() {
|
||||
if (_accountId != null) {
|
||||
consumeState(_getAllMailboxInteractor.execute(_accountId!));
|
||||
consumeState(_getAllMailboxInteractor.execute(_session!, _accountId!));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user