#219 auth wrapper

Example/DApp/ Accounts/AccountsViewController.swift

@@ -9,7 +9,6 @@ struct AccountDetails {
 
 final class AccountsViewController: UIViewController, UITableViewDataSource, UITableViewDelegate  {
 
-    let client = ClientDelegate.shared.client
     let session: Session
     var accountsDetails: [AccountDetails] = []
     var onDisconnect: (()->())?
@@ -54,7 +53,7 @@ final class AccountsViewController: UIViewController, UITableViewDataSource, UIT
     private func disconnect() {
         Task {
             do {
-                try await client.disconnect(topic: session.topic, reason: Reason(code: 0, message: "disconnect"))
+                try await Auth.instance.disconnect(topic: session.topic, reason: Reason(code: 0, message: "disconnect"))
                 DispatchQueue.main.async { [weak self] in
                     self?.onDisconnect?()
                 }

Example/DApp/AccountRequest/AccountRequestViewController.swift

@@ -7,7 +7,6 @@ import WalletConnectUtils
 
 class AccountRequestViewController: UIViewController, UITableViewDelegate, UITableViewDataSource  {
     private let session: Session
-    private let client: AuthClient = ClientDelegate.shared.client
     private let chainId: String
     private let account: String
     private let methods = ["eth_sendTransaction", "personal_sign", "eth_signTypedData"]
@@ -61,7 +60,7 @@ class AccountRequestViewController: UIViewController, UITableViewDelegate, UITab
         let request = Request(topic: session.topic, method: method, params: requestParams, chainId: Blockchain(chainId)!)
         Task {
             do {
-                try await client.request(params: request)
+                try await Auth.instance.request(params: request)
                 DispatchQueue.main.async { [weak self] in
                     self?.presentConfirmationAlert()
                 }

Example/DApp/Connect/ConnectViewController.swift

@@ -5,7 +5,7 @@ import WalletConnectAuth
 
 class ConnectViewController: UIViewController, UITableViewDataSource, UITableViewDelegate {
     let uriString: String
-    let activePairings: [Pairing] = ClientDelegate.shared.client.getSettledPairings()
+    let activePairings: [Pairing] = Auth.instance.getSettledPairings()
     let segmentedControl = UISegmentedControl(items: ["Pairings", "New Pairing"])
 
     init(uri: String) {
@@ -99,7 +99,7 @@ class ConnectViewController: UIViewController, UITableViewDataSource, UITableVie
         let methods: Set<String> = ["eth_sendTransaction", "personal_sign", "eth_signTypedData"]
         let namespaces: [String: ProposalNamespace] = ["eip155": ProposalNamespace(chains: blockchains, methods: methods, events: [], extensions: nil)]
         Task {
-            _ = try await ClientDelegate.shared.client.connect(requiredNamespaces: namespaces, topic: pairingTopic)
+            _ = try await Auth.instance.connect(requiredNamespaces: namespaces, topic: pairingTopic)
             connectWithExampleWallet()
         }
     }

Example/DApp/ResponseViewController.swift

@@ -24,7 +24,7 @@ class ResponseViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        let record = ClientDelegate.shared.client.getSessionRequestRecord(id: response.result.id)!
+        let record = Auth.instance.getSessionRequestRecord(id: response.result.id)!
         switch response.result {
         case  .response(let response):
             responseView.nameLabel.text = "Received Response\n\(record.request.method)"

Example/DApp/SceneDelegate.swift

@@ -1,10 +1,12 @@
 
 import UIKit
 import WalletConnectAuth
+import Combine
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     var window: UIWindow?
+    private var publishers = [AnyCancellable]()
 
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
@@ -13,13 +15,24 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
         guard let windowScene = (scene as? UIWindowScene) else { return }
         window = UIWindow(windowScene: windowScene)
-        ClientDelegate.shared.onSessionDelete = { [unowned self] in
-            showSelectChainScreen()
-        }
-        ClientDelegate.shared.onSessionResponse = { [unowned self] response in
+        let metadata = AppMetadata(
+            name: "Swift Dapp",
+            description: "a description",
+            url: "wallet.connect",
+            icons: ["https://gblobscdn.gitbook.com/spaces%2F-LJJeCjcLrr53DcT1Ml7%2Favatar.png?alt=media"])
+        Auth.configure(Auth.Config(metadata: metadata, projectId: "8ba9ee138960775e5231b70cc5ef1c3a"))
+        Auth.instance.sessionDeletePublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [unowned self] _ in
+                showSelectChainScreen()
+            }.store(in: &publishers)
+
+        Auth.instance.sessionResponsePublisher.sink { [unowned self] response in
             presentResponse(for: response)
-        }
-        if let session = ClientDelegate.shared.client.getSettledSessions().first {
+        }.store(in: &publishers)
+
+
+        if let session = Auth.instance.getSettledSessions().first {
             showAccountsScreen(session)
         } else {
             showSelectChainScreen()

Example/DApp/SelectChain/SelectChainViewController.swift

@@ -3,6 +3,7 @@
 import Foundation
 import WalletConnectAuth
 import UIKit
+import Combine
 
 struct Chain {
     let name: String
@@ -13,23 +14,22 @@ class SelectChainViewController: UIViewController, UITableViewDataSource {
     private let selectChainView: SelectChainView = {
         SelectChainView()
     }()
+    private var publishers = [AnyCancellable]()
+
     let chains = [Chain(name: "Ethereum", id: "eip155:1"), Chain(name: "Polygon", id: "eip155:137")]
-    let client = ClientDelegate.shared.client
     var onSessionSettled: ((Session)->())?
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationItem.title = "Available Chains"
         selectChainView.tableView.dataSource = self
         selectChainView.connectButton.addTarget(self, action: #selector(connect), for: .touchUpInside)
-        ClientDelegate.shared.onSessionSettled = { [unowned self] session in
+        Auth.instance.sessionSettlePublisher.sink {[unowned self] session in
             onSessionSettled?(session)
-        }
+        }.store(in: &publishers)
     }
 
     override func loadView() {
         view = selectChainView
-
-
     }
 
     @objc
@@ -39,7 +39,7 @@ class SelectChainViewController: UIViewController, UITableViewDataSource {
         let blockchains: Set<Blockchain> = [Blockchain("eip155:1")!, Blockchain("eip155:137")!]
         let namespaces: [String: ProposalNamespace] = ["eip155": ProposalNamespace(chains: blockchains, methods: methods, events: [], extensions: nil)]
         Task {
-            let uri = try await client.connect(requiredNamespaces: namespaces)
+            let uri = try await Auth.instance.connect(requiredNamespaces: namespaces)
             showConnectScreen(uriString: uri!)
         }
     }

Example/ExampleApp.xcodeproj/project.pbxproj

@@ -40,7 +40,6 @@
 		84CE64392798228D00142511 /* Web3 in Frameworks */ = {isa = PBXBuildFile; productRef = 84CE64382798228D00142511 /* Web3 */; };
 		84CE643D2798322600142511 /* ConnectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CE643C2798322600142511 /* ConnectViewController.swift */; };
 		84CE6444279AB5AD00142511 /* SelectChainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CE6443279AB5AD00142511 /* SelectChainViewController.swift */; };
-		84CE6446279ABBF300142511 /* ClientDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CE6445279ABBF300142511 /* ClientDelegate.swift */; };
 		84CE6448279AE68600142511 /* AccountRequestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CE6447279AE68600142511 /* AccountRequestViewController.swift */; };
 		84CE644B279EA1FA00142511 /* AccountRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CE644A279EA1FA00142511 /* AccountRequestView.swift */; };
 		84CE644E279ED2FF00142511 /* SelectChainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CE644D279ED2FF00142511 /* SelectChainView.swift */; };
@@ -113,7 +112,6 @@
 		84CE642C27981DF000142511 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		84CE643C2798322600142511 /* ConnectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectViewController.swift; sourceTree = "<group>"; };
 		84CE6443279AB5AD00142511 /* SelectChainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectChainViewController.swift; sourceTree = "<group>"; };
-		84CE6445279ABBF300142511 /* ClientDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientDelegate.swift; sourceTree = "<group>"; };
 		84CE6447279AE68600142511 /* AccountRequestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountRequestViewController.swift; sourceTree = "<group>"; };
 		84CE644A279EA1FA00142511 /* AccountRequestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountRequestView.swift; sourceTree = "<group>"; };
 		84CE644D279ED2FF00142511 /* SelectChainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectChainView.swift; sourceTree = "<group>"; };
@@ -276,7 +274,6 @@
 				84CE642027981DED00142511 /* SceneDelegate.swift */,
 				84CE645427A29D4C00142511 /* ResponseViewController.swift */,
 				84CE6449279EA1E600142511 /* AccountRequest */,
-				84CE6445279ABBF300142511 /* ClientDelegate.swift */,
 				84CE644C279ED2EC00142511 /* SelectChain */,
 				84CE6450279ED41D00142511 /* Connect */,
 				84CE644F279ED3FB00142511 /*  Accounts */,
@@ -540,7 +537,6 @@
 			files = (
 				84CE6430279820F600142511 /* AccountsViewController.swift in Sources */,
 				84CE645527A29D4D00142511 /* ResponseViewController.swift in Sources */,
-				84CE6446279ABBF300142511 /* ClientDelegate.swift in Sources */,
 				84CE641F27981DED00142511 /* AppDelegate.swift in Sources */,
 				84CE6452279ED42B00142511 /* ConnectView.swift in Sources */,
 				84CE6448279AE68600142511 /* AccountRequestViewController.swift in Sources */,
@@ -733,7 +729,7 @@
 				CODE_SIGN_ENTITLEMENTS = Wallet.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = W5R8AG9K22;
 				INFOPLIST_FILE = ExampleApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -758,7 +754,7 @@
 				CODE_SIGN_ENTITLEMENTS = Wallet.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = W5R8AG9K22;
 				INFOPLIST_FILE = ExampleApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -783,7 +779,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = W5R8AG9K22;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = DApp/Info.plist;
@@ -817,7 +813,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = W5R8AG9K22;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = DApp/Info.plist;

Example/ExampleApp/SceneDelegate.swift

@@ -1,10 +1,19 @@
 import UIKit
+import WalletConnectAuth
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     var window: UIWindow?
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
+
+        let metadata = AppMetadata(
+            name: "Example Wallet",
+            description: "wallet description",
+            url: "example.wallet",
+            icons: ["https://gblobscdn.gitbook.com/spaces%2F-LJJeCjcLrr53DcT1Ml7%2Favatar.png?alt=media"])
+        Auth.configure(Auth.Config(metadata: metadata, projectId: "8ba9ee138960775e5231b70cc5ef1c3a"))
+
         guard let windowScene = (scene as? UIWindowScene) else { return }
         window = UIWindow(windowScene: windowScene)
         window?.rootViewController = UITabBarController.createExampleApp()
@@ -21,7 +30,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         vc.onClientConnected = {
             Task {
                 do {
-                    try await vc.client.pair(uri: wcUri)
+                    try await Auth.instance.pair(uri: wcUri)
                 } catch {
                     print(error)
                 }

Example/ExampleApp/SessionDetails/SessionDetailsViewController.swift

@@ -7,10 +7,9 @@ final class SessionDetailsViewController: UIViewController, UITableViewDelegate,
         SessionDetailsView()
     }()
     private var sessionInfo: SessionInfo
-    private let client: AuthClient
     private let session: Session
-    init(_ session: Session, _ client: AuthClient) {
-        let pendingRequests = client.getPendingRequests(topic: session.topic).map{$0.method}
+    init(_ session: Session) {
+        let pendingRequests = Auth.instance.getPendingRequests(topic: session.topic).map{$0.method}
         let chains = Array(session.namespaces.values.flatMap { n in n.accounts.map{$0.blockchain.absoluteString}})
         let methods = Array(session.namespaces.values.first?.methods ?? []) // TODO: Rethink how to show this info on example app
         self.sessionInfo = SessionInfo(name: session.peer.name,
@@ -20,7 +19,6 @@ final class SessionDetailsViewController: UIViewController, UITableViewDelegate,
                                        chains: chains,
                                        methods: methods,
                                        pendingRequests: pendingRequests)
-        self.client = client
         self.session = session
         super.init(nibName: nil, bundle: nil)
     }
@@ -51,7 +49,7 @@ final class SessionDetailsViewController: UIViewController, UITableViewDelegate,
 
     @objc
     private func ping() {
-        client.ping(topic: session.topic) { result in
+        Auth.instance.ping(topic: session.topic) { result in
             switch result {
             case .success():
                 print("received ping response")
@@ -101,7 +99,7 @@ final class SessionDetailsViewController: UIViewController, UITableViewDelegate,
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if indexPath.section == 2 {
-            let pendingRequests = client.getPendingRequests(topic: session.topic)
+            let pendingRequests = Auth.instance.getPendingRequests(topic: session.topic)
             showSessionRequest(pendingRequests[indexPath.row])
         }
     }
@@ -111,18 +109,18 @@ final class SessionDetailsViewController: UIViewController, UITableViewDelegate,
         requestVC.onSign = { [unowned self] in
             let result = Signer.signEth(request: sessionRequest)
             let response = JSONRPCResponse<AnyCodable>(id: sessionRequest.id, result: result)
-            client.respond(topic: sessionRequest.topic, response: .response(response))
+            Auth.instance.respond(topic: sessionRequest.topic, response: .response(response))
             reloadTable()
         }
         requestVC.onReject = { [unowned self] in
-            client.respond(topic: sessionRequest.topic, response: .error(JSONRPCErrorResponse(id: sessionRequest.id, error: JSONRPCErrorResponse.Error(code: 0, message: ""))))
+            Auth.instance.respond(topic: sessionRequest.topic, response: .error(JSONRPCErrorResponse(id: sessionRequest.id, error: JSONRPCErrorResponse.Error(code: 0, message: ""))))
             reloadTable()
         }
         present(requestVC, animated: true)
     }
 
     func reloadTable() {
-        let pendingRequests = client.getPendingRequests(topic: session.topic).map{$0.method}
+        let pendingRequests = Auth.instance.getPendingRequests(topic: session.topic).map{$0.method}
         let chains = Array(session.namespaces.values.flatMap { n in n.accounts.map{$0.blockchain.absoluteString}})
         let methods = Array(session.namespaces.values.first?.methods ?? []) // TODO: Rethink how to show this info on example app
         self.sessionInfo = SessionInfo(name: session.peer.name,