Release candidate for 1.5.x

Author: abnegate

README.md

@@ -31,7 +31,7 @@ Add the package to your `Package.swift` dependencies:
 
 ```swift
     dependencies: [
-        .package(url: "[email protected]:appwrite/sdk-for-apple.git", from: "5.0.0-rc.4"),
+        .package(url: "[email protected]:appwrite/sdk-for-apple.git", from: "5.0.0-rc.5"),
     ],
 ```
 
@@ -125,9 +125,10 @@ let account = Account(client)
 
 do {
     let user = try await account.create(
-        userId: ID.unique(), 
-        email: "[email protected]", 
-        password: "password"
+        userId: ID.unique(),
+        email: "[email protected]",
+        password: "password",
+        name: "Walter O'Brien"
     )
     print(String(describing: user.toMap()))
 } catch {
@@ -150,9 +151,10 @@ func main() {
 
     do {
         let user = try await account.create(
-            userId: ID.unique(), 
-            email: "[email protected]", 
-            password: "password"
+            userId: ID.unique(),
+            email: "[email protected]",
+            password: "password",
+            name: "Walter O'Brien"
         )
         print(String(describing: account.toMap()))
     } catch {

Sources/Appwrite/Client.swift

@@ -6,8 +6,6 @@ import Foundation
 import AsyncHTTPClient
 @_exported import AppwriteModels
 
-typealias CookieListener = (_ existing: [String], _ new: [String]) -> Void
-
 let DASHDASH = "--"
 let CRLF = "\r\n"
 
@@ -25,7 +23,7 @@ open class Client {
         "x-sdk-name": "Apple",
         "x-sdk-platform": "client",
         "x-sdk-language": "apple",
-        "x-sdk-version": "5.0.0-rc.4",
+        "x-sdk-version": "5.0.0-rc.5",
         "x-appwrite-response-format": "1.5.0"
     ]
 
@@ -35,7 +33,6 @@ open class Client {
 
     internal var http: HTTPClient
 
-    internal static var cookieListener: CookieListener? = nil
 
     private static let boundaryChars = "abcdefghijklmnopqrstuvwxyz1234567890"
 
@@ -323,8 +320,6 @@ open class Client {
                 let existing = UserDefaults.standard.stringArray(forKey: domain)
                 let new = response.headers["Set-Cookie"]
 
-                Client.cookieListener?(existing ?? [], new)
-
                 UserDefaults.standard.set(new, forKey: domain)
             }
             switch T.self {

Sources/Appwrite/OAuth/WebAuthComponent.swift

@@ -95,8 +95,6 @@ public class WebAuthComponent {
         let existing = UserDefaults.standard.stringArray(forKey: domain)
         let new = [cookie]
 
-        Client.cookieListener?(existing ?? [], new)
-
         UserDefaults.standard.set(new, forKey: domain)
 
         WebAuthComponent.onCallback(

Sources/Appwrite/OS.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,7 +1220,6 @@ open class Account: Service {
     /// @param AppwriteEnums.OAuthProvider provider
     /// @param String success
     /// @param String failure
-    /// @param Bool token
     /// @param [String] scopes
     /// @throws Exception
     /// @return array
@@ -1230,7 +1229,6 @@ open class Account: Service {
         provider: AppwriteEnums.OAuthProvider,
         success: String? = nil,
         failure: String? = nil,
-        token: Bool? = nil,
         scopes: [String]? = nil
     ) async throws -> Bool {
         let apiPath: String = "/account/sessions/oauth2/{provider}"
@@ -1239,7 +1237,6 @@ open class Account: Service {
         let apiParams: [String: Any?] = [
             "success": success,
             "failure": failure,
-            "token": token,
             "scopes": scopes,
             "project": client.config["project"]
         ]
@@ -1255,7 +1252,6 @@ open class Account: Service {
         }
 
         return true
-
     }
 
     ///
@@ -1661,6 +1657,61 @@ 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
+    ///
+    @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+    open func createOAuth2Token(
+        provider: AppwriteEnums.OAuthProvider,
+        success: String? = nil,
+        failure: String? = nil,
+        scopes: [String]? = nil
+    ) async throws -> Bool {
+        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 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
+    }
+
     ///
     /// Create phone token
     ///

Sources/Appwrite/Services/Account.swift

@@ -7,7 +7,7 @@ let client = Client()
 
 let account = Account(client)
 
-let mfaChallenge = try await account.create2FAChallenge(
+let mfaChallenge = try await account.createChallenge(
     factor: .totp
 )
 

docs/examples/account/create2f-a-challenge.md renamed to docs/examples/account/create-challenge.md

@@ -7,7 +7,7 @@ let client = Client()
 let account = Account(client)
 
 let token = try await account.createEmailToken(
-    userId: "[USER_ID]",
+    userId: "<USER_ID>",
     email: "[email protected]",
     phrase: false // optional
 )

docs/examples/account/create-email-token.md

@@ -7,7 +7,7 @@ let client = Client()
 let account = Account(client)
 
 let token = try await account.createMagicURLToken(
-    userId: "[USER_ID]",
+    userId: "<USER_ID>",
     email: "[email protected]",
     url: "https://example.com", // optional
     phrase: false // optional

docs/examples/account/create-magic-u-r-l-token.md

@@ -11,7 +11,6 @@ let success = try await account.createOAuth2Session(
     provider: .amazon,
     success: "https://example.com", // optional
     failure: "https://example.com", // optional
-    token: false, // optional
     scopes: [] // optional
 )
 

docs/examples/account/create-o-auth2session.md

@@ -0,0 +1,16 @@
+import Appwrite
+import AppwriteEnums
+
+let client = Client()
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("5df5acd0d48c2") // Your project ID
+
+let account = Account(client)
+
+let success = try await account.createOAuth2Token(
+    provider: .amazon,
+    success: "https://example.com", // optional
+    failure: "https://example.com", // optional
+    scopes: [] // optional
+)
+