Allow overriding bundleId (#117)

Author: 0xFirekeeper

Assets/Thirdweb/Core/Scripts/ThirdwebManager.cs

@@ -46,7 +46,7 @@ public class ThirdwebManager : MonoBehaviour
                 new ChainData("sepolia", "11155111", null),
             };
 
-        [Tooltip("Thirdweb Client ID (https://thirdweb.com/create-api-key/). Used for default thirdweb services such as Storage and Account Abstraction.")]
+        [Tooltip("Thirdweb Client ID (https://thirdweb.com/create-api-key/). Used for default thirdweb services such as RPC, Storage and Account Abstraction.")]
         public string clientId;
 
         [Tooltip("Whether the SDK should initialize on awake or not")]
@@ -55,6 +55,9 @@ public class ThirdwebManager : MonoBehaviour
         [Tooltip("Whether to show thirdweb sdk debug logs")]
         public bool showDebugLogs = true;
 
+        [Tooltip("Optional Bundle ID override for thirdweb services")]
+        public string bundleIdOverride = null;
+
         [Tooltip("The name of your app")]
         public string appName = null;
 
@@ -146,6 +149,13 @@ public void Initialize(string chainIdentifier)
 
             var options = new ThirdwebSDK.Options();
 
+            // Set up Client ID and Bundle ID
+
+            options.clientId = string.IsNullOrEmpty(clientId) ? null : clientId;
+            options.bundleId = string.IsNullOrEmpty(bundleIdOverride) ? Application.identifier.ToLower() : bundleIdOverride;
+
+            // Set up supported chains
+
             activeChain = chainIdentifier;
             string activeChainId = null;
             string activeChainRpc = null;
@@ -279,10 +289,6 @@ public void Initialize(string chainIdentifier)
                     entryPointAddress = string.IsNullOrEmpty(entryPointAddress) ? Thirdweb.AccountAbstraction.Constants.DEFAULT_ENTRYPOINT_ADDRESS : entryPointAddress,
                 };
 
-            // Set up Client ID
-
-            options.clientId = string.IsNullOrEmpty(clientId) ? null : clientId;
-
             // Pass active chain rpc and chainId
 
             SDK = new ThirdwebSDK(activeChainRpc, BigInteger.Parse(activeChainId), options);

Assets/Thirdweb/Core/Scripts/ThirdwebSDK.cs

@@ -41,6 +41,11 @@ public struct Options
             /// </summary>
             public string clientId;
 
+            /// <summary>
+            /// Optional Bundle ID override for thirdweb services.
+            /// </summary>
+            public string bundleId;
+
             public ThirdwebChainData[] supportedChains;
         }
 

Assets/Thirdweb/Core/Scripts/ThirdwebSession.cs

@@ -18,18 +18,18 @@ public class ThirdwebSession
         #region Properties
 
 
-        public ThirdwebSDK.Options Options { get; private set; }
-        public BigInteger ChainId { get; private set; }
-        public string RPC { get; private set; }
-        public SiweMessageService SiweSession { get; private set; }
-        public Web3 Web3 { get; private set; }
-        public ThirdwebChainData CurrentChainData { get; private set; }
+        internal ThirdwebSDK.Options Options { get; private set; }
+        internal BigInteger ChainId { get; private set; }
+        internal string RPC { get; private set; }
+        internal SiweMessageService SiweSession { get; private set; }
+        internal Web3 Web3 { get; private set; }
+        internal ThirdwebChainData CurrentChainData { get; private set; }
 
-        public IThirdwebWallet ActiveWallet { get; private set; }
+        internal IThirdwebWallet ActiveWallet { get; private set; }
 
-        public static int Nonce = 0;
+        internal static int Nonce = 0;
 
-        public string BundleId { get; private set; }
+        internal string BundleId { get; private set; }
 
         #endregion
 
@@ -43,7 +43,7 @@ public ThirdwebSession(ThirdwebSDK.Options options, BigInteger chainId, string r
             SiweSession = new SiweMessageService();
             Web3 = new Web3(rpcUrl);
             CurrentChainData = options.supportedChains.ToList().Find(x => x.chainId == new HexBigInteger(chainId).HexValue);
-            BundleId = Utils.GetBundleId();
+            BundleId = Options.bundleId;
         }
 
         #endregion
@@ -241,7 +241,7 @@ public static ThirdwebChainData FetchChainData(BigInteger chainId, string rpcOve
         #region Nested Classes
 
         [System.Serializable]
-        public class ChainIDNetworkData
+        class ChainIDNetworkData
         {
             public string name;
             public string chain;
@@ -253,22 +253,22 @@ public class ChainIDNetworkData
         }
 
         [System.Serializable]
-        public class ChainIDNetworkNativeCurrency
+        class ChainIDNetworkNativeCurrency
         {
             public string name;
             public string symbol;
             public string decimals;
         }
 
         [System.Serializable]
-        public class ChainIDNetworkExplorer
+        class ChainIDNetworkExplorer
         {
             public string name;
             public string url;
             public string standard;
         }
 
-        public struct ChaiNIDNetworkIcon
+        struct ChaiNIDNetworkIcon
         {
             public string url;
             public int width;

Assets/Thirdweb/Core/Scripts/Utils.cs

@@ -408,15 +408,16 @@ public static string ToChecksumAddress(this string address)
 
         public static string GetBundleId()
         {
-            return Application.identifier.ToLower();
+            return ThirdwebManager.Instance.SDK?.session?.BundleId
+                ?? (string.IsNullOrEmpty(ThirdwebManager.Instance.bundleIdOverride) ? Application.identifier.ToLower() : ThirdwebManager.Instance.bundleIdOverride);
         }
 
         public static string AppendBundleIdQueryParam(this string uri)
         {
-            if (Utils.IsWebGLBuild())
+            if (IsWebGLBuild())
                 return uri;
 
-            uri += $"?bundleId={ThirdwebManager.Instance?.SDK?.session?.BundleId ?? GetBundleId()}";
+            uri += $"?bundleId={GetBundleId()}";
             return uri;
         }
 

Assets/Thirdweb/Editor/ThirdwebManagerEditor.cs

@@ -10,6 +10,7 @@ public class ThirdwebManagerEditor : Editor
         private SerializedProperty activeChainProperty;
         private SerializedProperty supportedChainsProperty;
         private SerializedProperty clientIdProperty;
+        private SerializedProperty bundleIdOverrideProperty;
         private SerializedProperty initializeOnAwakeProperty;
         private SerializedProperty showDebugLogsProperty;
         private SerializedProperty appNameProperty;
@@ -50,6 +51,7 @@ private void OnEnable()
             activeChainProperty = serializedObject.FindProperty("activeChain");
             supportedChainsProperty = serializedObject.FindProperty("supportedChains");
             clientIdProperty = serializedObject.FindProperty("clientId");
+            bundleIdOverrideProperty = serializedObject.FindProperty("bundleIdOverride");
             initializeOnAwakeProperty = serializedObject.FindProperty("initializeOnAwake");
             showDebugLogsProperty = serializedObject.FindProperty("showDebugLogs");
             appNameProperty = serializedObject.FindProperty("appName");
@@ -168,6 +170,7 @@ public override void OnInspectorGUI()
                     EditorGUILayout.Space(10);
                     supportedChainsList.DoLayoutList();
                     EditorGUILayout.PropertyField(clientIdProperty);
+                    EditorGUILayout.PropertyField(bundleIdOverrideProperty);
                     EditorGUILayout.PropertyField(initializeOnAwakeProperty);
                     EditorGUILayout.PropertyField(showDebugLogsProperty);
                     EditorGUILayout.EndVertical();