refactor(auth): change AuthClientID to Int to better visiblity of client usage (#656)

Co-authored-by: Guilherme Souza <[email protected]>

Author: grdsdev

Sources/Auth/AuthClient.swift

@@ -14,10 +14,22 @@ import Helpers
   import WatchKit
 #endif
 
-typealias AuthClientID = UUID
+typealias AuthClientID = Int
+
+struct AuthClientLoggerDecorator: SupabaseLogger {
+  let clientID: AuthClientID
+  let decoratee: any SupabaseLogger
+
+  func log(message: SupabaseLogMessage) {
+    var message = message
+    message.additionalContext["client_id"] = .integer(clientID)
+    decoratee.log(message: message)
+  }
+}
 
 public final class AuthClient: Sendable {
-  let clientID = AuthClientID()
+  static let globalClientID = LockIsolated(0)
+  let clientID: AuthClientID
 
   private var api: APIClient { Dependencies[clientID].api }
   var configuration: AuthClient.Configuration { Dependencies[clientID].configuration }
@@ -71,13 +83,21 @@ public final class AuthClient: Sendable {
   /// - Parameters:
   ///   - configuration: The client configuration.
   public init(configuration: Configuration) {
+    clientID = AuthClient.globalClientID.withValue {
+      $0 += 1
+      return $0
+    }
+
     Dependencies[clientID] = Dependencies(
       configuration: configuration,
       http: HTTPClient(configuration: configuration),
       api: APIClient(clientID: clientID),
       codeVerifierStorage: .live(clientID: clientID),
       sessionStorage: .live(clientID: clientID),
-      sessionManager: .live(clientID: clientID)
+      sessionManager: .live(clientID: clientID),
+      logger: configuration.logger.map {
+        AuthClientLoggerDecorator(clientID: clientID, decoratee: $0)
+      }
     )
 
     Task { @MainActor in observeAppLifecycleChanges() }

Sources/Auth/Internal/Dependencies.swift

@@ -15,10 +15,10 @@ struct Dependencies: Sendable {
 
   var urlOpener: URLOpener = .live
   var pkce: PKCE = .live
+  var logger: (any SupabaseLogger)?
 
   var encoder: JSONEncoder { configuration.encoder }
   var decoder: JSONDecoder { configuration.decoder }
-  var logger: (any SupabaseLogger)? { configuration.logger }
 }
 
 extension Dependencies {

Sources/Helpers/SupabaseLogger.swift

@@ -31,7 +31,7 @@ public struct SupabaseLogMessage: Codable, CustomStringConvertible, Sendable {
   public let function: String
   public let line: UInt
   public let timestamp: TimeInterval
-  public let additionalContext: JSONObject
+  public var additionalContext: JSONObject
 
   @usableFromInline
   init(
@@ -55,7 +55,8 @@ public struct SupabaseLogMessage: Codable, CustomStringConvertible, Sendable {
   }
 
   public var description: String {
-    let date = ISO8601DateFormatter.iso8601.value.string(from: Date(timeIntervalSince1970: timestamp))
+    let date = ISO8601DateFormatter.iso8601.value.string(
+      from: Date(timeIntervalSince1970: timestamp))
     let file = fileID.split(separator: ".", maxSplits: 1).first.map(String.init) ?? fileID
     var description = "\(date) [\(level)] [\(system)] [\(file).\(function):\(line)] \(message)"
     if !additionalContext.isEmpty {