GetClientId Util

Author: 0xFirekeeper

Assets/Thirdweb/Core/Scripts/AccountAbstraction/Core/BundlerClient.cs

@@ -65,9 +65,9 @@ private static async Task<RpcResponseMessage> BundlerRequest(string url, string
                 httpRequestMessage.Headers.Add("x-sdk-os", Utils.GetRuntimePlatform());
                 httpRequestMessage.Headers.Add("x-sdk-platform", "unity");
                 httpRequestMessage.Headers.Add("x-sdk-version", ThirdwebSDK.version);
-                httpRequestMessage.Headers.Add("x-client-id", ThirdwebManager.Instance.SDK.session.Options.clientId);
+                httpRequestMessage.Headers.Add("x-client-id", Utils.GetClientId());
                 if (!Utils.IsWebGLBuild())
-                    httpRequestMessage.Headers.Add("x-bundle-id", ThirdwebManager.Instance.SDK.session.Options.bundleId);
+                    httpRequestMessage.Headers.Add("x-bundle-id", Utils.GetBundleId());
             }
 
             var httpResponse = await client.SendAsync(httpRequestMessage);

Assets/Thirdweb/Core/Scripts/AccountAbstraction/Core/SmartWallet.cs

@@ -196,7 +196,7 @@ internal async Task<RpcResponseMessage> Request(RpcRequestMessage requestMessage
         {
             requestId ??= SmartWalletClient.GenerateRpcId();
 
-            string apiKey = ThirdwebManager.Instance.SDK.session.Options.clientId;
+            string apiKey = Utils.GetClientId();
 
             // Create the user operation and its safe (hexified) version
 
@@ -262,7 +262,7 @@ private async Task<RpcResponseMessage> CreateUserOpAndSend(RpcRequestMessage req
                 _deploying = true;
             }
 
-            string apiKey = ThirdwebManager.Instance.SDK.session.Options.clientId;
+            string apiKey = Utils.GetClientId();
 
             // Deserialize the transaction input from the request message
 

Assets/Thirdweb/Core/Scripts/Utils.cs

@@ -415,6 +415,11 @@ public static string ToChecksumAddress(this string address)
             return Nethereum.Util.AddressUtil.Current.ConvertToChecksumAddress(address);
         }
 
+        public static string GetClientId()
+        {
+            return ThirdwebManager.Instance.SDK?.session?.Options.clientId ?? (string.IsNullOrEmpty(ThirdwebManager.Instance.clientId) ? null : ThirdwebManager.Instance.clientId);
+        }
+
         public static string GetBundleId()
         {
             return ThirdwebManager.Instance.SDK?.session?.Options.bundleId

Assets/Thirdweb/Core/Scripts/Wallet.cs

@@ -39,13 +39,7 @@ public async Task<string> Connect(WalletConnection walletConnection)
             else
             {
                 address = await ThirdwebManager.Instance.SDK.session.Connect(walletConnection);
-                Utils.TrackWalletAnalytics(
-                    ThirdwebManager.Instance.SDK.session.Options.clientId,
-                    "connectWallet",
-                    "connect",
-                    walletConnection.provider.ToString()[..1].ToLower() + walletConnection.provider.ToString()[1..],
-                    address
-                );
+                Utils.TrackWalletAnalytics(Utils.GetClientId(), "connectWallet", "connect", walletConnection.provider.ToString()[..1].ToLower() + walletConnection.provider.ToString()[1..], address);
                 return address;
             }
 

Assets/Thirdweb/Core/Scripts/WalletsUI/EmbeddedWalletUI.cs

@@ -271,7 +271,7 @@ public virtual async Task<string> GetLoginLink(string authProvider)
             string loginUrl = await _embeddedWallet.FetchHeadlessOauthLoginLinkAsync(authProvider);
             string platform = "unity";
             string redirectUrl = UnityWebRequest.EscapeURL(Application.isMobilePlatform ? _customScheme : "http://localhost:8789/");
-            string developerClientId = UnityWebRequest.EscapeURL(ThirdwebManager.Instance.SDK.session.Options.clientId);
+            string developerClientId = UnityWebRequest.EscapeURL(Utils.GetClientId());
             return $"{loginUrl}?platform={platform}&redirectUrl={redirectUrl}&developerClientId={developerClientId}&authOption={authProvider}";
         }