update ios-aggregate-example

Author: AyushBherwani1998

ios/ios-aggregate-verifier-example/ios-aggregate-example.xcodeproj/project.pbxproj

@@ -457,7 +457,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "Web3Auth.ios-aggregate-example";
+				PRODUCT_BUNDLE_IDENTIFIER = "web3auth.ios-aggregate-example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -485,7 +485,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "Web3Auth.ios-aggregate-example";
+				PRODUCT_BUNDLE_IDENTIFIER = "web3auth.ios-aggregate-example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -503,7 +503,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.5;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "Web3Auth.ios-aggregate-exampleTests";
+				PRODUCT_BUNDLE_IDENTIFIER = "web3auth.ios-aggregate-exampletests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -522,7 +522,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.5;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "Web3Auth.ios-aggregate-exampleTests";
+				PRODUCT_BUNDLE_IDENTIFIER = "web3auth.ios-aggregate-exampletests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -539,7 +539,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "Web3Auth.ios-aggregate-exampleUITests";
+				PRODUCT_BUNDLE_IDENTIFIER = "web3auth.ios-aggregate-exampleuitests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -556,7 +556,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "Web3Auth.ios-aggregate-exampleUITests";
+				PRODUCT_BUNDLE_IDENTIFIER = "web3auth.ios-aggregate-exampleuitests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;

ios/ios-aggregate-verifier-example/ios-aggregate-example/ContentView.swift

@@ -11,7 +11,7 @@ struct ContentView: View {
                     ProgressView()
                 } else {
                     if vm.loggedIn,let user = vm.user, let web3rpc = Web3RPC(user: user) {
-                        UserDetailView(user: vm.user, loggedIn: $vm.loggedIn, web3RPC: web3rpc)
+                        UserDetailView(web3RPC: web3rpc, viewModel: vm)
                     } else {
                         LoginView(vm: vm)
                     }

ios/ios-aggregate-verifier-example/ios-aggregate-example/UserDetailView.swift

@@ -3,12 +3,12 @@ import Web3Auth
 import web3
 
 struct UserDetailView: View {
-    @State var user: Web3AuthState?
-    @Binding var loggedIn: Bool
     @State private var showingAlert = false
     @StateObject var web3RPC: Web3RPC
+    @StateObject var viewModel: ViewModel
+    
     var body: some View {
-        if let user = user {
+        if let user = viewModel.user {
             List {
                 Section {
                     Text("\(user.privKey ?? "")")
@@ -86,11 +86,8 @@ struct UserDetailView: View {
                     Button {
                         Task.detached {
                             do {
-                                try await Web3Auth(.init(clientId: "BHr_dKcxC0ecKn_2dZQmQeNdjPgWykMkcodEHkVvPMo71qzOV6SgtoN8KCvFdLN7bf34JOm89vWQMLFmSfIo84A",
-                                                         network: .mainnet)).logout()
-                                await MainActor.run(body: {
-                                    loggedIn.toggle()
-                                })                             } catch {
+                                try await viewModel.logout()
+                            } catch {
                                 DispatchQueue.main.async {
                                     showingAlert = true
                                 }
@@ -109,10 +106,3 @@ struct UserDetailView: View {
         }
     }
 }
-
-struct UserDetailView_Previews: PreviewProvider {
-    static var previews: some View {
-        let user: Web3AuthState = .init(privKey: "12345", ed25519PrivKey: "32334", sessionId: "23234384y7735y47shdj", userInfo: nil, error: nil, coreKitKey: "45676", coreKitEd25519PrivKey: "84567")
-        UserDetailView(user: user , loggedIn: .constant(true), web3RPC: .init(user: user)!)
-    }
-}

ios/ios-aggregate-verifier-example/ios-aggregate-example/ViewModel.swift

@@ -7,8 +7,8 @@ class ViewModel: ObservableObject {
     @Published var user: Web3AuthState?
     @Published var isLoading = false
     @Published var navigationTitle: String = ""
-    private var clientId = "BHr_dKcxC0ecKn_2dZQmQeNdjPgWykMkcodEHkVvPMo71qzOV6SgtoN8KCvFdLN7bf34JOm89vWQMLFmSfIo84A"
-    private var network: Network = .testnet
+    private var clientId = "BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ"
+    private var network: Network = .sapphire_mainnet
     func setup() async {
         guard web3Auth == nil else { return }
         await MainActor.run(body: {
@@ -35,10 +35,10 @@ class ViewModel: ObservableObject {
                             loginConfig: [
                                 TypeOfLogin.google.rawValue:
                                         .init(
-                                            verifier: "w3a-agg-example",
+                                            verifier: "aggregate-sapphire",
                                             typeOfLogin: .google,
                                             name: "Web3Auth-Aggregate-Verifier-Google-Example",
-                                            clientId: "774338308167-q463s7kpvja16l4l0kko3nb925ikds2p.apps.googleusercontent.com",
+                                            clientId: "519228911939-cri01h55lsjbsia1k7ll6qpalrus75ps.apps.googleusercontent.com",
                                             verifierSubIdentifier: "w3a-google"
                                         )
                             ],
@@ -82,7 +82,7 @@ class ViewModel: ObservableObject {
                     loginConfig: [
                         TypeOfLogin.jwt.rawValue:
                                 .init(
-                                    verifier: "w3a-agg-example",
+                                    verifier: "aggregate-sapphire",
                                     typeOfLogin: .jwt,
                                     name: "Web3Auth-Aggregate-Verifier-GitHub-Example",
                                     clientId: "hiLqaop0amgzCC0AXo4w0rrG9abuJTdu",
@@ -106,6 +106,13 @@ class ViewModel: ObservableObject {
             }
         }
     }
+    
+    func logout() async throws {
+        try await Web3Auth(W3AInitParams(clientId: clientId, network: network)).logout()
+        await MainActor.run(body: {
+            loggedIn = false
+        })
+    }
 }
 
 extension ViewModel {

ios/ios-aggregate-verifier-example/ios-aggregate-example/web3RPC.swift

@@ -24,16 +24,16 @@ class Web3RPC : ObservableObject {
         self.user = user
         do{
             client = EthereumHttpClient(url: URL(string: RPC_URL)!)
-            account = try EthereumAccount(keyStorage: user as! EthereumSingleKeyStorageProtocol )
+            account = try EthereumAccount(keyStorage: user as EthereumSingleKeyStorageProtocol )
             address = account.address
         } catch {
              return nil
         }
     }
 
     func getAccounts() {
-        self.publicAddress = address.value
-        print(address.value)
+        self.publicAddress = address.asString()
+        print(address.asString())
     }