From c74ce06b24e936531f690cd9695b64d0dd1cbfbb Mon Sep 17 00:00:00 2001
From: Guilherme Souza <guilherme@supabase.io>
Date: Fri, 7 Feb 2025 08:32:20 -0300
Subject: [PATCH] fix(realtime): remove jwt check

Also:
- Call `setAuth` after heartbeat
- Send `x-client-info` when joining channel
---
 Sources/Realtime/RealtimeChannelV2.swift  |  3 ++-
 Sources/Realtime/RealtimeClientV2.swift   | 20 +++++++++-----------
 Sources/Realtime/RealtimeJoinConfig.swift |  2 ++
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Sources/Realtime/RealtimeChannelV2.swift b/Sources/Realtime/RealtimeChannelV2.swift
index 50c1958e..71412241 100644
--- a/Sources/Realtime/RealtimeChannelV2.swift
+++ b/Sources/Realtime/RealtimeChannelV2.swift
@@ -104,7 +104,8 @@ public final class RealtimeChannelV2: Sendable {
 
     let payload = RealtimeJoinPayload(
       config: joinConfig,
-      accessToken: await socket._getAccessToken()
+      accessToken: await socket._getAccessToken(),
+      version: socket.options.headers[.xClientInfo]
     )
 
     let joinRef = socket.makeRef()
diff --git a/Sources/Realtime/RealtimeClientV2.swift b/Sources/Realtime/RealtimeClientV2.swift
index 34a01940..c731eec4 100644
--- a/Sources/Realtime/RealtimeClientV2.swift
+++ b/Sources/Realtime/RealtimeClientV2.swift
@@ -117,13 +117,18 @@ public final class RealtimeClientV2: Sendable {
     wsTransport: @escaping WebSocketTransport,
     http: any HTTPClientType
   ) {
+    var options = options
+    if options.headers[.xClientInfo] == nil {
+      options.headers[.xClientInfo] = "realtime-swift/\(version)"
+    }
+
     self.url = url
     self.options = options
     self.wsTransport = wsTransport
     self.http = http
     apikey = options.apikey
 
-    mutableState.withValue {
+    mutableState.withValue { [options] in
       if let accessToken = options.headers[.authorization]?.split(separator: " ").last {
         $0.accessToken = String(accessToken)
       } else {
@@ -353,7 +358,7 @@ public final class RealtimeClientV2: Sendable {
         if Task.isCancelled {
           break
         }
-        self?.sendHeartbeat()
+        await self?.sendHeartbeat()
       }
     }
     mutableState.withValue {
@@ -361,7 +366,7 @@ public final class RealtimeClientV2: Sendable {
     }
   }
 
-  private func sendHeartbeat() {
+  private func sendHeartbeat() async {
     let pendingHeartbeatRef: String? = mutableState.withValue {
       if $0.pendingHeartbeatRef != nil {
         $0.pendingHeartbeatRef = nil
@@ -383,6 +388,7 @@ public final class RealtimeClientV2: Sendable {
           payload: [:]
         )
       )
+      await setAuth()
     } else {
       options.logger?.debug("Heartbeat timeout")
       reconnect()
@@ -426,14 +432,6 @@ public final class RealtimeClientV2: Sendable {
       token = mutableState.accessToken
     }
 
-    if let token, let payload = JWT.decodePayload(token),
-      let exp = payload["exp"] as? TimeInterval, exp < Date().timeIntervalSince1970
-    {
-      options.logger?.warning(
-        "InvalidJWTToken: Invalid value for JWT claim \"exp\" with value \(exp)")
-      return
-    }
-
     mutableState.withValue { [token] in
       $0.accessToken = token
     }
diff --git a/Sources/Realtime/RealtimeJoinConfig.swift b/Sources/Realtime/RealtimeJoinConfig.swift
index 06b0a492..a617757f 100644
--- a/Sources/Realtime/RealtimeJoinConfig.swift
+++ b/Sources/Realtime/RealtimeJoinConfig.swift
@@ -10,10 +10,12 @@ import Foundation
 struct RealtimeJoinPayload: Codable {
   var config: RealtimeJoinConfig
   var accessToken: String?
+  var version: String?
 
   enum CodingKeys: String, CodingKey {
     case config
     case accessToken = "access_token"
+    case version
   }
 }