auth-service v10 and wallet-service changes

Package.swift

@@ -17,14 +17,24 @@ let package = Package(
         .package(name:"SessionManager",url: "https://github.com/Web3Auth/session-manager-swift.git",from: "6.0.2"),
         .package(name: "curvelib.swift", url: "https://github.com/tkey/curvelib.swift", from: "2.0.0"),
         .package(url: "https://github.com/attaswift/BigInt.git", from: "5.3.0"),
+        .package(url: "https://github.com/torusresearch/torus-utils-swift.git", from: "10.0.1"),
+        .package(url: "https://github.com/vapor/jwt-kit.git", from: "4.0.0"),
+        .package(url: "https://github.com/auth0/JWTDecode.swift.git", from: "3.2.0")
     ],
     targets: [
         .target(
             name: "Web3Auth",
-            dependencies: ["KeychainSwift", .product(name: "curveSecp256k1", package: "curvelib.swift"), "SessionManager", "BigInt"]),
+            dependencies: [
+                "KeychainSwift",
+                .product(name: "curveSecp256k1", package: "curvelib.swift"),
+                "SessionManager",
+                "BigInt",
+                .product(name: "TorusUtils", package: "torus-utils-swift"),
+                .product(name: "JWTDecode", package: "JWTDecode.swift")
+            ]),
         .testTarget(
             name: "Web3AuthTests",
-            dependencies: ["Web3Auth"])
+            dependencies: ["Web3Auth", .product(name: "JWTKit", package: "jwt-kit")])
     ],
     swiftLanguageVersions: [.v5]
 )

README.md

@@ -52,15 +52,15 @@ Checkout [SDK Reference](https://web3auth.io/docs/sdk/pnp/ios/install#configure-
 ```swift
 import Web3Auth
 
-let web3auth = try Web3Auth(W3AInitParams(
+let web3auth = try Web3Auth(Web3AuthOptions(
   // Get your Web3Auth Client Id from dashboard.web3auth.io
   clientId: "YOUR_WEB3AUTH_CLIENT_ID",
-  network: .sapphire_mainnet,
+  web3AuthNetwork: .sapphire_mainnet,
   redirectUrl: "bundleId://auth"
 ))
 
 // Login
-let result = try await web3Auth.login(W3ALoginParams(loginProvider: .GOOGLE))
+let result = try await web3Auth.login(LoginParams(loginProvider: .GOOGLE))
 
 // Logout
 try await web3auth.logout()

Sources/Web3Auth/Provider.swift → Sources/Web3Auth/AuthConnection.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public enum Web3AuthProvider: String, Codable {
+public enum AuthConnection: String, Codable {
     case GOOGLE = "google"
     case FACEBOOK = "facebook"
     case REDDIT = "reddit"
@@ -15,7 +15,7 @@ public enum Web3AuthProvider: String, Codable {
     case WEIBO = "weibo"
     case WECHAT = "wechat"
     case EMAIL_PASSWORDLESS = "email_passwordless"
-    case JWT = "jwt"
+    case CUSTOM = "custom"
     case SMS_PASSWORDLESS = "sms_passwordless"
     case FARCASTER = "farcaster"
 }

Sources/Web3Auth/Data+extensions.swift

@@ -21,6 +21,14 @@ internal extension Data {
         result = result.replacingOccurrences(of: "=", with: "")
         return result
     }
+
+    var bytes: Array<UInt8> {
+        Array(self)
+    }
+
+    func toHexString() -> String {
+        bytes.toHexString()
+    }
 }
 
 internal extension Data {

Sources/Web3Auth/EmailFlowType.swift

@@ -0,0 +1,7 @@
+import Foundation
+
+public enum EmailFlowType: String, Codable {
+    case link
+    case code
+}
+

Sources/Web3Auth/KeyChainHelper.swift

@@ -0,0 +1,65 @@
+import Foundation
+import Security
+
+final class KeychainHelper {
+
+    static let shared = KeychainHelper()
+    private init() {}
+
+    // Save any Codable value
+    func save<T: Codable>(_ value: T, forKey key: String) {
+        guard let data = try? JSONEncoder().encode(value) else { return }
+
+        let query: [String: Any] = [
+            kSecClass as String:           kSecClassGenericPassword,
+            kSecAttrAccount as String:     key
+        ]
+
+        // Delete existing before adding new
+        SecItemDelete(query as CFDictionary)
+
+        let addQuery: [String: Any] = [
+            kSecClass as String:           kSecClassGenericPassword,
+            kSecAttrAccount as String:     key,
+            kSecValueData as String:       data
+        ]
+
+        SecItemAdd(addQuery as CFDictionary, nil)
+    }
+
+    // Get any Codable value
+    func get<T: Codable>(forKey key: String, as type: T.Type) -> T? {
+        let query: [String: Any] = [
+            kSecClass as String:           kSecClassGenericPassword,
+            kSecAttrAccount as String:     key,
+            kSecReturnData as String:      true,
+            kSecMatchLimit as String:      kSecMatchLimitOne
+        ]
+
+        var item: AnyObject?
+        SecItemCopyMatching(query as CFDictionary, &item)
+
+        guard let data = item as? Data else { return nil }
+        return try? JSONDecoder().decode(type, from: data)
+    }
+
+    // Delete a single key
+    func delete(forKey key: String) {
+        let query: [String: Any] = [
+            kSecClass as String:       kSecClassGenericPassword,
+            kSecAttrAccount as String: key
+        ]
+        SecItemDelete(query as CFDictionary)
+    }
+
+    // Clear all in keychain
+    func clearAll() {
+        let query: [String: Any] = [kSecClass as String: kSecClassGenericPassword]
+        SecItemDelete(query as CFDictionary)
+    }
+}
+
+struct KeychainKeys {
+    static let isSFA = "isSFA"
+}
+

Sources/Web3Auth/KeychainManager.swift

@@ -2,13 +2,13 @@ import SessionManager
 
 extension KeychainManager {
     func saveDappShare(userInfo: Web3AuthUserInfo) {
-        guard let verifer = userInfo.verifier, let veriferID = userInfo.verifierId, let dappShare = userInfo.dappShare else { return }
+        guard let verifer = userInfo.authConnectionId, let veriferID = userInfo.userId, let dappShare = userInfo.dappShare else { return }
         let key = verifer + " | " + veriferID
         KeychainManager.shared.save(key: .custom(dappShare), val: key)
     }
 
-    func getDappShare(verifier: String) -> String? {
-        return searchDappShare(query: verifier)
+    func getDappShare(authConnectionId: String) -> String? {
+        return searchDappShare(query: authConnectionId)
     }
 
     private func searchDappShare(query: String) -> String? {

Sources/Web3Auth/Networking/NetworkClient.swift

@@ -7,9 +7,9 @@ enum Router: NetworkManagerProtocol {
     var path: String {
         switch self {
         case .get:
-            return "/api/configuration"
+            return "/api/v2/configuration"
         case .set:
-            return "/api/configuration"
+            return "/api/v2/configuration"
         }
     }
 

Sources/Web3Auth/OSLog.swift

@@ -6,7 +6,7 @@ var web3AuthLogType = OSLogType.default
 public struct Web3AuthLogger {
     static let inactiveLog = OSLog.disabled
     static let core = OSLog(subsystem: subsystem, category: "core")
-    static let network = OSLog(subsystem: subsystem, category: "network")
+    static let web3AuthNetwork = OSLog(subsystem: subsystem, category: "web3AuthNetwork")
 }
 
 @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)