Merge pull request #58 from torusresearch/add-usertype-and-nonce

add usertype and nonce

Author: chaitanyapotti

Package.resolved

@@ -14,7 +14,7 @@ let package = Package(
             targets: ["CustomAuth"])
     ],
     dependencies: [
-        .package(name: "TorusUtils", url: "https://github.com/torusresearch/torus-utils-swift.git", from: "5.0.0"),
+        .package(name: "TorusUtils", url: "https://github.com/torusresearch/torus-utils-swift.git", from: "5.1.1"),
         .package(name: "jwt-kit", url: "https://github.com/vapor/jwt-kit.git", from: "4.0.0"),
         .package(name: "JWTDecode", url: "https://github.com/auth0/JWTDecode.swift.git", from: "3.0.1")
     ],

Package.swift

@@ -17,7 +17,7 @@ var tsSdkLogType = OSLogType.default
 /// Provides integration of an iOS app with Torus CustomAuth.
 open class CustomAuth {
     let factory: CASDKFactoryProtocol
-    var torusUtils: AbstractTorusUtils
+    public var torusUtils: AbstractTorusUtils
     let fetchNodeDetails: FetchNodeDetails
     var urlSession: URLSession
     var enableOneKey: Bool
@@ -192,6 +192,8 @@ open class CustomAuth {
             var data = userData
             data["privateKey"] = responseFromRetrieveShares.privateKey
             data["publicAddress"] = responseFromRetrieveShares.publicAddress
+            data["nonce"] = responseFromRetrieveShares.nonce
+            data["typeOfUser"] = responseFromRetrieveShares.typeOfUser
             return data
         } catch {
             os_log("handleSingleLogin: err: %s", log: getTorusLogger(log: CASDKLogger.core, type: .error), type: .error, error.localizedDescription)

Sources/CustomAuth/CustomAuth.swift

@@ -33,7 +33,7 @@ final class IntegrationTests: XCTestCase {
         let email = "[email protected]"
         let jwt = try! generateIdToken(email: email)
         do {
-        let data = try await IntegrationTests.sdk?.getTorusKey(verifier: TORUS_TEST_VERIFIER, verifierId: email, idToken: jwt)
+            let data = try await IntegrationTests.sdk?.getTorusKey(verifier: TORUS_TEST_VERIFIER, verifierId: email, idToken: jwt)
             XCTAssertEqual(data?["publicAddress"] as! String, "0x8AA6C8ddCD868873120aA265Fc63E3a2180375BA")
             exp1.fulfill()
         } catch {

Tests/CustomAuthTests/IntegrationTests.swift

@@ -1,6 +1,7 @@
 import CustomAuth
 import FetchNodeDetails
 import Foundation
+import BigInt
 @testable import TorusUtils
 
 // Added so the that we can assign values later.
@@ -18,7 +19,7 @@ class MockTorusUtils: AbstractTorusUtils, MockAbstractTorusUtils {
             "idToken": idToken,
             "extraParams": extraParams
         ]
-        return .init(publicKey: retrieveShares_output["publicAddress"] ?? "", privateKey: retrieveShares_output["privateKey"] ?? "")
+        return .init(publicKey: retrieveShares_output["publicAddress"] ?? "", privateKey: retrieveShares_output["privateKey"] ?? "", nonce: BigUInt(0), typeOfUser: .v1)
     }
 
     func getPublicAddress(endpoints: [String], torusNodePubs: [TorusNodePubModel], verifier: String, verifierId: String, isExtended: Bool) async throws -> GetPublicAddressModel {
@@ -63,4 +64,8 @@ class MockTorusUtils: AbstractTorusUtils, MockAbstractTorusUtils {
         ]
         return retrieveShares_output
     }
+    
+    func getPostBoxKey(torusKey: RetrieveSharesResponseModel) -> String {
+        return ""
+    }
 }