Merge branch 'user-defaults-group-migration' of github.com:WalletConn…

…ect/WalletConnectSwiftV2 into keychain-group-migration # Conflicts: # Sources/Auth/AuthClientFactory.swift # Sources/WalletConnectNetworking/NetworkingClientFactory.swift # Sources/WalletConnectPairing/PairingClientFactory.swift # Sources/WalletConnectPush/PushClientFactory.swift # Sources/WalletConnectRelay/RelayClientFactory.swift # Sources/WalletConnectSign/Sign/SignClientFactory.swift
WalletConnect · Nov 30, 2023 · 3885400 · 3885400
2 parents 7bf3088 + ab1d5f0
commit 3885400
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/Sources/Auth/AuthClientFactory.swift b/Sources/Auth/AuthClientFactory.swift
@@ -10,7 +10,9 @@ public struct AuthClientFactory {
         groupIdentifier: String
     ) -> AuthClient {
         let logger = ConsoleLogger(loggingLevel: .off)
-        let keyValueStorage = UserDefaults(suiteName: groupIdentifier) ?? UserDefaults.standard
+        guard let keyValueStorage = UserDefaults(suiteName: groupIdentifier) else {
+            fatalError("Could not instantiate UserDefaults for a group identifier \(groupIdentifier)")
+        }
         let keychainStorage = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk", accessGroup: groupIdentifier)
         let iatProvider = DefaultIATProvider()
 

diff --git a/Sources/WalletConnectNetworking/NetworkingClientFactory.swift b/Sources/WalletConnectNetworking/NetworkingClientFactory.swift
@@ -7,7 +7,11 @@ public struct NetworkingClientFactory {
         groupIdentifier: String
     ) -> NetworkingInteractor {
         let logger = ConsoleLogger(prefix: "🕸️", loggingLevel: .off)
-        let keyValueStorage = UserDefaults(suiteName: groupIdentifier) ?? UserDefaults.standard
+
+        guard let keyValueStorage = UserDefaults(suiteName: groupIdentifier) else {
+            fatalError("Could not instantiate UserDefaults for a group identifier \(groupIdentifier)")
+        }
+
         let keychainStorage = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk", accessGroup: groupIdentifier)
         return NetworkingClientFactory.create(relayClient: relayClient, logger: logger, keychainStorage: keychainStorage, keyValueStorage: keyValueStorage)
     }

diff --git a/Sources/WalletConnectPairing/PairingClientFactory.swift b/Sources/WalletConnectPairing/PairingClientFactory.swift
@@ -7,8 +7,12 @@ public struct PairingClientFactory {
         groupIdentifier: String
     ) -> PairingClient {
         let logger = ConsoleLogger(loggingLevel: .off)
-        let keyValueStorage = UserDefaults(suiteName: groupIdentifier) ?? UserDefaults.standard
+
+        guard let keyValueStorage = UserDefaults(suiteName: groupIdentifier) else {
+            fatalError("Could not instantiate UserDefaults for a group identifier \(groupIdentifier)")
+        }
         let keychainStorage = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk", accessGroup: groupIdentifier)
+
         return PairingClientFactory.create(logger: logger, keyValueStorage: keyValueStorage, keychainStorage: keychainStorage, networkingClient: networkingClient)
     }
 

diff --git a/Sources/WalletConnectPush/PushClientFactory.swift b/Sources/WalletConnectPush/PushClientFactory.swift
@@ -8,9 +8,12 @@ public struct PushClientFactory {
         environment: APNSEnvironment
     ) -> PushClient {
 
-        let keychainStorage = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk", accessGroup: groupIdentifier)
-        let keyValueStorage = UserDefaults(suiteName: groupIdentifier) ?? UserDefaults.standard
 
+        guard let keyValueStorage = UserDefaults(suiteName: groupIdentifier) else {
+            fatalError("Could not instantiate UserDefaults for a group identifier \(groupIdentifier)")
+        }
+        let keychainStorage = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk", accessGroup: groupIdentifier)
+
         return PushClientFactory.create(
             projectId: projectId,
             pushHost: pushHost,

diff --git a/Sources/WalletConnectRelay/RelayClientFactory.swift b/Sources/WalletConnectRelay/RelayClientFactory.swift
@@ -12,8 +12,10 @@ public struct RelayClientFactory {
         socketConnectionType: SocketConnectionType
     ) -> RelayClient {
 
-        let keyValueStorage = UserDefaults(suiteName: groupIdentifier) ?? UserDefaults.standard
 
+        guard let keyValueStorage = UserDefaults(suiteName: groupIdentifier) else {
+            fatalError("Could not instantiate UserDefaults for a group identifier \(groupIdentifier)")
+        }
         let keychainStorage = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk", accessGroup: groupIdentifier)
 
         let logger = ConsoleLogger(prefix: "🚄" ,loggingLevel: .off)

diff --git a/Sources/WalletConnectSign/Sign/SignClientFactory.swift b/Sources/WalletConnectSign/Sign/SignClientFactory.swift
@@ -18,8 +18,12 @@ public struct SignClientFactory {
         groupIdentifier: String
     ) -> SignClient {
         let logger = ConsoleLogger(loggingLevel: .debug)
-        let keyValueStorage = UserDefaults(suiteName: groupIdentifier) ?? UserDefaults.standard
+
+        guard let keyValueStorage = UserDefaults(suiteName: groupIdentifier) else {
+            fatalError("Could not instantiate UserDefaults for a group identifier \(groupIdentifier)")
+        }
         let keychainStorage = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk", accessGroup: groupIdentifier)
+
         return SignClientFactory.create(metadata: metadata, logger: logger, keyValueStorage: keyValueStorage, keychainStorage: keychainStorage, pairingClient: pairingClient, networkingClient: networkingClient)
     }