Release candidate for 1.5.x

Author: abnegate

README.md

@@ -33,7 +33,7 @@ Add the package to your `Package.swift` dependencies:
 
 ```swift
     dependencies: [
-        .package(url: "git@github.com:appwrite/sdk-for-swift.git", from: "5.0.0-rc.4"),
+        .package(url: "git@github.com:appwrite/sdk-for-swift.git", from: "5.0.0-rc.5"),
     ],
 ```
 
@@ -77,9 +77,11 @@ let users = Users(client)
 
 do {
     let user = try await users.create(
-        userId: ID.unique(), 
-        email: "email@example.com", 
-        password: "password"
+        userId: ID.unique(),
+        email: "email@example.com",
+        phone: "+123456789",
+        password: "password",
+        name: "Walter O'Brien"
     )
     print(String(describing: user.toMap()))
 } catch {
@@ -103,9 +105,11 @@ func main() {
 
     do {
         let user = try await users.create(
-            userId: ID.unique(), 
-            email: "email@example.com", 
-            password: "password"
+            userId: ID.unique(),
+            email: "email@example.com",
+            phone: "+123456789",
+            password: "password",
+            name: "Walter O'Brien"
         )
         print(String(describing: user.toMap()))
     } catch {

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": "5.0.0-rc.4",
+        "x-sdk-version": "5.0.0-rc.5",
         "x-appwrite-response-format": "1.5.0"
     ]
 
@@ -31,6 +31,8 @@ open class Client {
 
     internal var http: HTTPClient
 
+    internal var httpForRedirect: HTTPClient
+
     private static let boundaryChars = "abcdefghijklmnopqrstuvwxyz1234567890"
 
     private static let boundary = randomBoundary()
@@ -41,25 +43,21 @@ open class Client {
 
     public init() {
         http = Client.createHTTP()
+        httpForRedirect = Client.createHTTP(redirectConfiguration: .disallow)
         addUserAgentHeader()
         addOriginHeader()
     }
 
     private static func createHTTP(
         selfSigned: Bool = false,
-        maxRedirects: Int = 5,
-        alloweRedirectCycles: Bool = false,
+        redirectConfiguration: HTTPClient.Configuration.RedirectConfiguration = .follow(max: 5, allowCycles: false),
         connectTimeout: TimeAmount = .seconds(30),
         readTimeout: TimeAmount = .seconds(30)
     ) -> HTTPClient {
         let timeout = HTTPClient.Configuration.Timeout(
             connect: connectTimeout,
             read: readTimeout
         )
-        let redirect = HTTPClient.Configuration.RedirectConfiguration.follow(
-            max: 5,
-            allowCycles: false
-        )
         var tls = TLSConfiguration
             .makeClientConfiguration()
 
@@ -71,7 +69,7 @@ open class Client {
             eventLoopGroupProvider: eventLoopGroupProvider,
             configuration: HTTPClient.Configuration(
                 tlsConfiguration: tls,
-                redirectConfiguration: redirect,
+                redirectConfiguration: redirectConfiguration,
                 timeout: timeout,
                 decompression: .enabled(limit: .none)
             )
@@ -82,6 +80,7 @@ open class Client {
     deinit {
         do {
             try http.syncShutdown()
+            try httpForRedirect.syncShutdown()
         } catch {
             print(error)
         }
@@ -160,21 +159,6 @@ open class Client {
         return self
     }
 
-    ///
-    /// Set ForwardedFor
-    ///
-    /// The IP address of the client that made the request
-    ///
-    /// @param String value
-    ///
-    /// @return Client
-    ///
-    open func setForwardedFor(_ value: String) -> Client {
-        config["forwardedfor"] = value
-        _ = addHeader(key: "X-Forwarded-For", value: value)
-        return self
-    }
-
     ///
     /// Set ForwardedUserAgent
     ///
@@ -291,6 +275,74 @@ open class Client {
         sink: ((ByteBuffer) -> Void)? = nil,
         converter: ((Any) -> T)? = nil
     ) async throws -> T {
+        let request = try prepareRequest(
+            method: method,
+            path: path,
+            headers: headers,
+            params: params
+        )
+
+        return try await execute(request, converter: converter)
+    }
+
+    ///
+    /// Make an redirect API call
+    ///
+    /// @param String method
+    /// @param String path
+    /// @param Dictionary<String, Any?> params
+    /// @param Dictionary<String, String> headers
+    /// @return String
+    /// @throws Exception
+    ///
+    open func redirect(
+        method: String,
+        path: String = "",
+        headers: [String: String] = [:],
+        params: [String: Any?] = [:]
+    ) async throws -> String? {
+        let request = try prepareRequest(
+            method: method,
+            path: path,
+            headers: headers,
+            params: params
+        )
+
+        let response = try await httpForRedirect.execute(
+            request,
+            timeout: .seconds(30)
+        )
+
+        if response.status.code >= 400 {
+            var message = ""
+            var data = try await response.body.collect(upTo: Int.max)
+            var type = ""
+
+            do {
+                let dict = try JSONSerialization.jsonObject(with: data) as? [String: Any]
+
+                message = dict?["message"] as? String ?? response.status.reasonPhrase
+                type = dict?["type"] as? String ?? ""
+            } catch {
+                message =  data.readString(length: data.readableBytes)!
+            }
+
+            throw AppwriteError(
+                message: message,
+                code: Int(response.status.code),
+                type: type
+            )
+        }
+
+        return response.headers["location"].first
+    }
+
+    private func prepareRequest(
+        method: String,
+        path: String = "",
+        headers: [String: String] = [:],
+        params: [String: Any?] = [:]
+    ) throws -> HTTPClientRequest {
         let validParams = params.filter { $0.value != nil }
 
         let queryParameters = method == "GET" && !validParams.isEmpty
@@ -307,13 +359,11 @@ open class Client {
 
         request.addDomainCookies()
 
-        if "GET" == method {
-            return try await execute(request, converter: converter)
+        if "GET" != method {
+            try buildBody(for: &request, with: validParams)
         }
 
-        try buildBody(for: &request, with: validParams)
-
-        return try await execute(request, withSink: sink, converter: converter)
+        return request
     }
 
     private func buildBody(
@@ -329,7 +379,6 @@ open class Client {
 
     private func execute<T>(
         _ request: HTTPClientRequest,
-        withSink bufferSink: ((ByteBuffer) -> Void)? = nil,
         converter: ((Any) -> T)? = nil
     ) async throws -> T {
         let response = try await http.execute(

Sources/Appwrite/Services/Account.swift

@@ -404,7 +404,7 @@ open class Account: Service {
     /// @throws Exception
     /// @return array
     ///
-    open func create2FAChallenge(
+    open func createChallenge(
         factor: AppwriteEnums.AuthenticationFactor
     ) async throws -> AppwriteModels.MfaChallenge {
         let apiPath: String = "/account/mfa/challenge"
@@ -1220,42 +1220,36 @@ open class Account: Service {
     /// @param AppwriteEnums.OAuthProvider provider
     /// @param String success
     /// @param String failure
-    /// @param Bool token
     /// @param [String] scopes
     /// @throws Exception
     /// @return array
     ///
-    @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
     open func createOAuth2Session(
         provider: AppwriteEnums.OAuthProvider,
         success: String? = nil,
         failure: String? = nil,
-        token: Bool? = nil,
         scopes: [String]? = nil
-    ) async throws -> Bool {
+    ) async throws -> String? {
         let apiPath: String = "/account/sessions/oauth2/{provider}"
             .replacingOccurrences(of: "{provider}", with: provider.rawValue)
 
         let apiParams: [String: Any?] = [
             "success": success,
             "failure": failure,
-            "token": token,
             "scopes": scopes,
             "project": client.config["project"]
         ]
 
-        let query = "?\(client.parametersToQueryString(params: apiParams))"
-        let url = URL(string: client.endPoint + apiPath + query)!
-        let callbackScheme = "appwrite-callback-\(client.config["project"] ?? "")"
-
-        _ = try await withCheckedThrowingContinuation { continuation in
-            WebAuthComponent.authenticate(url: url, callbackScheme: callbackScheme) { result in
-                continuation.resume(with: result)
-            }
-        }
-        
-        return true
+        let apiHeaders: [String: String] = [
+            "content-type": "application/json"
+        ]
 
+        return try await client.redirect(
+            method: "GET",
+            path: apiPath,
+            headers: apiHeaders,
+            params: apiParams
+        )
     }
 
     ///
@@ -1560,6 +1554,59 @@ open class Account: Service {
         )
     }
 
+    ///
+    /// Create OAuth2 token
+    ///
+    /// Allow the user to login to their account using the OAuth2 provider of their
+    /// choice. Each OAuth2 provider should be enabled from the Appwrite console
+    /// first. Use the success and failure arguments to provide a redirect URL's
+    /// back to your app when login is completed. 
+    /// 
+    /// If authentication succeeds, `userId` and `secret` of a token will be
+    /// appended to the success URL as query parameters. These can be used to
+    /// create a new session using the [Create
+    /// session](https://appwrite.io/docs/references/cloud/client-web/account#createSession)
+    /// endpoint.
+    /// 
+    /// A user is limited to 10 active sessions at a time by default. [Learn more
+    /// about session
+    /// limits](https://appwrite.io/docs/authentication-security#limits).
+    ///
+    /// @param AppwriteEnums.OAuthProvider provider
+    /// @param String success
+    /// @param String failure
+    /// @param [String] scopes
+    /// @throws Exception
+    /// @return array
+    ///
+    open func createOAuth2Token(
+        provider: AppwriteEnums.OAuthProvider,
+        success: String? = nil,
+        failure: String? = nil,
+        scopes: [String]? = nil
+    ) async throws -> String? {
+        let apiPath: String = "/account/tokens/oauth2/{provider}"
+            .replacingOccurrences(of: "{provider}", with: provider.rawValue)
+
+        let apiParams: [String: Any?] = [
+            "success": success,
+            "failure": failure,
+            "scopes": scopes,
+            "project": client.config["project"]
+        ]
+
+        let apiHeaders: [String: String] = [
+            "content-type": "application/json"
+        ]
+
+        return try await client.redirect(
+            method: "GET",
+            path: apiPath,
+            headers: apiHeaders,
+            params: apiParams
+        )
+    }
+
     ///
     /// Create phone token
     ///