Unit test client initialization

Author: grdsdev

Sources/Supabase/SupabaseClient.swift

@@ -8,20 +8,24 @@ import SupabaseStorage
 
 /// Supabase Client.
 public class SupabaseClient {
-  private let supabaseURL: URL
-  private let supabaseKey: String
-  private let schema: String
-
+  let supabaseURL: URL
+  let supabaseKey: String
+  let storageURL: URL
+  let databaseURL: URL
+  let realtimeURL: URL
+  let authURL: URL
   let functionsURL: URL
 
+  let schema: String
+
   /// Supabase Auth allows you to create and manage user sessions for access to data that is secured
   /// by access policies.
   public let auth: GoTrueClient
 
   /// Supabase Storage allows you to manage user-generated content, such as photos or videos.
   public var storage: SupabaseStorageClient {
     SupabaseStorageClient(
-      url: supabaseURL.appendingPathComponent("/storage/v1").absoluteString,
+      url: storageURL.absoluteString,
       headers: defaultHeaders,
       http: self
     )
@@ -30,7 +34,7 @@ public class SupabaseClient {
   /// Database client for Supabase.
   public var database: PostgrestClient {
     PostgrestClient(
-      url: supabaseURL.appendingPathComponent("/rest/v1"),
+      url: databaseURL,
       headers: defaultHeaders,
       schema: schema,
       apiClientDelegate: self
@@ -40,7 +44,7 @@ public class SupabaseClient {
   /// Realtime client for Supabase
   public var realtime: RealtimeClient {
     RealtimeClient(
-      endPoint: supabaseURL.appendingPathComponent("/realtime/v1").absoluteString,
+      endPoint: realtimeURL.absoluteString,
       params: defaultHeaders
     )
   }
@@ -54,7 +58,7 @@ public class SupabaseClient {
     )
   }
 
-  private var defaultHeaders: [String: String]
+  private(set) var defaultHeaders: [String: String]
 
   /// Create a new client.
   public init(
@@ -64,6 +68,11 @@ public class SupabaseClient {
   ) {
     self.supabaseURL = supabaseURL
     self.supabaseKey = supabaseKey
+    authURL = supabaseURL.appendingPathComponent("/auth/v1")
+    storageURL = supabaseURL.appendingPathComponent("/storage/v1")
+    databaseURL = supabaseURL.appendingPathComponent("/rest/v1")
+    realtimeURL = supabaseURL.appendingPathComponent("/realtime/v1")
+
     schema = options.db.schema
     httpClient = options.global.httpClient
 
@@ -73,7 +82,7 @@ public class SupabaseClient {
     ].merging(options.global.headers) { _, new in new }
 
     auth = GoTrueClient(
-      url: supabaseURL.appendingPathComponent("/auth/v1"),
+      url: authURL,
       headers: defaultHeaders,
       localStorage: options.auth.storage
     )

Tests/SupabaseTests/SupabaseClientTests.swift

@@ -1,7 +1,53 @@
+import GoTrue
 @testable import Supabase
 import XCTest
 
+final class GoTrueLocalStorageMock: GoTrueLocalStorage {
+  func store(key _: String, value _: Data) throws {}
+
+  func retrieve(key _: String) throws -> Data? {
+    nil
+  }
+
+  func remove(key _: String) throws {}
+}
+
 final class SupabaseClientTests: XCTestCase {
+  func testClientInitialization() {
+    let customSchema = "custom_schema"
+    let localStorage = GoTrueLocalStorageMock()
+    let customHeaders = ["header_field": "header_value"]
+    let httpClient = SupabaseClient.HTTPClient(storage: nil)
+
+    let client = SupabaseClient(
+      supabaseURL: URL(string: "https://project-ref.supabase.co")!,
+      supabaseKey: "ANON_KEY",
+      options: SupabaseClientOptions(
+        db: SupabaseClientOptions.DatabaseOptions(schema: customSchema),
+        auth: SupabaseClientOptions.AuthOptions(storage: localStorage),
+        global: SupabaseClientOptions.GlobalOptions(
+          headers: customHeaders,
+          httpClient: httpClient
+        )
+      )
+    )
+
+    XCTAssertEqual(client.supabaseURL.absoluteString, "https://project-ref.supabase.co")
+    XCTAssertEqual(client.supabaseKey, "ANON_KEY")
+    XCTAssertEqual(client.authURL.absoluteString, "https://project-ref.supabase.co/auth/v1")
+    XCTAssertEqual(client.storageURL.absoluteString, "https://project-ref.supabase.co/storage/v1")
+    XCTAssertEqual(client.databaseURL.absoluteString, "https://project-ref.supabase.co/rest/v1")
+    XCTAssertEqual(client.realtimeURL.absoluteString, "https://project-ref.supabase.co/realtime/v1")
+    XCTAssertEqual(
+      client.defaultHeaders,
+      [
+        "X-Client-Info": "supabase-swift/\(Supabase.version)",
+        "apikey": "ANON_KEY",
+        "header_field": "header_value",
+      ]
+    )
+  }
+
   func testFunctionsURL() {
     var client = SupabaseClient(
       supabaseURL: URL(string: "https://project-ref.supabase.co")!,