Skip to content

[Fastmail interoperation] #939 Add empty_capability.dart to handle empty capability #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2022
Merged

[Fastmail interoperation] #939 Add empty_capability.dart to handle empty capability #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/http/converter/capabilities_converter.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart
import 'package:jmap_dart_client/jmap/core/capability/capability_properties.dart';
import 'package:jmap_dart_client/jmap/core/capability/core_capability.dart';
import 'package:jmap_dart_client/jmap/core/capability/default_capability.dart';
import 'package:jmap_dart_client/jmap/core/capability/empty_capability.dart';
import 'package:jmap_dart_client/jmap/core/capability/mail_capability.dart';
import 'package:jmap_dart_client/jmap/core/capability/mdn_capability.dart';
import 'package:jmap_dart_client/jmap/core/capability/submission_capability.dart';
Expand Down Expand Up @@ -46,7 +47,11 @@ class CapabilitiesConverter {

final identifier = CapabilityIdentifier(Uri.parse(key));
if (mapCapabilitiesConverter!.containsKey(identifier)) {
return MapEntry(identifier, mapCapabilitiesConverter![identifier]!.call(value));
try {
return MapEntry(identifier, mapCapabilitiesConverter![identifier]!.call(value));
} catch (e) {
return MapEntry(identifier, EmptyCapability());
}
} else {
return MapEntry(identifier, DefaultCapability(value));
}
Expand Down
16 changes: 16 additions & 0 deletions lib/jmap/core/capability/empty_capability.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import 'package:jmap_dart_client/jmap/core/capability/capability_properties.dart';
import 'package:json_annotation/json_annotation.dart';

part 'empty_capability.g.dart';

@JsonSerializable()
class EmptyCapability extends CapabilityProperties {
EmptyCapability();

factory EmptyCapability.fromJson(Map<String, dynamic> json) => _$EmptyCapabilityFromJson(json);

Map<String, dynamic> toJson() => _$EmptyCapabilityToJson(this);

@override
List<Object?> get props => [];
}
13 changes: 13 additions & 0 deletions lib/jmap/core/capability/empty_capability.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

138 changes: 138 additions & 0 deletions test/jmap/core/session/session_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:jmap_dart_client/jmap/core/account/account.dart';
import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';
import 'package:jmap_dart_client/jmap/core/capability/core_capability.dart';
import 'package:jmap_dart_client/jmap/core/capability/default_capability.dart';
import 'package:jmap_dart_client/jmap/core/capability/empty_capability.dart';
import 'package:jmap_dart_client/jmap/core/capability/mail_capability.dart';
import 'package:jmap_dart_client/jmap/core/capability/mdn_capability.dart';
import 'package:jmap_dart_client/jmap/core/capability/submission_capability.dart';
Expand Down Expand Up @@ -845,4 +846,141 @@ void main() {
expect(parsedSession.capabilities[TestCapability.testCapabilityIdentifier], equals(testCapability));
});
});

group('get session with empty capability', () {
test('get should ignore parsing empty capability properties', () {
final sessionString = '''{
"capabilities": {
"urn:ietf:params:jmap:submission": {
"maxDelayedSend": 0,
"submissionExtensions": []
},
"urn:ietf:params:jmap:core": {
"maxSizeUpload": 20971520,
"maxConcurrentUpload": 4,
"maxSizeRequest": 10000000,
"maxConcurrentRequests": 4,
"maxCallsInRequest": 16,
"maxObjectsInGet": 500,
"maxObjectsInSet": 500,
"collationAlgorithms": [
"i;unicode-casemap"
]
},
"urn:ietf:params:jmap:mail": {}
},
"accounts": {
"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6": {
"name": "[email protected]",
"isPersonal": true,
"isReadOnly": false,
"accountCapabilities": {
"urn:ietf:params:jmap:submission": {
"maxDelayedSend": 0,
"submissionExtensions": []
},
"urn:ietf:params:jmap:core": {
"maxSizeUpload": 20971520,
"maxConcurrentUpload": 4,
"maxSizeRequest": 10000000,
"maxConcurrentRequests": 4,
"maxCallsInRequest": 16,
"maxObjectsInGet": 500,
"maxObjectsInSet": 500,
"collationAlgorithms": [
"i;unicode-casemap"
]
},
"urn:ietf:params:jmap:mail": {
"maxMailboxesPerEmail": 10000000,
"maxMailboxDepth": null,
"maxSizeMailboxName": 200,
"maxSizeAttachmentsPerEmail": 20000000,
"emailQuerySortOptions": [
"receivedAt",
"sentAt",
"size",
"from",
"to",
"subject"
],
"mayCreateTopLevelMailbox": true
}
}
}
},
"primaryAccounts": {
"urn:ietf:params:jmap:submission": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
"urn:ietf:params:jmap:core": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
"urn:ietf:params:jmap:mail": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6"
},
"username": "[email protected]",
"apiUrl": "http://domain.com/jmap",
"downloadUrl": "http://domain.com/download/{accountId}/{blobId}/?type={type}&name={name}",
"uploadUrl": "http://domain.com/upload/{accountId}",
"eventSourceUrl": "http://domain.com/eventSource?types={types}&closeAfter={closeafter}&ping={ping}",
"state": "2c9f1b12-b35a-43e6-9af2-0106fb53a943"
}''';

final Session expectedSession = Session(
{
CapabilityIdentifier.jmapSubmission: SubmissionCapability(UnsignedInt(0), Set()),
CapabilityIdentifier.jmapCore: CoreCapability(
UnsignedInt(20971520),
UnsignedInt(4),
UnsignedInt(10000000),
UnsignedInt(4),
UnsignedInt(16),
UnsignedInt(500),
UnsignedInt(500),
{CollationIdentifier("i;unicode-casemap")}
),
CapabilityIdentifier.jmapMail: EmptyCapability(),
},
{
AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')): Account(
AccountName('[email protected]'),
true,
false,
{
CapabilityIdentifier.jmapSubmission: SubmissionCapability(UnsignedInt(0), Set()),
CapabilityIdentifier.jmapCore: CoreCapability(
UnsignedInt(20971520),
UnsignedInt(4),
UnsignedInt(10000000),
UnsignedInt(4),
UnsignedInt(16),
UnsignedInt(500),
UnsignedInt(500),
{CollationIdentifier("i;unicode-casemap")}
),
CapabilityIdentifier.jmapMail: MailCapability(
UnsignedInt(10000000),
null,
UnsignedInt(200),
UnsignedInt(20000000),
{"receivedAt", "sentAt", "size", "from", "to", "subject"},
true
),
}
)
},
{
CapabilityIdentifier.jmapSubmission: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')),
CapabilityIdentifier.jmapCore: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')),
CapabilityIdentifier.jmapMail: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')),
},
UserName('[email protected]'),
Uri.parse('http://domain.com/jmap'),
Uri.parse('http://domain.com/download/{accountId}/{blobId}/?type={type}&name={name}'),
Uri.parse('http://domain.com/upload/{accountId}'),
Uri.parse('http://domain.com/eventSource?types={types}&closeAfter={closeafter}&ping={ping}'),
State('2c9f1b12-b35a-43e6-9af2-0106fb53a943')
);

final parsedSession = Session.fromJson(json.decode(sessionString));

expect(parsedSession, equals(expectedSession));
});
});
}