TF-1625 Get capability supported for Identity/set method
(cherry picked from commit 16a77edba891a628b728d05ddd3a61c9ba45b8dc)
This commit is contained in:
@@ -1,16 +1,17 @@
|
||||
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:jmap_dart_client/jmap/identities/identity.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/model/edit_identity_request.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/model/identities_response.dart';
|
||||
|
||||
abstract class IdentityDataSource {
|
||||
Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties});
|
||||
Future<IdentitiesResponse> getAllIdentities(Session session, AccountId accountId, {Properties? properties});
|
||||
|
||||
Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest);
|
||||
Future<Identity> createNewIdentity(Session session, AccountId accountId, CreateNewIdentityRequest identityRequest);
|
||||
|
||||
Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId);
|
||||
Future<bool> deleteIdentity(Session session, AccountId accountId, IdentityId identityId);
|
||||
|
||||
Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest);
|
||||
Future<bool> editIdentity(Session session, AccountId accountId, EditIdentityRequest editIdentityRequest);
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
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:jmap_dart_client/jmap/identities/identity.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/data/datasource/identity_data_source.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/data/network/identity_api.dart';
|
||||
@@ -16,31 +17,30 @@ class IdentityDataSourceImpl extends IdentityDataSource {
|
||||
IdentityDataSourceImpl(this._identityAPI, this._exceptionThrower);
|
||||
|
||||
@override
|
||||
Future<IdentitiesResponse> getAllIdentities(AccountId accountId,
|
||||
{Properties? properties}) {
|
||||
Future<IdentitiesResponse> getAllIdentities(Session session, AccountId accountId, {Properties? properties}) {
|
||||
return Future.sync(() async {
|
||||
return await _identityAPI.getAllIdentities(accountId, properties: properties);
|
||||
return await _identityAPI.getAllIdentities(session, accountId, properties: properties);
|
||||
}).catchError(_exceptionThrower.throwException);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest) {
|
||||
Future<Identity> createNewIdentity(Session session, AccountId accountId, CreateNewIdentityRequest identityRequest) {
|
||||
return Future.sync(() async {
|
||||
return await _identityAPI.createNewIdentity(accountId, identityRequest);
|
||||
return await _identityAPI.createNewIdentity(session, accountId, identityRequest);
|
||||
}).catchError(_exceptionThrower.throwException);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId) {
|
||||
Future<bool> deleteIdentity(Session session, AccountId accountId, IdentityId identityId) {
|
||||
return Future.sync(() async {
|
||||
return await _identityAPI.deleteIdentity(accountId, identityId);
|
||||
return await _identityAPI.deleteIdentity(session, accountId, identityId);
|
||||
}).catchError(_exceptionThrower.throwException);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) {
|
||||
Future<bool> editIdentity(Session session, AccountId accountId, EditIdentityRequest editIdentityRequest) {
|
||||
return Future.sync(() async {
|
||||
return await _identityAPI.editIdentity(accountId, editIdentityRequest);
|
||||
return await _identityAPI.editIdentity(session, accountId, editIdentityRequest);
|
||||
}).catchError(_exceptionThrower.throwException);
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@ import 'package:jmap_dart_client/jmap/identities/identity.dart';
|
||||
import 'package:jmap_dart_client/jmap/identities/set/set_identity_method.dart';
|
||||
import 'package:jmap_dart_client/jmap/identities/set/set_identity_response.dart';
|
||||
import 'package:jmap_dart_client/jmap/jmap_request.dart';
|
||||
import 'package:model/identity/identity_request_dto.dart';
|
||||
import 'package:model/extensions/list_identity_id_extension.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_default_identity_request.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/model/edit_default_identity_request.dart';
|
||||
@@ -31,7 +31,9 @@ class IdentityAPI {
|
||||
if (properties != null) {
|
||||
getIdentityMethod.addProperties(properties);
|
||||
}
|
||||
final capabilitySupported = [CapabilityIdentifier.jamesSortOrder].isSupported(session, accountId)
|
||||
|
||||
final jamesSortOrderIsSupported = [CapabilityIdentifier.jamesSortOrder].isSupported(session, accountId);
|
||||
final capabilitySupported = jamesSortOrderIsSupported
|
||||
? getIdentityMethod.requiredCapabilitiesSupportSortOrder
|
||||
: getIdentityMethod.requiredCapabilities;
|
||||
|
||||
@@ -49,14 +51,22 @@ class IdentityAPI {
|
||||
return IdentitiesResponse(identities: response?.list, state: response?.state);
|
||||
}
|
||||
|
||||
Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest) async {
|
||||
Future<Identity> createNewIdentity(Session session, AccountId accountId, CreateNewIdentityRequest identityRequest) async {
|
||||
final setIdentityMethod = SetIdentityMethod(accountId)
|
||||
..addCreate(identityRequest.creationId, identityRequest.newIdentity);
|
||||
|
||||
var capabilities = setIdentityMethod.requiredCapabilities;
|
||||
if (identityRequest is CreateNewDefaultIdentityRequest) {
|
||||
capabilities = setIdentityMethod.requiredCapabilitiesSupportSortOrder;
|
||||
_addUpdatesToCreateDefaultIdentityMethod(setIdentityMethod, identityRequest);
|
||||
|
||||
final jamesSortOrderIsSupported = [CapabilityIdentifier.jamesSortOrder].isSupported(session, accountId);
|
||||
final capabilitySupported = jamesSortOrderIsSupported
|
||||
? setIdentityMethod.requiredCapabilitiesSupportSortOrder
|
||||
: setIdentityMethod.requiredCapabilities;
|
||||
|
||||
if (jamesSortOrderIsSupported &&
|
||||
identityRequest is CreateNewDefaultIdentityRequest &&
|
||||
identityRequest.oldDefaultIdentityIds != null
|
||||
) {
|
||||
setIdentityMethod.addUpdates(
|
||||
identityRequest.oldDefaultIdentityIds!.generateMapUpdateObjectSortOrder(sortOrder: UnsignedInt(100))
|
||||
);
|
||||
}
|
||||
|
||||
final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
|
||||
@@ -64,7 +74,7 @@ class IdentityAPI {
|
||||
final setIdentityInvocation = requestBuilder.invocation(setIdentityMethod);
|
||||
|
||||
final response = await (requestBuilder
|
||||
..usings(capabilities))
|
||||
..usings(capabilitySupported))
|
||||
.build()
|
||||
.execute();
|
||||
|
||||
@@ -75,27 +85,21 @@ class IdentityAPI {
|
||||
return setIdentityResponse!.created![identityRequest.creationId]!;
|
||||
}
|
||||
|
||||
void _addUpdatesToCreateDefaultIdentityMethod(
|
||||
SetIdentityMethod setIdentityMethod,
|
||||
CreateNewDefaultIdentityRequest identityRequest
|
||||
) {
|
||||
for (var i = 0; i < (identityRequest.oldDefaultIdentityIds?.length ?? 0); i++) {
|
||||
setIdentityMethod.addUpdates({
|
||||
identityRequest.oldDefaultIdentityIds![i].id : PatchObject(IdentityRequestDto(sortOrder: UnsignedInt(100)).toJson())
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId) async {
|
||||
Future<bool> deleteIdentity(Session session, AccountId accountId, IdentityId identityId) async {
|
||||
final setIdentityMethod = SetIdentityMethod(accountId)
|
||||
..addDestroy({identityId.id});
|
||||
|
||||
final jamesSortOrderIsSupported = [CapabilityIdentifier.jamesSortOrder].isSupported(session, accountId);
|
||||
final capabilitySupported = jamesSortOrderIsSupported
|
||||
? setIdentityMethod.requiredCapabilitiesSupportSortOrder
|
||||
: setIdentityMethod.requiredCapabilities;
|
||||
|
||||
final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
|
||||
|
||||
final setIdentityInvocation = requestBuilder.invocation(setIdentityMethod);
|
||||
|
||||
final response = await (requestBuilder
|
||||
..usings(setIdentityMethod.requiredCapabilities))
|
||||
..usings(capabilitySupported))
|
||||
.build()
|
||||
.execute();
|
||||
|
||||
@@ -106,21 +110,24 @@ class IdentityAPI {
|
||||
return setIdentityResponse?.destroyed?.contains(identityId.id) == true;
|
||||
}
|
||||
|
||||
Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) async {
|
||||
Future<bool> editIdentity(Session session, AccountId accountId, EditIdentityRequest editIdentityRequest) async {
|
||||
final setIdentityMethod = SetIdentityMethod(accountId)
|
||||
..addUpdates({
|
||||
editIdentityRequest.identityId.id : PatchObject(editIdentityRequest.identityRequest.toJson())
|
||||
});
|
||||
|
||||
var capabilities = setIdentityMethod.requiredCapabilities;
|
||||
|
||||
if (editIdentityRequest is EditDefaultIdentityRequest) {
|
||||
for (var identityId in editIdentityRequest.oldDefaultIdentityIds ?? []) {
|
||||
setIdentityMethod.addUpdates({
|
||||
identityId.id: PatchObject(IdentityRequestDto(sortOrder: UnsignedInt(100)).toJson())
|
||||
});
|
||||
}
|
||||
capabilities = setIdentityMethod.requiredCapabilitiesSupportSortOrder;
|
||||
final jamesSortOrderIsSupported = [CapabilityIdentifier.jamesSortOrder].isSupported(session, accountId);
|
||||
final capabilitySupported = jamesSortOrderIsSupported
|
||||
? setIdentityMethod.requiredCapabilitiesSupportSortOrder
|
||||
: setIdentityMethod.requiredCapabilities;
|
||||
|
||||
if (jamesSortOrderIsSupported &&
|
||||
editIdentityRequest is EditDefaultIdentityRequest &&
|
||||
editIdentityRequest.oldDefaultIdentityIds != null
|
||||
) {
|
||||
setIdentityMethod.addUpdates(
|
||||
editIdentityRequest.oldDefaultIdentityIds!.generateMapUpdateObjectSortOrder(sortOrder: UnsignedInt(100))
|
||||
);
|
||||
}
|
||||
|
||||
final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
|
||||
@@ -128,7 +135,7 @@ class IdentityAPI {
|
||||
final setIdentityInvocation = requestBuilder.invocation(setIdentityMethod);
|
||||
|
||||
final response = await (requestBuilder
|
||||
..usings(capabilities))
|
||||
..usings(capabilitySupported))
|
||||
.build()
|
||||
.execute();
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
|
||||
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:jmap_dart_client/jmap/identities/identity.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/data/datasource/identity_data_source.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
|
||||
@@ -15,22 +16,22 @@ class IdentityRepositoryImpl extends IdentityRepository {
|
||||
IdentityRepositoryImpl(this._dataSource);
|
||||
|
||||
@override
|
||||
Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties}) {
|
||||
return _dataSource.getAllIdentities(accountId, properties: properties);
|
||||
Future<IdentitiesResponse> getAllIdentities(Session session, AccountId accountId, {Properties? properties}) {
|
||||
return _dataSource.getAllIdentities(session, accountId, properties: properties);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest) {
|
||||
return _dataSource.createNewIdentity(accountId, identityRequest);
|
||||
Future<Identity> createNewIdentity(Session session, AccountId accountId, CreateNewIdentityRequest identityRequest) {
|
||||
return _dataSource.createNewIdentity(session, accountId, identityRequest);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId) {
|
||||
return _dataSource.deleteIdentity(accountId, identityId);
|
||||
Future<bool> deleteIdentity(Session session, AccountId accountId, IdentityId identityId) {
|
||||
return _dataSource.deleteIdentity(session, accountId, identityId);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) {
|
||||
return _dataSource.editIdentity(accountId, editIdentityRequest);
|
||||
Future<bool> editIdentity(Session session, AccountId accountId, EditIdentityRequest editIdentityRequest) {
|
||||
return _dataSource.editIdentity(session, accountId, editIdentityRequest);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user