fix _headers

Author: zunda-pixel

Sources/Supabase/SupabaseClient.swift

@@ -47,7 +47,7 @@ public final class SupabaseClient: Sendable {
         $0.rest = PostgrestClient(
           url: databaseURL,
           schema: options.db.schema,
-          headers: _headers,
+          headers: headers,
           logger: options.global.logger,
           fetch: { request, bodyData in
             if let bodyData {
@@ -72,7 +72,7 @@ public final class SupabaseClient: Sendable {
         $0.storage = SupabaseStorageClient(
           configuration: StorageClientConfiguration(
             url: storageURL,
-            headers: _headers,
+            headers: headers,
             session: StorageHTTPSession { request, bodyData in
               if let bodyData {
                 return try await self.uploadWithAuth(for: request, from: bodyData)
@@ -100,7 +100,7 @@ public final class SupabaseClient: Sendable {
       if $0.functions == nil {
         $0.functions = FunctionsClient(
           url: functionsURL,
-          headers: _headers,
+          headers: headers,
           region: options.functions.region,
           logger: options.global.logger,
           fetch: { request, bodyData in
@@ -116,14 +116,11 @@ public final class SupabaseClient: Sendable {
       return $0.functions!
     }
   }
-
-  let _headers: HTTPFields
+	
   /// Headers provided to the inner clients on initialization.
   ///
   /// - Note: This collection is non-mutable, if you want to provide different headers, pass it in ``SupabaseClientOptions/GlobalOptions/headers``.
-  public var headers: [String: String] {
-    _headers.dictionary
-  }
+  public let headers: HTTPFields
 
   struct MutableState {
     var listenForAuthEventsTask: Task<Void, Never>?
@@ -177,14 +174,14 @@ public final class SupabaseClient: Sendable {
       .authorization: "Bearer \(supabaseKey)",
       .apiKey: supabaseKey,
     ]
-    _headers = headers.merging(with: options.global.headers)
+    self.headers = headers.merging(with: options.global.headers)
 
     // default storage key uses the supabase project ref as a namespace
     let defaultStorageKey = "sb-\(supabaseURL.host!.split(separator: ".")[0])-auth-token"
 
     _auth = AuthClient(
       url: supabaseURL.appendingPathComponent("/auth/v1"),
-      headers: _headers,
+	  headers: self.headers,
       flowType: options.auth.flowType,
       redirectToURL: options.auth.redirectToURL,
       storageKey: options.auth.storageKey ?? defaultStorageKey,
@@ -206,13 +203,13 @@ public final class SupabaseClient: Sendable {
     _realtime = UncheckedSendable(
       RealtimeClient(
         supabaseURL.appendingPathComponent("/realtime/v1").absoluteString,
-        headers: _headers,
-        params: _headers.dictionary
+        headers: headers,
+        params: headers.dictionary
       )
     )
 
     var realtimeOptions = options.realtime
-    realtimeOptions.headers.merge(with: _headers)
+	realtimeOptions.headers.merge(with: self.headers)
     if realtimeOptions.logger == nil {
       realtimeOptions.logger = options.global.logger
     }

Tests/SupabaseTests/SupabaseClientTests.swift

@@ -64,23 +64,22 @@ final class SupabaseClientTests: XCTestCase {
     )
 
     XCTAssertEqual(
-      client.headers,
+	  client.headers,
       [
-        "X-Client-Info": "supabase-swift/\(Supabase.version)",
-        "Apikey": "ANON_KEY",
-        "header_field": "header_value",
-        "Authorization": "Bearer ANON_KEY",
+		.xClientInfo: "supabase-swift/\(Supabase.version)",
+		.apiKey: "ANON_KEY",
+		.init("header_field")!: "header_value",
+		.authorization: "Bearer ANON_KEY",
       ]
     )
-    expectNoDifference(client._headers.dictionary, client.headers)
 
     XCTAssertEqual(client.functions.region, "ap-northeast-1")
 
     let realtimeURL = client.realtimeV2.url
     XCTAssertEqual(realtimeURL.absoluteString, "https://project-ref.supabase.co/realtime/v1")
 
     let realtimeOptions = client.realtimeV2.options
-    let expectedRealtimeHeader = client._headers.merging(with: [
+    let expectedRealtimeHeader = client.headers.merging(with: [
       .init("custom_realtime_header_key")!: "custom_realtime_header_value"
     ]
     )