Merge pull request #101 from torusresearch/fix_backwards_compat_for_h…

…ex_and_base64_tokens fix: token could be hex or base64
torusresearch · Jul 30, 2024 · 710a851 · 710a851
2 parents 42caa33 + ecf4a77
commit 710a851
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Sources/TorusUtils/Helpers/NodeUtils.swift b/Sources/TorusUtils/Helpers/NodeUtils.swift
@@ -462,7 +462,11 @@ internal class NodeUtils {
             if item == nil {
                 sessionTokenDatas.append(nil)
             } else {
-                sessionTokenDatas.append(SessionToken(token: Data(hexString: item!)!.base64EncodedString(), signature: sessionTokenSigs[i]!.data(using: .utf8)!.hexString, node_pubx: shareResponses[i].nodePubX, node_puby: shareResponses[i].nodePubY))
+                if Data(hexString: item!) != nil {
+                    sessionTokenDatas.append(SessionToken(token: Data(hexString: item!)!.base64EncodedString(), signature: sessionTokenSigs[i]!.data(using: .utf8)!.hexString, node_pubx: shareResponses[i].nodePubX, node_puby: shareResponses[i].nodePubY))
+                } else {
+                    sessionTokenDatas.append(SessionToken(token: item!, signature: sessionTokenSigs[i]!.data(using: .utf8)!.hexString, node_pubx: shareResponses[i].nodePubX, node_puby: shareResponses[i].nodePubY))
+                }
             }
         }
 

diff --git a/Tests/TorusUtilsTests/SapphireDevnetTest.swift b/Tests/TorusUtilsTests/SapphireDevnetTest.swift
@@ -291,12 +291,12 @@ final class SapphireDevnetTest: XCTestCase {
         let signatures = data.sessionData.sessionTokenData.map({ $0!.token })
         let parsedSignatures = signatures.map({
             let data = Data(base64Encoded: $0.data(using: .utf8)!)!
-            let hexString = String(data: data, encoding: .utf8)!
-            let json = hexString.hexEncodedToString()
+            let json = String(data: data, encoding: .utf8)!
             return json
         })
         let now = Int(Date().timeIntervalSince1970)
         for item in parsedSignatures {
+
             let json = try JSONSerialization.jsonObject(with: item.data(using: .utf8)!) as? [String: Any]
             let exp = json!["exp"] as! Int
             let sessionTime = exp - now

diff --git a/Tests/TorusUtilsTests/SapphireMainnetTests.swift b/Tests/TorusUtilsTests/SapphireMainnetTests.swift
@@ -270,8 +270,7 @@ class SapphireMainnetTests: XCTestCase {
         let signatures = data.sessionData.sessionTokenData.map({ $0!.token })
         let parsedSignatures = signatures.map({
             let data = Data(base64Encoded: $0.data(using: .utf8)!)!
-            let hexString = String(data: data, encoding: .utf8)!
-            let json = hexString.hexEncodedToString()
+            let json = String(data: data, encoding: .utf8)!
             return json
         })
         let now = Int(Date().timeIntervalSince1970)