Merge pull request #520 from appwrite/fix-swift-oauth

Fix Swift OAuth cookie

Author: christyjacob4

templates/swift/Sources/OAuth/WebAuthComponent.swift.twig

@@ -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!,

templates/swift/example-swiftui/Shared/ExampleViewModel.swift

@@ -31,79 +31,76 @@ extension ExampleView {
 
         func register() async {
             do {
-                let response = try await account.create(
+                let user = try await account.create(
                     userId: userId,
                     email: username,
                     password: password
                 )
-                self.userId = response.id
-                self.response = String(describing: response.toMap())
+                self.userId = user.id
+                self.response = String(describing: user.toMap())
             } catch {
-                self.response = String(describing: error)
+                self.response = error.localizedDescription
             }
         }
 
         func login() async {
             do {
-                let response = try await account.createSession(
+                let session = try await account.createEmailSession(
                     email: username,
                     password: password
                 )
-                self.response = String(describing: response.toMap())
+                self.response = String(describing: session.toMap())
             } catch {
-                self.response = String(describing: error)
+                self.response = error.localizedDescription
             }
         }
 
         func loginWithFacebook() async {
             do {
-                let response = try await account.createOAuth2Session(
-                    provider: "facebook",
-                    success: "\(host)/auth/oauth2/success",
-                    failure: "\(host)/auth/oauth2/failure"
-                )
-                self.response = String(describing: response)
+                _ = try await account.createOAuth2Session(provider: "facebook")
+
+                self.response = "Success!"
             } catch {
-                self.response = String(describing: error)
+                self.response = error.localizedDescription
             }
         }
 
         func download() async {
             do {
-                let response = try await storage.getFileDownload(
+                let data = try await storage.getFileDownload(
                     bucketId: bucketId,
                     fileId: fileId
                 )
-                self.downloadedImage = Image(data: Data(buffer: response))
+                self.downloadedImage = Image(data: Data(buffer: data))
             } catch {
-                self.response = String(describing: error)
+                self.response = error.localizedDescription
             }
         }
 
         func upload(image: OSImage) async {
-            let imageBuffer = ByteBufferAllocator()
-                .buffer(data: image.data)
-                
             #if os(macOS)
             let fileName = "file.tiff"
+            let mime = "image/tiff"
             #else
             let fileName = "file.png"
+            let mime = "image/png"
             #endif
 
-            let file = File(
-                name: fileName,
-                buffer: imageBuffer
+            let file = InputFile.fromData(
+                image.data,
+                filename: fileName,
+                mimeType: mime
             )
 
             do {
-                let response = try await storage.createFile(
+                let file = try await storage.createFile(
                     bucketId: bucketId,
                     fileId: fileId,
                     file: file
                 )
-                self.response = String(describing: response.toMap())
+                self.response = String(describing: file.toMap())
             } catch {
-                self.response = String(describing: error)
+                self.response = error.localizedDescription
             }
         }
 

templates/swift/example-uikit/UIKitExample/ViewController.swift

@@ -58,7 +58,7 @@ class ViewController: UIViewController {
 
     @IBAction func loginClick(_ sender: Any) async {
         do {
-            let response = try await account.createSession(
+            let response = try await account.createEmailSession(
                 email: "[email protected]",
                 password: "password"
             )