Fix do not show session expires dialog when enter autocomplete
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
@@ -4,10 +4,6 @@ export 'contact/model/contact.dart';
|
||||
export 'contact/model/contact_filter.dart';
|
||||
export 'contact/model/tmail_contact.dart';
|
||||
|
||||
export 'data/network/contact_api.dart';
|
||||
export 'data/datasource/auto_complete_datasource.dart';
|
||||
export 'data/datasource_impl/tmail_contact_datasource_impl.dart';
|
||||
|
||||
export 'contact/autocomplete/autocomplete_tmail_contact_method.dart';
|
||||
export 'contact/autocomplete/autocomplete_tmail_contact_response.dart';
|
||||
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||
|
||||
abstract class AutoCompleteDataSource {
|
||||
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern);
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
|
||||
import 'package:contact/contact/model/tmail_contact.dart';
|
||||
import 'package:contact/data/datasource/auto_complete_datasource.dart';
|
||||
import 'package:contact/data/network/contact_api.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||
|
||||
class TMailContactDataSourceImpl extends AutoCompleteDataSource {
|
||||
|
||||
final ContactAPI _contactAPI;
|
||||
|
||||
TMailContactDataSourceImpl(this._contactAPI);
|
||||
|
||||
@override
|
||||
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern) {
|
||||
return Future.sync(() async {
|
||||
final listContacts = await _contactAPI.getAutoComplete(autoCompletePattern);
|
||||
return listContacts.map((contact) => contact.toEmailAddress()).toList();
|
||||
}).catchError((error) {
|
||||
throw error;
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
|
||||
import 'package:contact/contact/autocomplete/autocomplete_tmail_contact_method.dart';
|
||||
import 'package:contact/contact/autocomplete/autocomplete_tmail_contact_response.dart';
|
||||
import 'package:contact/contact/model/contact_filter.dart';
|
||||
import 'package:contact/contact/model/tmail_contact.dart';
|
||||
import 'package:jmap_dart_client/http/http_client.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||
import 'package:jmap_dart_client/jmap/jmap_request.dart';
|
||||
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||
|
||||
class ContactAPI {
|
||||
|
||||
final HttpClient _httpClient;
|
||||
|
||||
ContactAPI(this._httpClient);
|
||||
|
||||
Future<List<TMailContact>> getAutoComplete(AutoCompletePattern autoCompletePattern) async {
|
||||
final processingInvocation = ProcessingInvocation();
|
||||
final requestBuilder = JmapRequestBuilder(_httpClient, processingInvocation);
|
||||
|
||||
final autoCompleteMethod = AutoCompleteTMailContactMethod(
|
||||
autoCompletePattern.accountId!,
|
||||
ContactFilter(autoCompletePattern.word));
|
||||
|
||||
if (autoCompletePattern.limit != null) {
|
||||
autoCompleteMethod.addLimit(UnsignedInt(autoCompletePattern.limit!));
|
||||
}
|
||||
|
||||
final autoCompleteInvocation = requestBuilder.invocation(autoCompleteMethod);
|
||||
final response = await (requestBuilder
|
||||
..usings(autoCompleteMethod.requiredCapabilities))
|
||||
.build()
|
||||
.execute();
|
||||
|
||||
final result = response.parse<AutoCompleteTMailContactResponse>(
|
||||
autoCompleteInvocation.methodCallId,
|
||||
AutoCompleteTMailContactResponse.deserialize);
|
||||
|
||||
return result?.list ?? <TMailContact>[];
|
||||
}
|
||||
}
|
||||
@@ -1,54 +0,0 @@
|
||||
|
||||
import 'package:contact/contact/model/tmail_contact.dart';
|
||||
import 'package:contact/data/datasource_impl/tmail_contact_datasource_impl.dart';
|
||||
import 'package:contact/data/network/contact_api.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/id.dart';
|
||||
import 'package:mockito/mockito.dart';
|
||||
import 'package:mockito/annotations.dart';
|
||||
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||
|
||||
import 'tmail_contact_datasource_impl_test.mocks.dart';
|
||||
|
||||
@GenerateMocks([ContactAPI])
|
||||
void main() {
|
||||
final contact1 = TMailContact(
|
||||
'2',
|
||||
'',
|
||||
'',
|
||||
'marie@otherdomain.tld'
|
||||
);
|
||||
|
||||
final contact2 = TMailContact(
|
||||
'4',
|
||||
'Marie',
|
||||
'Dupond',
|
||||
'mdupond@linagora.com'
|
||||
);
|
||||
|
||||
group('tmail_contact_datasource_impl_test', () {
|
||||
late ContactAPI contactAPI;
|
||||
late TMailContactDataSourceImpl tmailContactDataSourceImpl;
|
||||
|
||||
setUp(() {
|
||||
contactAPI = MockContactAPI();
|
||||
tmailContactDataSourceImpl = TMailContactDataSourceImpl(contactAPI);
|
||||
});
|
||||
|
||||
test('getAutoComplete should return success with valid data', () async {
|
||||
when(contactAPI.getAutoComplete(
|
||||
AutoCompletePattern(
|
||||
word: 'marie',
|
||||
accountId: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')))
|
||||
)).thenAnswer((_) async => [contact1, contact2]);
|
||||
|
||||
final result = await tmailContactDataSourceImpl.getAutoComplete(
|
||||
AutoCompletePattern(
|
||||
word: 'marie',
|
||||
accountId: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')))
|
||||
);
|
||||
expect(result, [contact1.toEmailAddress(), contact2.toEmailAddress()]);
|
||||
});
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user