Merge pull request #1 from grsouza/master

Add PostgrestClient to Supabase

Author: satishbabariya

Package.resolved

@@ -9,17 +9,18 @@ let package = Package(
         .library(
             name: "Supabase",
             targets: ["Supabase"]
-        ),
+        )
     ],
     dependencies: [
         .package(name: "GoTrue", url: "https://github.com/supabase/gotrue-swift.git", .branch("main")),
         .package(name: "SupabaseStorage", url: "https://github.com/supabase/storage-swift.git", .branch("main")),
         .package(name: "Realtime", url: "https://github.com/supabase/realtime-swift.git", .branch("main")),
+        .package(name: "PostgREST", url: "https://github.com/supabase/postgrest-swift", .branch("master")),
     ],
     targets: [
         .target(
             name: "Supabase",
-            dependencies: ["GoTrue", "SupabaseStorage", "Realtime"]
+            dependencies: ["GoTrue", "SupabaseStorage", "Realtime", "PostgREST"]
         ),
         .testTarget(
             name: "SupabaseTests",

Package.swift

@@ -1,4 +1,5 @@
 import GoTrue
+import PostgREST
 import Realtime
 import SupabaseStorage
 
@@ -10,27 +11,44 @@ public class SupabaseClient {
     var realtimeUrl: String
     var authUrl: String
     var storageUrl: String
-
+    
     public var auth: GoTrueClient
+    
     public var storage: SupabaseStorageClient {
         var headers: [String: String] = [:]
         headers["apikey"] = supabaseKey
         headers["Authorization"] = "Bearer \(auth.session?.accessToken ?? supabaseKey)"
         return SupabaseStorageClient(url: storageUrl, headers: headers)
     }
-
+    
+    public var database: PostgrestClient {
+        var headers: [String: String] = [:]
+        headers["apikey"] = supabaseKey
+        headers["Authorization"] = "Bearer \(auth.session?.accessToken ?? supabaseKey)"
+        return PostgrestClient(url: restUrl, headers: headers, schema: schema)
+    }
+    
     private var realtime: RealtimeClient
-
-    public init(supabaseUrl: String, supabaseKey: String, schema: String = "public", autoRefreshToken: Bool = true) {
+    
+    public init(
+        supabaseUrl: String,
+        supabaseKey: String,
+        schema: String = "public",
+        autoRefreshToken: Bool = true
+    ) {
         self.supabaseUrl = supabaseUrl
         self.supabaseKey = supabaseKey
         self.schema = schema
         restUrl = "\(supabaseUrl)/rest/v1"
         realtimeUrl = "\(supabaseUrl)/realtime/v1"
         authUrl = "\(supabaseUrl)/auth/v1"
         storageUrl = "\(supabaseUrl)/storage/v1"
-
-        auth = GoTrueClient(url: authUrl, headers: ["apikey": supabaseKey], autoRefreshToken: autoRefreshToken)
+        
+        auth = GoTrueClient(
+            url: authUrl,
+            headers: ["apikey": supabaseKey],
+            autoRefreshToken: autoRefreshToken
+        )
         realtime = RealtimeClient(endPoint: realtimeUrl, params: ["apikey": supabaseKey])
     }
 }

Sources/Supabase/Supabase.swift

@@ -1,29 +1,31 @@
-@testable import Supabase
 import SupabaseStorage
 import XCTest
 
-final class SupabaseTests: XCTestCase {
-    var supabase = SupabaseClient(supabaseUrl: SupabaseTests.supabaseUrl(), supabaseKey: SupabaseTests.supabaseKey())
+@testable import Supabase
 
+final class SupabaseTests: XCTestCase {
+    var supabase = SupabaseClient(
+        supabaseUrl: SupabaseTests.supabaseUrl(), supabaseKey: SupabaseTests.supabaseKey())
+    
     static func supabaseUrl() -> String {
         if let token = ProcessInfo.processInfo.environment["supabaseUrl"] {
             return token
         } else {
             fatalError()
         }
     }
-
+    
     static func supabaseKey() -> String {
         if let url = ProcessInfo.processInfo.environment["supabaseKey"] {
             return url
         } else {
             fatalError()
         }
     }
-
+    
     func testSignIN() {
         let e = expectation(description: "testSignIN")
-
+        
         supabase.auth.signIn(email: "[email protected]", password: "secret") { result in
             switch result {
             case let .success(session):
@@ -35,17 +37,17 @@ final class SupabaseTests: XCTestCase {
             }
             e.fulfill()
         }
-
+        
         waitForExpectations(timeout: 30) { error in
             if let error = error {
                 XCTFail("testSignIN failed: \(error.localizedDescription)")
             }
         }
     }
-
+    
     func testListBuckets() {
         let e = expectation(description: "listBuckets")
-
+        
         supabase.storage.listBuckets { result in
             switch result {
             case let .success(buckets):
@@ -56,21 +58,25 @@ final class SupabaseTests: XCTestCase {
             }
             e.fulfill()
         }
-
+        
         waitForExpectations(timeout: 30) { error in
             if let error = error {
                 XCTFail("listBuckets failed: \(error.localizedDescription)")
             }
         }
     }
-
+    
     func testUploadFile() {
         let e = expectation(description: "testUploadFile")
-        let data = try! Data(contentsOf: URL(string: "https://raw.githubusercontent.com/satishbabariya/storage-swift/main/README.md")!)
-
+        let data = try! Data(
+            contentsOf: URL(
+                string: "https://raw.githubusercontent.com/satishbabariya/storage-swift/main/README.md")!)
+        
         let file = File(name: "README.md", data: data, fileName: "README.md", contentType: "text/html")
-
-        supabase.storage.from(id: "Demo").upload(path: "\(UUID().uuidString).md", file: file, fileOptions: FileOptions(cacheControl: "3600")) { result in
+        
+        supabase.storage.from(id: "Demo").upload(
+            path: "\(UUID().uuidString).md", file: file, fileOptions: FileOptions(cacheControl: "3600")
+        ) { result in
             switch result {
             case let .success(res):
                 print(res)
@@ -81,15 +87,11 @@ final class SupabaseTests: XCTestCase {
             }
             e.fulfill()
         }
-
+        
         waitForExpectations(timeout: 30) { error in
             if let error = error {
                 XCTFail("testUploadFile failed: \(error.localizedDescription)")
             }
         }
     }
-
-    static var allTests = [
-        ("testListBuckets", testListBuckets),
-    ]
 }