Skip to content

Commit 092fdc9

Browse files
christyjacob4christyjacob4
authored
Merge pull request #245 from appwrite/dev
fix: remove content-type from GET requests
2 parents c1b3841 + 6284b60 commit 092fdc9

File tree

12 files changed

+53
-32
lines changed

12 files changed

+53
-32
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Add this to your package's `pubspec.yaml` file:
2121

2222
```yml
2323
dependencies:
24-
appwrite: ^15.0.0
24+
appwrite: ^15.0.1
2525
```
2626
2727
You can install packages from the command line:

‎lib/services/account.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Account extends Service {
1111

1212
final Map<String, dynamic> apiParams = {};
1313

14-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
14+
final Map<String, String> apiHeaders = {};
1515

1616
final res = await client.call(
1717
HttpMethod.get,
@@ -94,7 +94,7 @@ class Account extends Service {
9494

9595
final Map<String, dynamic> apiParams = {'queries': queries};
9696

97-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
97+
final Map<String, String> apiHeaders = {};
9898

9999
final res = await client.call(
100100
HttpMethod.get,
@@ -156,7 +156,7 @@ class Account extends Service {
156156

157157
final Map<String, dynamic> apiParams = {'queries': queries};
158158

159-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
159+
final Map<String, String> apiHeaders = {};
160160

161161
final res = await client.call(
162162
HttpMethod.get,
@@ -315,7 +315,7 @@ class Account extends Service {
315315

316316
final Map<String, dynamic> apiParams = {};
317317

318-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
318+
final Map<String, String> apiHeaders = {};
319319

320320
final res = await client.call(
321321
HttpMethod.get,
@@ -336,7 +336,7 @@ class Account extends Service {
336336

337337
final Map<String, dynamic> apiParams = {};
338338

339-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
339+
final Map<String, String> apiHeaders = {};
340340

341341
final res = await client.call(
342342
HttpMethod.get,
@@ -469,7 +469,7 @@ class Account extends Service {
469469

470470
final Map<String, dynamic> apiParams = {};
471471

472-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
472+
final Map<String, String> apiHeaders = {};
473473

474474
final res = await client.call(
475475
HttpMethod.get,
@@ -571,7 +571,7 @@ class Account extends Service {
571571

572572
final Map<String, dynamic> apiParams = {};
573573

574-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
574+
final Map<String, String> apiHeaders = {};
575575

576576
final res = await client.call(
577577
HttpMethod.get,
@@ -795,7 +795,7 @@ class Account extends Service {
795795

796796
final Map<String, dynamic> apiParams = {};
797797

798-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
798+
final Map<String, String> apiHeaders = {};
799799

800800
final res = await client.call(
801801
HttpMethod.get,

‎lib/services/databases.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Databases extends Service {
2020

2121
final Map<String, dynamic> apiParams = {'queries': queries};
2222

23-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
23+
final Map<String, String> apiHeaders = {};
2424

2525
final res = await client.call(
2626
HttpMethod.get,
@@ -36,6 +36,7 @@ class Databases extends Service {
3636
/// collection resource using either a [server
3737
/// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
3838
/// API or directly from your database console.
39+
///
3940
Future<models.Document> createDocument({
4041
required String databaseId,
4142
required String collectionId,
@@ -82,7 +83,7 @@ class Databases extends Service {
8283

8384
final Map<String, dynamic> apiParams = {'queries': queries};
8485

85-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
86+
final Map<String, String> apiHeaders = {};
8687

8788
final res = await client.call(
8889
HttpMethod.get,

‎lib/services/functions.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Functions extends Service {
2323
'search': search,
2424
};
2525

26-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
26+
final Map<String, String> apiHeaders = {};
2727

2828
final res = await client.call(
2929
HttpMethod.get,
@@ -85,7 +85,7 @@ class Functions extends Service {
8585

8686
final Map<String, dynamic> apiParams = {};
8787

88-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
88+
final Map<String, String> apiHeaders = {};
8989

9090
final res = await client.call(
9191
HttpMethod.get,

‎lib/services/locale.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Locale extends Service {
1717

1818
final Map<String, dynamic> apiParams = {};
1919

20-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
20+
final Map<String, String> apiHeaders = {};
2121

2222
final res = await client.call(
2323
HttpMethod.get,
@@ -36,7 +36,7 @@ class Locale extends Service {
3636

3737
final Map<String, dynamic> apiParams = {};
3838

39-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
39+
final Map<String, String> apiHeaders = {};
4040

4141
final res = await client.call(
4242
HttpMethod.get,
@@ -55,7 +55,7 @@ class Locale extends Service {
5555

5656
final Map<String, dynamic> apiParams = {};
5757

58-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
58+
final Map<String, String> apiHeaders = {};
5959

6060
final res = await client.call(
6161
HttpMethod.get,
@@ -74,7 +74,7 @@ class Locale extends Service {
7474

7575
final Map<String, dynamic> apiParams = {};
7676

77-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
77+
final Map<String, String> apiHeaders = {};
7878

7979
final res = await client.call(
8080
HttpMethod.get,
@@ -93,7 +93,7 @@ class Locale extends Service {
9393

9494
final Map<String, dynamic> apiParams = {};
9595

96-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
96+
final Map<String, String> apiHeaders = {};
9797

9898
final res = await client.call(
9999
HttpMethod.get,
@@ -112,7 +112,7 @@ class Locale extends Service {
112112

113113
final Map<String, dynamic> apiParams = {};
114114

115-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
115+
final Map<String, String> apiHeaders = {};
116116

117117
final res = await client.call(
118118
HttpMethod.get,
@@ -132,7 +132,7 @@ class Locale extends Service {
132132

133133
final Map<String, dynamic> apiParams = {};
134134

135-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
135+
final Map<String, String> apiHeaders = {};
136136

137137
final res = await client.call(
138138
HttpMethod.get,
@@ -151,7 +151,7 @@ class Locale extends Service {
151151

152152
final Map<String, dynamic> apiParams = {};
153153

154-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
154+
final Map<String, String> apiHeaders = {};
155155

156156
final res = await client.call(
157157
HttpMethod.get,

‎lib/services/storage.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Storage extends Service {
2222
'search': search,
2323
};
2424

25-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
25+
final Map<String, String> apiHeaders = {};
2626

2727
final res = await client.call(
2828
HttpMethod.get,
@@ -101,7 +101,7 @@ class Storage extends Service {
101101

102102
final Map<String, dynamic> apiParams = {};
103103

104-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
104+
final Map<String, String> apiHeaders = {};
105105

106106
final res = await client.call(
107107
HttpMethod.get,

‎lib/services/teams.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Teams extends Service {
1616
'search': search,
1717
};
1818

19-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
19+
final Map<String, String> apiHeaders = {};
2020

2121
final res = await client.call(
2222
HttpMethod.get,
@@ -62,7 +62,7 @@ class Teams extends Service {
6262

6363
final Map<String, dynamic> apiParams = {};
6464

65-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
65+
final Map<String, String> apiHeaders = {};
6666

6767
final res = await client.call(
6868
HttpMethod.get,
@@ -132,7 +132,7 @@ class Teams extends Service {
132132
'search': search,
133133
};
134134

135-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
135+
final Map<String, String> apiHeaders = {};
136136

137137
final res = await client.call(
138138
HttpMethod.get,
@@ -213,7 +213,7 @@ class Teams extends Service {
213213

214214
final Map<String, dynamic> apiParams = {};
215215

216-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
216+
final Map<String, String> apiHeaders = {};
217217

218218
final res = await client.call(
219219
HttpMethod.get,
@@ -319,7 +319,7 @@ class Teams extends Service {
319319

320320
final Map<String, dynamic> apiParams = {};
321321

322-
final Map<String, String> apiHeaders = {'content-type': 'application/json'};
322+
final Map<String, String> apiHeaders = {};
323323

324324
final res = await client.call(
325325
HttpMethod.get,

‎lib/src/client_browser.dart‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ClientBrowser extends ClientBase with ClientMixin {
4040
'x-sdk-name': 'Flutter',
4141
'x-sdk-platform': 'client',
4242
'x-sdk-language': 'flutter',
43-
'x-sdk-version': '15.0.0',
43+
'x-sdk-version': '15.0.1',
4444
'X-Appwrite-Response-Format': '1.6.0',
4545
};
4646

@@ -94,15 +94,24 @@ class ClientBrowser extends ClientBase with ClientMixin {
9494

9595
@override
9696
ClientBrowser setEndpoint(String endPoint) {
97+
if (!endPoint.startsWith('http://') && !endPoint.startsWith('https://')) {
98+
throw AppwriteException('Invalid endpoint URL: $endPoint');
99+
}
100+
97101
_endPoint = endPoint;
98102
_endPointRealtime = endPoint
99103
.replaceFirst('https://', 'wss://')
100104
.replaceFirst('http://', 'ws://');
105+
101106
return this;
102107
}
103108

104109
@override
105110
ClientBrowser setEndPointRealtime(String endPoint) {
111+
if (!endPoint.startsWith('ws://') && !endPoint.startsWith('wss://')) {
112+
throw AppwriteException('Invalid realtime endpoint URL: $endPoint');
113+
}
114+
106115
_endPointRealtime = endPoint;
107116
return this;
108117
}

‎lib/src/client_io.dart‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class ClientIO extends ClientBase with ClientMixin {
5959
'x-sdk-name': 'Flutter',
6060
'x-sdk-platform': 'client',
6161
'x-sdk-language': 'flutter',
62-
'x-sdk-version': '15.0.0',
62+
'x-sdk-version': '15.0.1',
6363
'X-Appwrite-Response-Format': '1.6.0',
6464
};
6565

@@ -124,15 +124,24 @@ class ClientIO extends ClientBase with ClientMixin {
124124

125125
@override
126126
ClientIO setEndpoint(String endPoint) {
127+
if (!endPoint.startsWith('http://') && !endPoint.startsWith('https://')) {
128+
throw AppwriteException('Invalid endpoint URL: $endPoint');
129+
}
130+
127131
_endPoint = endPoint;
128132
_endPointRealtime = endPoint
129133
.replaceFirst('https://', 'wss://')
130134
.replaceFirst('http://', 'ws://');
135+
131136
return this;
132137
}
133138

134139
@override
135140
ClientIO setEndPointRealtime(String endPoint) {
141+
if (!endPoint.startsWith('ws://') && !endPoint.startsWith('wss://')) {
142+
throw AppwriteException('Invalid realtime endpoint URL: $endPoint');
143+
}
144+
136145
_endPointRealtime = endPoint;
137146
return this;
138147
}

‎lib/src/enums/credit_card.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ enum CreditCard {
1616
unionChinaPay(value: 'union-china-pay'),
1717
visa(value: 'visa'),
1818
mIR(value: 'mir'),
19-
maestro(value: 'maestro');
19+
maestro(value: 'maestro'),
20+
rupay(value: 'rupay');
2021

2122
const CreditCard({required this.value});
2223

0 commit comments

Comments
 (0)