Add new push message parameters

Author: abnegate

README.md

@@ -2,7 +2,7 @@
 
 ![Swift Package Manager](https://img.shields.io/github/v/release/appwrite/sdk-for-swift.svg?color=green&style=flat-square)
 ![License](https://img.shields.io/github/license/appwrite/sdk-for-swift.svg?style=flat-square)
-![Version](https://img.shields.io/badge/api%20version-1.6.0-blue.svg?style=flat-square)
+![Version](https://img.shields.io/badge/api%20version-1.6.1-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)
@@ -33,7 +33,7 @@ Add the package to your `Package.swift` dependencies:
 
 ```swift
     dependencies: [
-        .package(url: "[email protected]:appwrite/sdk-for-swift.git", from: "6.1.0"),
+        .package(url: "[email protected]:appwrite/sdk-for-swift.git", from: "6.2.0"),
     ],
 ```
 

Sources/Appwrite/Client.swift

@@ -21,7 +21,7 @@ open class Client {
         "x-sdk-name": "Swift",
         "x-sdk-platform": "server",
         "x-sdk-language": "swift",
-        "x-sdk-version": "6.1.0",
+        "x-sdk-version": "6.2.0",
         "x-appwrite-response-format": "1.6.0"
     ]
 
@@ -530,23 +530,23 @@ open class Client {
             if param is String
                 || param is Int
                 || param is Float
+                || param is Double
                 || param is Bool
                 || param is [String]
                 || param is [Int]
                 || param is [Float]
+                || param is [Double]
                 || param is [Bool]
                 || param is [String: Any]
                 || param is [Int: Any]
                 || param is [Float: Any]
+                || param is [Double: Any]
                 || param is [Bool: Any] {
                 encodedParams[key] = param
-            } else {
-                let value = try! (param as! Encodable).toJson()
-
-                let range = value.index(value.startIndex, offsetBy: 1)..<value.index(value.endIndex, offsetBy: -1)
-                let substring = value[range]
-
-                encodedParams[key] = substring
+            } else if let encodable = param as? Encodable {
+                encodedParams[key] = try encodable.toJson()
+            } else if let param = param {
+                encodedParams[key] = String(describing: param)
             }
         }
 

Sources/Appwrite/Services/Account.swift

@@ -1596,9 +1596,7 @@ open class Account: Service {
     /// [POST
     /// /v1/account/sessions/token](https://appwrite.io/docs/references/cloud/client-web/account#createSession)
     /// endpoint to complete the login process. The link sent to the user's email
-    /// address is valid for 1 hour. If you are on a mobile device you can leave
-    /// the URL parameter empty, so that the login completion will be handled by
-    /// your Appwrite instance by default.
+    /// address is valid for 1 hour.
     /// 
     /// A user is limited to 10 active sessions at a time by default. [Learn more
     /// about session

Sources/Appwrite/Services/Functions.swift

@@ -720,7 +720,7 @@ open class Functions: Service {
     /// function execution process will start asynchronously.
     ///
     /// @param String functionId
-    /// @param payload body
+    /// @param String body
     /// @param Bool async
     /// @param String path
     /// @param AppwriteEnums.ExecutionMethod method
@@ -731,18 +731,17 @@ open class Functions: Service {
     ///
     open func createExecution(
         functionId: String,
-        body: payload? = nil,
+        body: String? = nil,
         async: Bool? = nil,
         path: String? = nil,
         method: AppwriteEnums.ExecutionMethod? = nil,
         headers: Any? = nil,
-        scheduledAt: String? = nil,
-        onProgress: ((UploadProgress) -> Void)? = nil
+        scheduledAt: String? = nil
     ) async throws -> AppwriteModels.Execution {
         let apiPath: String = "/functions/{functionId}/executions"
             .replacingOccurrences(of: "{functionId}", with: functionId)
 
-        var apiParams: [String: Any?] = [
+        let apiParams: [String: Any?] = [
             "body": body,
             "async": async,
             "path": path,
@@ -751,23 +750,20 @@ open class Functions: Service {
             "scheduledAt": scheduledAt
         ]
 
-        var apiHeaders: [String: String] = [
-            "content-type": "multipart/form-data"
+        let apiHeaders: [String: String] = [
+            "content-type": "application/json"
         ]
 
         let converter: (Any) -> AppwriteModels.Execution = { response in
             return AppwriteModels.Execution.from(map: response as! [String: Any])
         }
 
-        let idParamName: String? = nil
-        return try await client.chunkedUpload(
+        return try await client.call(
+            method: "POST",
             path: apiPath,
-            headers: &apiHeaders,
-            params: &apiParams,
-            paramName: paramName,
-            idParamName: idParamName,
-            converter: converter,
-            onProgress: onProgress
+            headers: apiHeaders,
+            params: apiParams,
+            converter: converter
         )
     }
 

Sources/Appwrite/Services/Messaging.swift

@@ -201,16 +201,19 @@ open class Messaging: Service {
     /// @param String sound
     /// @param String color
     /// @param String tag
-    /// @param String badge
+    /// @param Int badge
     /// @param Bool draft
     /// @param String scheduledAt
+    /// @param Bool contentAvailable
+    /// @param Bool critical
+    /// @param AppwriteEnums.MessagePriority priority
     /// @throws Exception
     /// @return array
     ///
     open func createPush(
         messageId: String,
-        title: String,
-        body: String,
+        title: String? = nil,
+        body: String? = nil,
         topics: [String]? = nil,
         users: [String]? = nil,
         targets: [String]? = nil,
@@ -221,9 +224,12 @@ open class Messaging: Service {
         sound: String? = nil,
         color: String? = nil,
         tag: String? = nil,
-        badge: String? = nil,
+        badge: Int? = nil,
         draft: Bool? = nil,
-        scheduledAt: String? = nil
+        scheduledAt: String? = nil,
+        contentAvailable: Bool? = nil,
+        critical: Bool? = nil,
+        priority: AppwriteEnums.MessagePriority? = nil
     ) async throws -> AppwriteModels.Message {
         let apiPath: String = "/messaging/messages/push"
 
@@ -243,7 +249,10 @@ open class Messaging: Service {
             "tag": tag,
             "badge": badge,
             "draft": draft,
-            "scheduledAt": scheduledAt
+            "scheduledAt": scheduledAt,
+            "contentAvailable": contentAvailable,
+            "critical": critical,
+            "priority": priority
         ]
 
         let apiHeaders: [String: String] = [
@@ -285,6 +294,9 @@ open class Messaging: Service {
     /// @param Int badge
     /// @param Bool draft
     /// @param String scheduledAt
+    /// @param Bool contentAvailable
+    /// @param Bool critical
+    /// @param AppwriteEnums.MessagePriority priority
     /// @throws Exception
     /// @return array
     ///
@@ -304,7 +316,10 @@ open class Messaging: Service {
         tag: String? = nil,
         badge: Int? = nil,
         draft: Bool? = nil,
-        scheduledAt: String? = nil
+        scheduledAt: String? = nil,
+        contentAvailable: Bool? = nil,
+        critical: Bool? = nil,
+        priority: AppwriteEnums.MessagePriority? = nil
     ) async throws -> AppwriteModels.Message {
         let apiPath: String = "/messaging/messages/push/{messageId}"
             .replacingOccurrences(of: "{messageId}", with: messageId)
@@ -324,7 +339,10 @@ open class Messaging: Service {
             "tag": tag,
             "badge": badge,
             "draft": draft,
-            "scheduledAt": scheduledAt
+            "scheduledAt": scheduledAt,
+            "contentAvailable": contentAvailable,
+            "critical": critical,
+            "priority": priority
         ]
 
         let apiHeaders: [String: String] = [

Sources/Appwrite/Services/Teams.swift

@@ -286,7 +286,8 @@ open class Teams: Service {
     /// List team memberships
     ///
     /// Use this endpoint to list a team's members using the team's ID. All team
-    /// members have read access to this endpoint.
+    /// members have read access to this endpoint. Hide sensitive attributes from
+    /// the response by toggling membership privacy in the Console.
     ///
     /// @param String teamId
     /// @param [String] queries
@@ -401,7 +402,8 @@ open class Teams: Service {
     /// Get team membership
     ///
     /// Get a team member by the membership unique id. All team members have read
-    /// access for this resource.
+    /// access for this resource. Hide sensitive attributes from the response by
+    /// toggling membership privacy in the Console.
     ///
     /// @param String teamId
     /// @param String membershipId

Sources/AppwriteEnums/AuthenticationFactor.swift

@@ -1,13 +1,12 @@
 import Foundation
 
-public enum AuthenticationFactor: String, Codable {
+public enum AuthenticationFactor: String, CustomStringConvertible {
     case email = "email"
     case phone = "phone"
     case totp = "totp"
     case recoverycode = "recoverycode"
 
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(rawValue)
+    public var description: String {
+        return rawValue
     }
 }

Sources/AppwriteEnums/AuthenticatorType.swift

@@ -1,10 +1,9 @@
 import Foundation
 
-public enum AuthenticatorType: String, Codable {
+public enum AuthenticatorType: String, CustomStringConvertible {
     case totp = "totp"
 
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(rawValue)
+    public var description: String {
+        return rawValue
     }
 }

Sources/AppwriteEnums/Browser.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public enum Browser: String, Codable {
+public enum Browser: String, CustomStringConvertible {
     case avantBrowser = "aa"
     case androidWebViewBeta = "an"
     case googleChrome = "ch"
@@ -16,8 +16,7 @@ public enum Browser: String, Codable {
     case opera = "op"
     case operaNext = "on"
 
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(rawValue)
+    public var description: String {
+        return rawValue
     }
 }

Sources/AppwriteEnums/Compression.swift

@@ -1,12 +1,11 @@
 import Foundation
 
-public enum Compression: String, Codable {
+public enum Compression: String, CustomStringConvertible {
     case `none` = "none"
     case gzip = "gzip"
     case zstd = "zstd"
 
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(rawValue)
+    public var description: String {
+        return rawValue
     }
 }

Sources/AppwriteEnums/CreditCard.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public enum CreditCard: String, Codable {
+public enum CreditCard: String, CustomStringConvertible {
     case americanExpress = "amex"
     case argencard = "argencard"
     case cabal = "cabal"
@@ -18,8 +18,7 @@ public enum CreditCard: String, Codable {
     case mIR = "mir"
     case maestro = "maestro"
 
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(rawValue)
+    public var description: String {
+        return rawValue
     }
 }

Sources/AppwriteEnums/ExecutionMethod.swift

@@ -1,15 +1,14 @@
 import Foundation
 
-public enum ExecutionMethod: String, Codable {
+public enum ExecutionMethod: String, CustomStringConvertible {
     case gET = "GET"
     case pOST = "POST"
     case pUT = "PUT"
     case pATCH = "PATCH"
     case dELETE = "DELETE"
     case oPTIONS = "OPTIONS"
 
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(rawValue)
+    public var description: String {
+        return rawValue
     }
 }

Sources/AppwriteEnums/Flag.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public enum Flag: String, Codable {
+public enum Flag: String, CustomStringConvertible {
     case afghanistan = "af"
     case angola = "ao"
     case albania = "al"
@@ -197,8 +197,7 @@ public enum Flag: String, Codable {
     case zambia = "zm"
     case zimbabwe = "zw"
 
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(rawValue)
+    public var description: String {
+        return rawValue
     }
 }

Sources/AppwriteEnums/ImageFormat.swift

@@ -1,15 +1,14 @@
 import Foundation
 
-public enum ImageFormat: String, Codable {
+public enum ImageFormat: String, CustomStringConvertible {
     case jpg = "jpg"
     case jpeg = "jpeg"
     case gif = "gif"
     case png = "png"
     case webp = "webp"
     case avif = "avif"
 
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(rawValue)
+    public var description: String {
+        return rawValue
     }
 }

Sources/AppwriteEnums/ImageGravity.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public enum ImageGravity: String, Codable {
+public enum ImageGravity: String, CustomStringConvertible {
     case center = "center"
     case topLeft = "top-left"
     case top = "top"
@@ -11,8 +11,7 @@ public enum ImageGravity: String, Codable {
     case bottom = "bottom"
     case bottomRight = "bottom-right"
 
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(rawValue)
+    public var description: String {
+        return rawValue
     }
 }