more api stuff

Author: Shy

Sources/Temporal/Bridge/BridgeClient+Context.swift

@@ -19,21 +19,13 @@ extension BridgeClient {
         let queue: WorkerClientQueue<[UInt8]>
         // Capture the `unary` gRPC method from `AnyUInt8GRPCClient` so that we avoid generics (C-closures can't capture generics)
         let unaryGrpcRequest: UnaryCall<UInt8ArraySerializer, UInt8ArrayDeserializer>
-        let clientName: String = TemporalWorker.Configuration.workerClientName
-        let clientVersion: String = TemporalWorker.Configuration.workerClientVersion
-        let apiKey: String?
 
+        // NOTE: Headers (client-name, client-version, temporal-namespace, authorization/api-key)
+        // are ALL handled by the Rust core SDK. We return an empty Metadata here and let
+        // the Rust core's headers come through via the request_headers in the grpcCallback.
+        // This avoids duplicate header definitions and ensures consistency with other language SDKs.
         var metadata: Metadata {
-            var metadata: Metadata = [:]
-            metadata.addString(self.clientName, forKey: "client-name")
-            metadata.addString(self.clientVersion, forKey: "client-version")
-
-            // Add API key authentication if provided
-            if let apiKey = self.apiKey {
-                metadata.addString("Bearer \(apiKey)", forKey: "authorization")
-            }
-
-            return metadata
+            return [:]
         }
 
         init(
@@ -43,7 +35,7 @@ extension BridgeClient {
         ) {
             self.queue = queue
             self.unaryGrpcRequest = unaryGrpcRequest
-            self.apiKey = apiKey
+            // apiKey is passed to Rust core via TemporalWorker.Configuration, not used here
         }
     }
 }

Sources/Temporal/Bridge/BridgeClient.swift

@@ -265,23 +265,26 @@ package struct BridgeClient: ~Copyable, Sendable {
                     // has to be a valid URL, otherwise input validation fails
                     try "https://dummy.temporal.com".withByteArrayRef { dummy_target_url in
                         try "".withByteArrayRef { empty_string in
-                            let options = TemporalCoreClientOptions(
-                                target_url: dummy_target_url,  // Dummy URL as gRPC connection is handled by Swift
-                                client_name: client_name,
-                                client_version: client_version,
-                                metadata: empty_string,
-                                api_key: empty_string,
-                                identity: identityBytes,
-                                tls_options: nil,  // Empty TLS config as auth is handled by Swift
-                                retry_options: nil,  // Default is picked when passing `nil`
-                                keep_alive_options: nil,  // Default is picked when passing `nil`, HTTP2 gRPC keep alive enabled.
-                                http_connect_proxy_options: nil,
-                                grpc_override_callback: grpcCallback,
-                                grpc_override_callback_user_data: grpcCallbackUserDataPointer
-                            )
+                            // Pass API key to Rust core if provided
+                            try (configuration.apiKey ?? "").withByteArrayRef { api_key_bytes in
+                                let options = TemporalCoreClientOptions(
+                                    target_url: dummy_target_url,  // Dummy URL as gRPC connection is handled by Swift
+                                    client_name: client_name,
+                                    client_version: client_version,
+                                    metadata: empty_string,
+                                    api_key: api_key_bytes,  // Now passes the actual API key to Rust core
+                                    identity: identityBytes,
+                                    tls_options: nil,  // Empty TLS config as auth is handled by Swift
+                                    retry_options: nil,  // Default is picked when passing `nil`
+                                    keep_alive_options: nil,  // Default is picked when passing `nil`, HTTP2 gRPC keep alive enabled.
+                                    http_connect_proxy_options: nil,
+                                    grpc_override_callback: grpcCallback,
+                                    grpc_override_callback_user_data: grpcCallbackUserDataPointer
+                                )
 
-                            return try withUnsafePointer(to: options) { unsafe_options in
-                                try body(unsafe_options)
+                                return try withUnsafePointer(to: options) { unsafe_options in
+                                    try body(unsafe_options)
+                                }
                             }
                         }
                     }

Sources/Temporal/Client/TemporalClient.swift

@@ -104,6 +104,7 @@ public final class TemporalClient: Sendable {
         var metadata: GRPCCore.Metadata = [:]
         metadata.addString(configuration.clientName, forKey: "client-name")
         metadata.addString(configuration.clientVersion, forKey: "client-version")
+        metadata.addString(configuration.namespace, forKey: "temporal-namespace")
 
         // Add API key authentication if provided
         if let apiKey = configuration.apiKey {