TF-561 Fix edit identity

This commit is contained in:
dab246
2022-05-16 18:46:27 +07:00
committed by Dat H. Pham
parent 29a5649a84
commit 0d40f765e6
18 changed files with 333 additions and 117 deletions
@@ -1,15 +1,16 @@
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/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 ManageAccountDataSource {
Future<IdentitiesResponse> getAllIdentities(AccountId accountId);
Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties});
Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest);
Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId);
Future<Identity> editIdentity(AccountId accountId, EditIdentityRequest identityRequest);
Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest);
}
@@ -1,4 +1,5 @@
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/identities/identity.dart';
import 'package:tmail_ui_user/features/manage_account/data/datasource/manage_account_datasource.dart';
import 'package:tmail_ui_user/features/manage_account/data/network/manage_account_api.dart';
@@ -13,9 +14,9 @@ class ManageAccountDataSourceImpl extends ManageAccountDataSource {
ManageAccountDataSourceImpl(this.manageAccountAPI);
@override
Future<IdentitiesResponse> getAllIdentities(AccountId accountId) {
Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties}) {
return Future.sync(() async {
return await manageAccountAPI.getAllIdentities(accountId);
return await manageAccountAPI.getAllIdentities(accountId, properties: properties);
}).catchError((error) {
throw error;
});
@@ -40,9 +41,9 @@ class ManageAccountDataSourceImpl extends ManageAccountDataSource {
}
@override
Future<Identity> editIdentity(AccountId accountId, EditIdentityRequest identityRequest) {
Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) {
return Future.sync(() async {
return await manageAccountAPI.editIdentity(accountId, identityRequest);
return await manageAccountAPI.editIdentity(accountId, editIdentityRequest);
}).catchError((error) {
throw error;
});
@@ -3,6 +3,7 @@ import 'dart:async';
import 'package:jmap_dart_client/http/http_client.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/patch_object.dart';
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
import 'package:jmap_dart_client/jmap/identities/get/get_identity_method.dart';
import 'package:jmap_dart_client/jmap/identities/get/get_identity_response.dart';
import 'package:jmap_dart_client/jmap/identities/identity.dart';
@@ -19,10 +20,13 @@ class ManageAccountAPI {
ManageAccountAPI(this._httpClient);
Future<IdentitiesResponse> getAllIdentities(AccountId accountId) async {
Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties}) async {
final processingInvocation = ProcessingInvocation();
final jmapRequestBuilder = JmapRequestBuilder(_httpClient, processingInvocation);
final getIdentityMethod = GetIdentityMethod(accountId);
if (properties != null) {
getIdentityMethod.addProperties(properties);
}
final queryInvocation = jmapRequestBuilder.invocation(getIdentityMethod);
final result = await (jmapRequestBuilder
@@ -85,10 +89,10 @@ class ManageAccountAPI {
});
}
Future<Identity> editIdentity(AccountId accountId, EditIdentityRequest identityRequest) async {
Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) async {
final setIdentityMethod = SetIdentityMethod(accountId)
..addUpdates({
identityRequest.identityId.id : PatchObject({})
editIdentityRequest.identityId.id : PatchObject(editIdentityRequest.identityRequest.toJson())
});
final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
@@ -105,7 +109,7 @@ class ManageAccountAPI {
SetIdentityResponse.deserialize);
return Future.sync(() async {
return setIdentityResponse!.updated![identityRequest.identityId]!;
return setIdentityResponse?.updated?.containsKey(editIdentityRequest.identityId.id) == true;
}).catchError((error) {
throw error;
});
@@ -1,4 +1,5 @@
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/identities/identity.dart';
import 'package:tmail_ui_user/features/manage_account/data/datasource/manage_account_datasource.dart';
import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
@@ -13,8 +14,8 @@ class ManageAccountRepositoryImpl extends ManageAccountRepository {
ManageAccountRepositoryImpl(this.dataSource);
@override
Future<IdentitiesResponse> getAllIdentities(AccountId accountId) {
return dataSource.getAllIdentities(accountId);
Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties}) {
return dataSource.getAllIdentities(accountId, properties: properties);
}
@override
@@ -28,7 +29,7 @@ class ManageAccountRepositoryImpl extends ManageAccountRepository {
}
@override
Future<Identity> editIdentity(AccountId accountId, EditIdentityRequest identityRequest) {
return dataSource.editIdentity(accountId, identityRequest);
Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) {
return dataSource.editIdentity(accountId, editIdentityRequest);
}
}