fix token refreshing

reown-com · Nov 7, 2024 · c0f5748 · c0f5748
1 parent 397eead
commit c0f5748
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/Sources/WalletConnectRelay/ClientAuth/ClientIdAuthenticator.swift b/Sources/WalletConnectRelay/ClientAuth/ClientIdAuthenticator.swift
@@ -7,22 +7,28 @@ public protocol ClientIdAuthenticating {
 
 public final class ClientIdAuthenticator: ClientIdAuthenticating {
     private let clientIdStorage: ClientIdStoring
+    private let logger: ConsoleLogging
 
-    public init(clientIdStorage: ClientIdStoring) {
+    public init(clientIdStorage: ClientIdStoring,
+                logger: ConsoleLogging) {
         self.clientIdStorage = clientIdStorage
+        self.logger = logger
     }
 
     public func createAuthToken(url: String) throws -> String {
         let keyPair = try clientIdStorage.getOrCreateKeyPair()
         let payload = RelayAuthPayload(subject: getSubject(), audience: url)
+        logger.debug("Creating auth token for \(url)")
         return try payload.signAndCreateWrapper(keyPair: keyPair).jwtString
     }
 
     public func refreshTokenIfNeeded(token: String, url: String) throws -> String {
         if try isTokenExpired(token: token) {
+            logger.debug("Refreshing auth token for \(url)")
             // Token has expired, generate a new one
             return try createAuthToken(url: url)
         } else {
+            logger.debug("Token is still valid for \(url)")
             // Token is still valid, return existing token
             return token
         }

diff --git a/Sources/WalletConnectRelay/RelayClientFactory.swift b/Sources/WalletConnectRelay/RelayClientFactory.swift
@@ -49,7 +49,8 @@ public struct RelayClientFactory {
         let clientIdStorage = ClientIdStorage(defaults: keyValueStorage, keychain: keychainStorage, logger: logger)
 
         let socketAuthenticator = ClientIdAuthenticator(
-            clientIdStorage: clientIdStorage
+            clientIdStorage: clientIdStorage,
+            logger: logger
         )
         let relayUrlFactory = RelayUrlFactory(
             relayHost: relayHost,

diff --git a/Sources/WalletConnectRelay/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift b/Sources/WalletConnectRelay/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift
@@ -95,7 +95,13 @@ class AutomaticSocketConnectionHandler {
         }
 
         do {
-            let refreshedToken = try clientIdAuthenticator.refreshTokenIfNeeded(token: token, url: socket.request.url!.absoluteString)
+            // Parse the URL and extract only the base URL (without query parameters)
+            var urlComponents = URLComponents(url: socket.request.url!, resolvingAgainstBaseURL: false)
+            urlComponents?.query = nil
+            let baseUrlString = urlComponents?.url?.absoluteString ?? socket.request.url!.absoluteString
+
+            // Refresh the token with just the base URL
+            let refreshedToken = try clientIdAuthenticator.refreshTokenIfNeeded(token: token, url: baseUrlString)
             let newAuthorizationHeader = "Bearer \(refreshedToken)"
             socket.request.allHTTPHeaderFields?["Authorization"] = newAuthorizationHeader
         } catch {