Skip to content

Commit b955902

Browse files
christyjacob4christyjacob4
authored
Merge pull request #30 from appwrite/dev
fix: remove content-type from GET requests
2 parents 0b2fc71 + 9ca0bc5 commit b955902

19 files changed

+134
-374
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
![Swift Package Manager](https://img.shields.io/github/v/release/appwrite/sdk-for-swift.svg?color=green&style=flat-square)
44
![License](https://img.shields.io/github/license/appwrite/sdk-for-swift.svg?style=flat-square)
5-
![Version](https://img.shields.io/badge/api%20version-1.6.1-blue.svg?style=flat-square)
5+
![Version](https://img.shields.io/badge/api%20version-1.6.2-blue.svg?style=flat-square)
66
[![Build Status](https://img.shields.io/travis/com/appwrite/sdk-generator?style=flat-square)](https://travis-ci.com/appwrite/sdk-generator)
77
[![Twitter Account](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
88
[![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord)
@@ -33,7 +33,7 @@ Add the package to your `Package.swift` dependencies:
3333

3434
```swift
3535
dependencies: [
36-
.package(url: "[email protected]:appwrite/sdk-for-swift.git", from: "8.0.0"),
36+
.package(url: "[email protected]:appwrite/sdk-for-swift.git", from: "9.0.0"),
3737
],
3838
```
3939

‎Sources/Appwrite/Client.swift

+5-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ open class Client {
2121
"x-sdk-name": "Swift",
2222
"x-sdk-platform": "server",
2323
"x-sdk-language": "swift",
24-
"x-sdk-version": "8.0.0",
24+
"x-sdk-version": "9.0.0",
2525
"x-appwrite-response-format": "1.6.0"
2626
]
2727

@@ -197,8 +197,11 @@ open class Client {
197197
/// @return Client
198198
///
199199
open func setEndpoint(_ endPoint: String) -> Client {
200-
self.endPoint = endPoint
200+
if !endPoint.hasPrefix("http://") && !endPoint.hasPrefix("https://") {
201+
fatalError("Invalid endpoint URL: \(endPoint)")
202+
}
201203

204+
self.endPoint = endPoint
202205
return self
203206
}
204207

‎Sources/Appwrite/Services/Account.swift

+9-27
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ open class Account: Service {
2121

2222
let apiParams: [String: Any] = [:]
2323

24-
let apiHeaders: [String: String] = [
25-
"content-type": "application/json"
26-
]
24+
let apiHeaders: [String: String] = [:]
2725

2826
let converter: (Any) -> AppwriteModels.User<T> = { response in
2927
return AppwriteModels.User.from(map: response as! [String: Any])
@@ -217,9 +215,7 @@ open class Account: Service {
217215
"queries": queries
218216
]
219217

220-
let apiHeaders: [String: String] = [
221-
"content-type": "application/json"
222-
]
218+
let apiHeaders: [String: String] = [:]
223219

224220
let converter: (Any) -> AppwriteModels.IdentityList = { response in
225221
return AppwriteModels.IdentityList.from(map: response as! [String: Any])
@@ -310,9 +306,7 @@ open class Account: Service {
310306
"queries": queries
311307
]
312308

313-
let apiHeaders: [String: String] = [
314-
"content-type": "application/json"
315-
]
309+
let apiHeaders: [String: String] = [:]
316310

317311
let converter: (Any) -> AppwriteModels.LogList = { response in
318312
return AppwriteModels.LogList.from(map: response as! [String: Any])
@@ -585,9 +579,7 @@ open class Account: Service {
585579

586580
let apiParams: [String: Any] = [:]
587581

588-
let apiHeaders: [String: String] = [
589-
"content-type": "application/json"
590-
]
582+
let apiHeaders: [String: String] = [:]
591583

592584
let converter: (Any) -> AppwriteModels.MfaFactors = { response in
593585
return AppwriteModels.MfaFactors.from(map: response as! [String: Any])
@@ -617,9 +609,7 @@ open class Account: Service {
617609

618610
let apiParams: [String: Any] = [:]
619611

620-
let apiHeaders: [String: String] = [
621-
"content-type": "application/json"
622-
]
612+
let apiHeaders: [String: String] = [:]
623613

624614
let converter: (Any) -> AppwriteModels.MfaRecoveryCodes = { response in
625615
return AppwriteModels.MfaRecoveryCodes.from(map: response as! [String: Any])
@@ -886,9 +876,7 @@ open class Account: Service {
886876

887877
let apiParams: [String: Any] = [:]
888878

889-
let apiHeaders: [String: String] = [
890-
"content-type": "application/json"
891-
]
879+
let apiHeaders: [String: String] = [:]
892880

893881
let converter: (Any) -> AppwriteModels.Preferences<T> = { response in
894882
return AppwriteModels.Preferences.from(map: response as! [String: Any])
@@ -1074,9 +1062,7 @@ open class Account: Service {
10741062

10751063
let apiParams: [String: Any] = [:]
10761064

1077-
let apiHeaders: [String: String] = [
1078-
"content-type": "application/json"
1079-
]
1065+
let apiHeaders: [String: String] = [:]
10801066

10811067
let converter: (Any) -> AppwriteModels.SessionList = { response in
10821068
return AppwriteModels.SessionList.from(map: response as! [String: Any])
@@ -1321,9 +1307,7 @@ open class Account: Service {
13211307

13221308
let apiParams: [String: Any] = [:]
13231309

1324-
let apiHeaders: [String: String] = [
1325-
"content-type": "application/json"
1326-
]
1310+
let apiHeaders: [String: String] = [:]
13271311

13281312
let converter: (Any) -> AppwriteModels.Session = { response in
13291313
return AppwriteModels.Session.from(map: response as! [String: Any])
@@ -1591,9 +1575,7 @@ open class Account: Service {
15911575
"project": client.config["project"]
15921576
]
15931577

1594-
let apiHeaders: [String: String] = [
1595-
"content-type": "application/json"
1596-
]
1578+
let apiHeaders: [String: String] = [:]
15971579

15981580
return try await client.redirect(
15991581
method: "GET",

‎Sources/Appwrite/Services/Avatars.swift

+7-21
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ open class Avatars: Service {
4444
"session": client.config["session"]
4545
]
4646

47-
let apiHeaders: [String: String] = [
48-
"content-type": "application/json"
49-
]
47+
let apiHeaders: [String: String] = [:]
5048

5149
return try await client.call(
5250
method: "GET",
@@ -90,9 +88,7 @@ open class Avatars: Service {
9088
"session": client.config["session"]
9189
]
9290

93-
let apiHeaders: [String: String] = [
94-
"content-type": "application/json"
95-
]
91+
let apiHeaders: [String: String] = [:]
9692

9793
return try await client.call(
9894
method: "GET",
@@ -122,9 +118,7 @@ open class Avatars: Service {
122118
"session": client.config["session"]
123119
]
124120

125-
let apiHeaders: [String: String] = [
126-
"content-type": "application/json"
127-
]
121+
let apiHeaders: [String: String] = [:]
128122

129123
return try await client.call(
130124
method: "GET",
@@ -169,9 +163,7 @@ open class Avatars: Service {
169163
"session": client.config["session"]
170164
]
171165

172-
let apiHeaders: [String: String] = [
173-
"content-type": "application/json"
174-
]
166+
let apiHeaders: [String: String] = [:]
175167

176168
return try await client.call(
177169
method: "GET",
@@ -214,9 +206,7 @@ open class Avatars: Service {
214206
"session": client.config["session"]
215207
]
216208

217-
let apiHeaders: [String: String] = [
218-
"content-type": "application/json"
219-
]
209+
let apiHeaders: [String: String] = [:]
220210

221211
return try await client.call(
222212
method: "GET",
@@ -267,9 +257,7 @@ open class Avatars: Service {
267257
"session": client.config["session"]
268258
]
269259

270-
let apiHeaders: [String: String] = [
271-
"content-type": "application/json"
272-
]
260+
let apiHeaders: [String: String] = [:]
273261

274262
return try await client.call(
275263
method: "GET",
@@ -307,9 +295,7 @@ open class Avatars: Service {
307295
"session": client.config["session"]
308296
]
309297

310-
let apiHeaders: [String: String] = [
311-
"content-type": "application/json"
312-
]
298+
let apiHeaders: [String: String] = [:]
313299

314300
return try await client.call(
315301
method: "GET",

‎Sources/Appwrite/Services/Databases.swift

+18-36
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ open class Databases: Service {
2828
"search": search
2929
]
3030

31-
let apiHeaders: [String: String] = [
32-
"content-type": "application/json"
33-
]
31+
let apiHeaders: [String: String] = [:]
3432

3533
let converter: (Any) -> AppwriteModels.DatabaseList = { response in
3634
return AppwriteModels.DatabaseList.from(map: response as! [String: Any])
@@ -101,9 +99,7 @@ open class Databases: Service {
10199

102100
let apiParams: [String: Any] = [:]
103101

104-
let apiHeaders: [String: String] = [
105-
"content-type": "application/json"
106-
]
102+
let apiHeaders: [String: String] = [:]
107103

108104
let converter: (Any) -> AppwriteModels.Database = { response in
109105
return AppwriteModels.Database.from(map: response as! [String: Any])
@@ -207,9 +203,7 @@ open class Databases: Service {
207203
"search": search
208204
]
209205

210-
let apiHeaders: [String: String] = [
211-
"content-type": "application/json"
212-
]
206+
let apiHeaders: [String: String] = [:]
213207

214208
let converter: (Any) -> AppwriteModels.CollectionList = { response in
215209
return AppwriteModels.CollectionList.from(map: response as! [String: Any])
@@ -294,9 +288,7 @@ open class Databases: Service {
294288

295289
let apiParams: [String: Any] = [:]
296290

297-
let apiHeaders: [String: String] = [
298-
"content-type": "application/json"
299-
]
291+
let apiHeaders: [String: String] = [:]
300292

301293
let converter: (Any) -> AppwriteModels.Collection = { response in
302294
return AppwriteModels.Collection.from(map: response as! [String: Any])
@@ -411,9 +403,7 @@ open class Databases: Service {
411403
"queries": queries
412404
]
413405

414-
let apiHeaders: [String: String] = [
415-
"content-type": "application/json"
416-
]
406+
let apiHeaders: [String: String] = [:]
417407

418408
let converter: (Any) -> AppwriteModels.AttributeList = { response in
419409
return AppwriteModels.AttributeList.from(map: response as! [String: Any])
@@ -893,9 +883,9 @@ open class Databases: Service {
893883
/// @param String collectionId
894884
/// @param String key
895885
/// @param Bool required
886+
/// @param Double default
896887
/// @param Double min
897888
/// @param Double max
898-
/// @param Double default
899889
/// @param String newKey
900890
/// @throws Exception
901891
/// @return array
@@ -905,9 +895,9 @@ open class Databases: Service {
905895
collectionId: String,
906896
key: String,
907897
`required`: Bool,
908-
min: Double,
909-
max: Double,
910898
`default`: Double? = nil,
899+
min: Double? = nil,
900+
max: Double? = nil,
911901
newKey: String? = nil
912902
) async throws -> AppwriteModels.AttributeFloat {
913903
let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/attributes/float/{key}"
@@ -1005,9 +995,9 @@ open class Databases: Service {
1005995
/// @param String collectionId
1006996
/// @param String key
1007997
/// @param Bool required
998+
/// @param Int default
1008999
/// @param Int min
10091000
/// @param Int max
1010-
/// @param Int default
10111001
/// @param String newKey
10121002
/// @throws Exception
10131003
/// @return array
@@ -1017,9 +1007,9 @@ open class Databases: Service {
10171007
collectionId: String,
10181008
key: String,
10191009
`required`: Bool,
1020-
min: Int,
1021-
max: Int,
10221010
`default`: Int? = nil,
1011+
min: Int? = nil,
1012+
max: Int? = nil,
10231013
newKey: String? = nil
10241014
) async throws -> AppwriteModels.AttributeInteger {
10251015
let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/attributes/integer/{key}"
@@ -1435,9 +1425,7 @@ open class Databases: Service {
14351425

14361426
let apiParams: [String: Any] = [:]
14371427

1438-
let apiHeaders: [String: String] = [
1439-
"content-type": "application/json"
1440-
]
1428+
let apiHeaders: [String: String] = [:]
14411429

14421430
return try await client.call(
14431431
method: "GET",
@@ -1549,9 +1537,7 @@ open class Databases: Service {
15491537
"queries": queries
15501538
]
15511539

1552-
let apiHeaders: [String: String] = [
1553-
"content-type": "application/json"
1554-
]
1540+
let apiHeaders: [String: String] = [:]
15551541

15561542
let converter: (Any) -> AppwriteModels.DocumentList<T> = { response in
15571543
return AppwriteModels.DocumentList.from(map: response as! [String: Any])
@@ -1594,6 +1580,7 @@ open class Databases: Service {
15941580
/// collection resource using either a [server
15951581
/// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
15961582
/// API or directly from your database console.
1583+
///
15971584
///
15981585
/// @param String databaseId
15991586
/// @param String collectionId
@@ -1643,6 +1630,7 @@ open class Databases: Service {
16431630
/// collection resource using either a [server
16441631
/// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
16451632
/// API or directly from your database console.
1633+
///
16461634
///
16471635
/// @param String databaseId
16481636
/// @param String collectionId
@@ -1696,9 +1684,7 @@ open class Databases: Service {
16961684
"queries": queries
16971685
]
16981686

1699-
let apiHeaders: [String: String] = [
1700-
"content-type": "application/json"
1701-
]
1687+
let apiHeaders: [String: String] = [:]
17021688

17031689
let converter: (Any) -> AppwriteModels.Document<T> = { response in
17041690
return AppwriteModels.Document.from(map: response as! [String: Any])
@@ -1869,9 +1855,7 @@ open class Databases: Service {
18691855
"queries": queries
18701856
]
18711857

1872-
let apiHeaders: [String: String] = [
1873-
"content-type": "application/json"
1874-
]
1858+
let apiHeaders: [String: String] = [:]
18751859

18761860
let converter: (Any) -> AppwriteModels.IndexList = { response in
18771861
return AppwriteModels.IndexList.from(map: response as! [String: Any])
@@ -1957,9 +1941,7 @@ open class Databases: Service {
19571941

19581942
let apiParams: [String: Any] = [:]
19591943

1960-
let apiHeaders: [String: String] = [
1961-
"content-type": "application/json"
1962-
]
1944+
let apiHeaders: [String: String] = [:]
19631945

19641946
let converter: (Any) -> AppwriteModels.Index = { response in
19651947
return AppwriteModels.Index.from(map: response as! [String: Any])

0 commit comments

Comments
 (0)