Merge pull request #20 from appwrite/dev

updated to support 1.0.0-RC1

Author: christyjacob4

LICENSE

@@ -9,4 +9,4 @@ Redistribution and use in source and binary forms, with or without modification,
 
     3. Neither the name Appwrite nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -2,12 +2,12 @@
 
 ![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-0.15.0-blue.svg?style=flat-square)
+![Version](https://img.shields.io/badge/api%20version-1.0.0-RC1-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)
 
-**This SDK is compatible with Appwrite server version 0.15.x. For older versions, please check [previous releases](https://github.com/appwrite/sdk-for-apple/releases).**
+**This SDK is compatible with Appwrite server version 1.0.0-RC1. For older versions, please check [previous releases](https://github.com/appwrite/sdk-for-apple/releases).**
 
 Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way. Use the Apple SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)
 
@@ -31,7 +31,7 @@ Add the package to your `Package.swift` dependencies:
 
 ```swift
     dependencies: [
-        .package(url: "[email protected]:appwrite/sdk-for-apple.git", from: "0.6.0"),
+        .package(url: "[email protected]:appwrite/sdk-for-apple.git", from: "1.0.0-RC1"),
     ],
 ```
 

Sources/Appwrite/Client.swift

@@ -20,8 +20,11 @@ open class Client {
 
     open var headers: [String: String] = [
         "content-type": "",
-        "x-sdk-version": "appwrite:swiftclient:0.6.0",
-        "X-Appwrite-Response-Format": "0.15.0"
+        "x-sdk-name": "Apple",
+        "x-sdk-platform": "client",
+        "x-sdk-language": "swiftclient",
+        "x-sdk-version": "1.0.0-RC1",
+        "X-Appwrite-Response-Format": "1.0.0-RC1"
     ]
 
     open var config: [String: String] = [:]
@@ -387,15 +390,19 @@ open class Client {
 
         if idParamName != nil && params[idParamName!] as! String != "unique()" {
             // Make a request to check if a file already exists
-            let map = try! await call(
-                method: "GET",
-                path: path + "/" + (params[idParamName!] as! String),
-                headers: headers,
-                params: [:],
-                converter: { return $0 }
-            )
-            let chunksUploaded = map["chunksUploaded"] as! Int
-            offset = min(size, (chunksUploaded * Client.chunkSize))
+            do {
+                let map = try await call(
+                    method: "GET",
+                    path: path + "/" + (params[idParamName!] as! String),
+                    headers: headers,
+                    params: [:],
+                    converter: { return $0 }
+                )
+                let chunksUploaded = map["chunksUploaded"] as! Int
+                offset = min(size, (chunksUploaded * Client.chunkSize))
+            } catch {
+                // File does not exist yet, swallow exception
+            }
         }
 
         while offset < size {

Sources/Appwrite/ID.swift

@@ -0,0 +1,9 @@
+public class ID {
+    public static func custom(_ id: String) -> String {
+        return id
+    }
+
+    public static func unique() -> String {
+        return "unique()"
+    }
+}

Sources/Appwrite/Models/File.swift renamed to Sources/Appwrite/Models/InputFile.swift

@@ -23,7 +23,7 @@ public class WebAuthComponent {
     ///
     /// Authenticate Session with OAuth2
     ///
-    /// Launches a chrome custom tab from the given activity and directs to the given url,
+    /// Launches a browser window from your app and directs to the given url,
     /// suspending until the user returns to the app, at which point the given [onComplete] callback
     /// will run, passing the callback url from the intent used to launch the [CallbackActivity],
     /// or an [IllegalStateException] in the case the user closed the window or returned to the
@@ -62,12 +62,37 @@ public class WebAuthComponent {
         var domain = cookieParts["domain"]!
         domain.remove(at: domain.startIndex)
 
-        let cookie = HTTPClient.Cookie(
-            name: cookieParts["key"]!,
-            value: cookieParts["secret"]!
-        )
-        let cookieJson = try! cookie.toJson()
-        UserDefaults.standard.set(cookieJson, forKey: "\(domain)-cookies")
+        let key: String = cookieParts["key"]!
+        let secret: String = cookieParts["secret"]!
+        let path: String? = cookieParts["path"]
+        let expires: String? = cookieParts["expires"]
+        let maxAge: String? = cookieParts["maxAge"]
+        let sameSite: String? = cookieParts["sameSite"]
+        let httpOnly: Bool? = cookieParts.keys.contains("httpOnly")
+        let secure: Bool? = cookieParts.keys.contains("secure")
+
+        var cookie = "\(key)=\(secret)"
+
+        if let path = path {
+            cookie += "; path=\(path)"
+        }
+        if let expires = expires {
+            cookie += "; expires=\(expires)"
+        }
+        if let maxAge = maxAge {
+            cookie += "; max-age=\(maxAge)"
+        }
+        if let sameSite = sameSite {
+            cookie += "; sameSite=\(sameSite)"
+        }
+        if let httpOnly = httpOnly, httpOnly {
+            cookie += "; httpOnly"
+        }
+        if let secure = secure, secure {
+            cookie += "; secure"
+        }
+
+        UserDefaults.standard.set([cookie], forKey: "\(domain)-cookies")
 
         WebAuthComponent.onCallback(
             scheme: components.scheme!,

Sources/Appwrite/Models/Query.swift

@@ -0,0 +1,21 @@
+public class Permission {
+    public static func read(_ role: String) -> String {
+        return "read(\"\(role)\")"
+    }
+
+    public static func write(_ role: String) -> String {
+        return "write(\"\(role)\")"
+    }
+
+    public static func create(_ role: String) -> String {
+        return "create(\"\(role)\")"
+    }
+
+    public static func update(_ role: String) -> String {
+        return "update(\"\(role)\")"
+    }
+
+    public static func delete(_ role: String) -> String {
+        return "delete(\"\(role)\")"
+    }
+}

Sources/Appwrite/OAuth/WebAuthComponent.swift

@@ -0,0 +1,72 @@
+public class Query {
+
+    public static func equal(_ attribute: String, value: Any) -> String {
+        buildQueryWhere(attribute, is: "equal", to: value)
+    }
+
+    public static func notEqual(_ attribute: String, value: Any) -> String {
+        buildQueryWhere(attribute, is: "notEqual", to: value)
+    }
+
+    public static func lessThan(_ attribute: String, value: Any) -> String {
+        buildQueryWhere(attribute, is: "lessThan", to: value)
+    }
+
+    public static func lessThanEqual(attribute: String, value: Any) -> String {
+        buildQueryWhere(attribute, is: "lessThanEqual", to: value)
+    }
+
+    public static func greaterThan(_ attribute: String, value: Any) -> String {
+        buildQueryWhere(attribute, is: "greaterThan", to: value)
+    }
+
+    public static func greaterThanEqual(_ attribute: String, value: Any) -> String {
+        buildQueryWhere(attribute, is: "greaterThanEqual", to: value)
+    }
+
+    public static func search(_ attribute: String, value: String) -> String {
+        buildQueryWhere(attribute, is: "search", to: value)
+    }
+
+    public static func orderAsc(_ attribute: String) -> String {
+        "orderAsc(\"\(attribute)\")"
+    }
+
+    public static func orderDesc(_ attribute: String) -> String {
+        "orderDesc(\"\(attribute)\")"
+    }
+
+    public static func cursorBefore(_ id: String) -> String {
+        "cursorBefore(\"\(id)\")"
+    }
+
+    public static func cursorAfter(_ id: String) -> String {
+        "cursorAfter(\"\(id)\")"
+    }
+
+    public static func limit(_ limit: Int) -> String {
+        "limit(\(limit))"
+    }
+
+    public static func offset(_ offset: Int) -> String {
+        "offset(\(offset))"
+    }
+
+    public static func buildQueryWhere(_ attribute: String, is method: String, to value: Any) -> String {
+        switch value {
+        case let value as Array<Any>:
+            return "\(method)(\"\(attribute)\", [\(value.map { parseValues($0) }.joined(separator: ",") )])"
+        default:
+            return "\(method)(\"\(attribute)\", [\(parseValues(value))])"
+        }
+    }
+
+    private static func parseValues(_ value: Any) -> String {
+        switch value {
+        case let value as String:
+            return "\"\(value)\""
+        default:
+            return "\(value)"
+        }
+    }
+}

Sources/Appwrite/Permission.swift

@@ -0,0 +1,28 @@
+public class Role {
+    public static func any() -> String {
+        return "any"
+    }
+
+    public static func user(_ id: String) -> String {
+        return "user:\(id)"
+    }
+
+    public static func users() -> String {
+        return "users"
+    }
+
+    public static func guests() -> String {
+        return "guests"
+    }
+
+    public static func team(_ id: String, _ role: String = "") -> String {
+        if(role.isEmpty) {
+            return "team:\(id)"
+        }
+        return "team:\(id)/\(role)"
+    }
+
+    public static func status(_ status: String) -> String {
+        return "status:\(status)"
+    }
+}