Skip to content

fix: remove content-type from GET requests #71

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
Apr 17, 2025
Merged

fix: remove content-type from GET requests #71

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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

```swift
dependencies: [
.package(url: "[email protected]:appwrite/sdk-for-apple.git", from: "9.0.0"),
.package(url: "[email protected]:appwrite/sdk-for-apple.git", from: "9.0.1"),
],
```

Expand Down
20 changes: 12 additions & 8 deletions Sources/Appwrite/Client.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ open class Client {
"x-sdk-name": "Apple",
"x-sdk-platform": "client",
"x-sdk-language": "apple",
"x-sdk-version": "9.0.0",
"x-sdk-version": "9.0.1",
"x-appwrite-response-format": "1.6.0"
]

Expand Down Expand Up @@ -170,14 +170,15 @@ open class Client {
/// @return Client
///
open func setEndpoint(_ endPoint: String) -> Client {
self.endPoint = endPoint

if (self.endPointRealtime == nil && endPoint.starts(with: "http")) {
self.endPointRealtime = endPoint
.replacingOccurrences(of: "http://", with: "ws://")
.replacingOccurrences(of: "https://", with: "wss://")
if !endPoint.hasPrefix("http://") && !endPoint.hasPrefix("https://") {
fatalError("Invalid endpoint URL: \(endPoint)")
}

self.endPoint = endPoint
self.endPointRealtime = endPoint
.replacingOccurrences(of: "http://", with: "ws://")
.replacingOccurrences(of: "https://", with: "wss://")

return self
}

Expand All @@ -189,8 +190,11 @@ open class Client {
/// @return Client
///
open func setEndpointRealtime(_ endPoint: String) -> Client {
self.endPointRealtime = endPoint
if !endPoint.hasPrefix("ws://") && !endPoint.hasPrefix("wss://") {
fatalError("Invalid realtime endpoint URL: \(endPoint)")
}

self.endPointRealtime = endPoint
return self
}

Expand Down
32 changes: 8 additions & 24 deletions Sources/Appwrite/Services/Account.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ open class Account: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

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

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

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

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

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

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

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

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.SessionList = { response in
return AppwriteModels.SessionList.from(map: response as! [String: Any])
Expand Down Expand Up @@ -1380,9 +1366,7 @@ open class Account: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.Session = { response in
return AppwriteModels.Session.from(map: response as! [String: Any])
Expand Down
10 changes: 4 additions & 6 deletions Sources/Appwrite/Services/Databases.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ open class Databases: Service {
"queries": queries
]

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.DocumentList<T> = { response in
return AppwriteModels.DocumentList.from(map: response as! [String: Any])
Expand Down Expand Up @@ -77,6 +75,7 @@ open class Databases: Service {
/// collection resource using either a [server
/// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
/// API or directly from your database console.
///
///
/// @param String databaseId
/// @param String collectionId
Expand Down Expand Up @@ -126,6 +125,7 @@ open class Databases: Service {
/// collection resource using either a [server
/// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
/// API or directly from your database console.
///
///
/// @param String databaseId
/// @param String collectionId
Expand Down Expand Up @@ -179,9 +179,7 @@ open class Databases: Service {
"queries": queries
]

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.Document<T> = { response in
return AppwriteModels.Document.from(map: response as! [String: Any])
Expand Down
8 changes: 2 additions & 6 deletions Sources/Appwrite/Services/Functions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ open class Functions: Service {
"search": search
]

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.ExecutionList = { response in
return AppwriteModels.ExecutionList.from(map: response as! [String: Any])
Expand Down Expand Up @@ -120,9 +118,7 @@ open class Functions: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.Execution = { response in
return AppwriteModels.Execution.from(map: response as! [String: Any])
Expand Down
32 changes: 8 additions & 24 deletions Sources/Appwrite/Services/Locale.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ open class Locale: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.Locale = { response in
return AppwriteModels.Locale.from(map: response as! [String: Any])
Expand Down Expand Up @@ -55,9 +53,7 @@ open class Locale: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.LocaleCodeList = { response in
return AppwriteModels.LocaleCodeList.from(map: response as! [String: Any])
Expand Down Expand Up @@ -85,9 +81,7 @@ open class Locale: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.ContinentList = { response in
return AppwriteModels.ContinentList.from(map: response as! [String: Any])
Expand Down Expand Up @@ -115,9 +109,7 @@ open class Locale: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.CountryList = { response in
return AppwriteModels.CountryList.from(map: response as! [String: Any])
Expand Down Expand Up @@ -145,9 +137,7 @@ open class Locale: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.CountryList = { response in
return AppwriteModels.CountryList.from(map: response as! [String: Any])
Expand Down Expand Up @@ -175,9 +165,7 @@ open class Locale: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.PhoneList = { response in
return AppwriteModels.PhoneList.from(map: response as! [String: Any])
Expand Down Expand Up @@ -206,9 +194,7 @@ open class Locale: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.CurrencyList = { response in
return AppwriteModels.CurrencyList.from(map: response as! [String: Any])
Expand Down Expand Up @@ -236,9 +222,7 @@ open class Locale: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.LanguageList = { response in
return AppwriteModels.LanguageList.from(map: response as! [String: Any])
Expand Down
8 changes: 2 additions & 6 deletions Sources/Appwrite/Services/Storage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ open class Storage: Service {
"search": search
]

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.FileList = { response in
return AppwriteModels.FileList.from(map: response as! [String: Any])
Expand Down Expand Up @@ -131,9 +129,7 @@ open class Storage: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.File = { response in
return AppwriteModels.File.from(map: response as! [String: Any])
Expand Down
20 changes: 5 additions & 15 deletions Sources/Appwrite/Services/Teams.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ open class Teams: Service {
"search": search
]

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.TeamList<T> = { response in
return AppwriteModels.TeamList.from(map: response as! [String: Any])
Expand Down Expand Up @@ -148,9 +146,7 @@ open class Teams: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.Team<T> = { response in
return AppwriteModels.Team.from(map: response as! [String: Any])
Expand Down Expand Up @@ -288,9 +284,7 @@ open class Teams: Service {
"search": search
]

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.MembershipList = { response in
return AppwriteModels.MembershipList.from(map: response as! [String: Any])
Expand Down Expand Up @@ -396,9 +390,7 @@ open class Teams: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]

let converter: (Any) -> AppwriteModels.Membership = { response in
return AppwriteModels.Membership.from(map: response as! [String: Any])
Expand Down Expand Up @@ -552,9 +544,7 @@ open class Teams: Service {

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

let apiHeaders: [String: String] = [
"content-type": "application/json"
]
let apiHeaders: [String: String] = [:]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Im not sure this is valid syntax


let converter: (Any) -> AppwriteModels.Preferences<T> = { response in
return AppwriteModels.Preferences.from(map: response as! [String: Any])
Expand Down
1 change: 1 addition & 0 deletions Sources/AppwriteEnums/CreditCard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public enum CreditCard: String, CustomStringConvertible {
case visa = "visa"
case mIR = "mir"
case maestro = "maestro"
case rupay = "rupay"

public var description: String {
return rawValue
Expand Down
1 change: 1 addition & 0 deletions Sources/AppwriteEnums/OAuthProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public enum OAuthProvider: String, CustomStringConvertible {
case dropbox = "dropbox"
case etsy = "etsy"
case facebook = "facebook"
case figma = "figma"
case github = "github"
case gitlab = "gitlab"
case google = "google"
Expand Down