Skip to content

Commit 1329a36

Browse files
committed
[Fastmail interoperation] Update ResultReference with absolute json pointers
1 parent 7ac4ccf commit 1329a36

9 files changed

+21
-24
lines changed

lib/jmap/core/request/reference_path.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import 'package:equatable/equatable.dart';
22

33
class ReferencePath with EquatableMixin {
4-
static ReferencePath idsPath = ReferencePath('ids/*');
5-
static ReferencePath createdPath = ReferencePath('created/*');
6-
static ReferencePath updatedPath = ReferencePath('updated/*');
4+
static ReferencePath idsPath = ReferencePath('/ids/*');
5+
static ReferencePath createdPath = ReferencePath('/created/*');
6+
static ReferencePath updatedPath = ReferencePath('/updated/*');
77
static ReferencePath updatedPropertiesPath = ReferencePath('updatedProperties');
88

99
final String value;

test/jmap/email/get_list_email_test.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void main() {
209209
"#ids": {
210210
"resultOf": "c2",
211211
"name": "Email/query",
212-
"path": "ids/*"
212+
"path": "/ids/*"
213213
},
214214
"properties": [
215215
"id",
@@ -227,8 +227,7 @@ void main() {
227227
},
228228
headers: {
229229
"accept": "application/json;jmapVersion=rfc-8621",
230-
"content-type": "application/json; charset=utf-8",
231-
"content-length": 555
230+
"content-type": "application/json; charset=utf-8"
232231
}
233232
);
234233

test/jmap/email/query/query_with_operator_emails_test.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void main() {
209209
"#ids": {
210210
"resultOf": "c2",
211211
"name": "Email/query",
212-
"path": "ids/*"
212+
"path": "/ids/*"
213213
},
214214
"properties": [
215215
"id",
@@ -227,8 +227,7 @@ void main() {
227227
},
228228
headers: {
229229
"accept": "application/json;jmapVersion=rfc-8621",
230-
"content-type": "application/json; charset=utf-8",
231-
"content-length": 581
230+
"content-type": "application/json; charset=utf-8"
232231
});
233232

234233
final httpClient = HttpClient(dio);

test/jmap/email/search/use_case_test/search_by_after_use_case_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:jmap_dart_client/jmap/core/id.dart';
77
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
88
import 'package:jmap_dart_client/jmap/core/request/reference_path.dart';
99
import 'package:jmap_dart_client/jmap/core/request/request_invocation.dart';
10+
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
1011
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
1112
import 'package:jmap_dart_client/jmap/core/utc_date.dart';
1213
import 'package:jmap_dart_client/jmap/jmap_request.dart';
@@ -18,7 +19,6 @@ import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
1819
import 'package:jmap_dart_client/jmap/mail/email/get/get_email_method.dart';
1920
import 'package:jmap_dart_client/jmap/mail/email/get/get_email_response.dart';
2021
import 'package:jmap_dart_client/jmap/mail/email/query/query_email_method.dart';
21-
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
2222

2323
void main() {
2424
final expectMail = Email(EmailId(Id("04f27c50-e879-11ec-aae4-43ebf0340ebd")),
@@ -101,7 +101,7 @@ void main() {
101101
"#ids": {
102102
"resultOf": "c1",
103103
"name": "Email/query",
104-
"path": "ids/*"
104+
"path": "/ids/*"
105105
},
106106
"properties": [
107107
"id",

test/jmap/email/search/use_case_test/search_by_form_use_case_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:jmap_dart_client/jmap/core/id.dart';
77
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
88
import 'package:jmap_dart_client/jmap/core/request/reference_path.dart';
99
import 'package:jmap_dart_client/jmap/core/request/request_invocation.dart';
10+
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
1011
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
1112
import 'package:jmap_dart_client/jmap/core/utc_date.dart';
1213
import 'package:jmap_dart_client/jmap/jmap_request.dart';
@@ -18,7 +19,6 @@ import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
1819
import 'package:jmap_dart_client/jmap/mail/email/get/get_email_method.dart';
1920
import 'package:jmap_dart_client/jmap/mail/email/get/get_email_response.dart';
2021
import 'package:jmap_dart_client/jmap/mail/email/query/query_email_method.dart';
21-
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
2222

2323
void main() {
2424
final expectMail = Email(EmailId(Id("04f27c50-e879-11ec-aae4-43ebf0340ebd")),
@@ -101,7 +101,7 @@ void main() {
101101
"#ids": {
102102
"resultOf": "c1",
103103
"name": "Email/query",
104-
"path": "ids/*"
104+
"path": "/ids/*"
105105
},
106106
"properties": [
107107
"id",

test/jmap/email/search/use_case_test/search_by_time_and_text_use_case_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:jmap_dart_client/jmap/core/id.dart';
77
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
88
import 'package:jmap_dart_client/jmap/core/request/reference_path.dart';
99
import 'package:jmap_dart_client/jmap/core/request/request_invocation.dart';
10+
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
1011
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
1112
import 'package:jmap_dart_client/jmap/core/utc_date.dart';
1213
import 'package:jmap_dart_client/jmap/jmap_request.dart';
@@ -18,7 +19,6 @@ import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
1819
import 'package:jmap_dart_client/jmap/mail/email/get/get_email_method.dart';
1920
import 'package:jmap_dart_client/jmap/mail/email/get/get_email_response.dart';
2021
import 'package:jmap_dart_client/jmap/mail/email/query/query_email_method.dart';
21-
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
2222

2323
void main() {
2424
final expectMail = Email(EmailId(Id("04f27c50-e879-11ec-aae4-43ebf0340ebd")),
@@ -106,7 +106,7 @@ void main() {
106106
"#ids": {
107107
"resultOf": "c1",
108108
"name": "Email/query",
109-
"path": "ids/*"
109+
"path": "/ids/*"
110110
},
111111
"properties": [
112112
"id",

test/jmap/email/search/use_case_test/search_emails_inbox_use_case_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:jmap_dart_client/jmap/core/id.dart';
77
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
88
import 'package:jmap_dart_client/jmap/core/request/reference_path.dart';
99
import 'package:jmap_dart_client/jmap/core/request/request_invocation.dart';
10+
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
1011
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
1112
import 'package:jmap_dart_client/jmap/core/utc_date.dart';
1213
import 'package:jmap_dart_client/jmap/jmap_request.dart';
@@ -18,7 +19,6 @@ import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
1819
import 'package:jmap_dart_client/jmap/mail/email/get/get_email_method.dart';
1920
import 'package:jmap_dart_client/jmap/mail/email/get/get_email_response.dart';
2021
import 'package:jmap_dart_client/jmap/mail/email/query/query_email_method.dart';
21-
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
2222
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
2323

2424
void main() {
@@ -167,7 +167,7 @@ void main() {
167167
"#ids": {
168168
"resultOf": "c2",
169169
"name": "Email/query",
170-
"path": "ids/*"
170+
"path": "/ids/*"
171171
},
172172
"properties": [
173173
"id",

test/jmap/email/sort_list_email_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:jmap_dart_client/jmap/core/id.dart';
88
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
99
import 'package:jmap_dart_client/jmap/core/request/reference_path.dart';
1010
import 'package:jmap_dart_client/jmap/core/request/request_invocation.dart';
11+
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
1112
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
1213
import 'package:jmap_dart_client/jmap/core/utc_date.dart';
1314
import 'package:jmap_dart_client/jmap/jmap_request.dart';
@@ -20,7 +21,6 @@ import 'package:jmap_dart_client/jmap/mail/email/get/get_email_method.dart';
2021
import 'package:jmap_dart_client/jmap/mail/email/get/get_email_response.dart';
2122
import 'package:jmap_dart_client/jmap/mail/email/query/query_email_method.dart';
2223
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
23-
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
2424

2525
void main() {
2626

@@ -220,7 +220,7 @@ void main() {
220220
"#ids": {
221221
"resultOf": "c2",
222222
"name": "Email/query",
223-
"path": "ids/*"
223+
"path": "/ids/*"
224224
},
225225
"properties": [
226226
"id",

test/jmap/mailbox/changes/get_changes_mailbox_test.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void main() {
131131
"#ids": {
132132
"resultOf": "c0",
133133
"name": "Mailbox/changes",
134-
"path": "updated/*"
134+
"path": "/updated/*"
135135
}
136136
},
137137
"c1"
@@ -143,7 +143,7 @@ void main() {
143143
"#ids": {
144144
"resultOf": "c0",
145145
"name": "Mailbox/changes",
146-
"path": "destroyed/*"
146+
"path": "/destroyed/*"
147147
}
148148
},
149149
"c2"
@@ -152,8 +152,7 @@ void main() {
152152
},
153153
headers: {
154154
"accept": "application/json;jmapVersion=rfc-8621",
155-
"content-type": "application/json; charset=utf-8",
156-
"content-length": 585
155+
"content-type": "application/json; charset=utf-8"
157156
});
158157

159158
final HttpClient httpClient = HttpClient(dio);
@@ -183,7 +182,7 @@ void main() {
183182
final getMailboxMethodForDestroyed = GetMailboxMethod(accountId)
184183
..addReferenceIds(processingInvocation.createResultReference(
185184
changesMailboxInvocation.methodCallId,
186-
ReferencePath('destroyed/*'),
185+
ReferencePath('/destroyed/*'),
187186
));
188187
final getMailboxForDestroyInvocation = jmapRequestBuilder.invocation(
189188
getMailboxMethodForDestroyed,

0 commit comments

Comments
 (0)