Unified Identity - Account Linking

Author: 0xFirekeeper

Assets/Thirdweb/Runtime/NET/Thirdweb.dll

@@ -273,12 +273,11 @@ public async Task<IThirdwebWallet> ConnectWallet(WalletOptions walletOptions)
                 if (walletOptions.InAppWalletOptions.AuthProvider == AuthProvider.Default)
                 {
                     await inAppWallet.SendOTP();
-                    _ = await InAppWalletModal.VerifyOTP(inAppWallet);
+                    _ = await InAppWalletModal.LoginWithOtp(inAppWallet);
                 }
                 else if (walletOptions.InAppWalletOptions.AuthProvider == AuthProvider.Siwe)
                 {
-                    var siweSigner = walletOptions.InAppWalletOptions.SiweSigner;
-                    _ = await inAppWallet.LoginWithSiwe(siweSigner, walletOptions.ChainId);
+                    _ = await inAppWallet.LoginWithSiwe(walletOptions.ChainId);
                 }
                 else
                 {
@@ -356,6 +355,21 @@ public async Task<SmartWallet> UpgradeToSmartWallet(IThirdwebWallet personalWall
             return wallet;
         }
 
+        public async Task<List<LinkedAccount>> LinkAccount(InAppWallet mainWallet, InAppWallet walletToLink, string otp = null, BigInteger? chainId = null, string jwtOrPayload = null)
+        {
+            return await mainWallet.LinkAccount(
+                walletToLink: walletToLink,
+                otp: otp,
+                isMobile: Application.isMobilePlatform,
+                browserOpenAction: (url) => Application.OpenURL(url),
+                mobileRedirectScheme: BundleId + "://",
+                browser: new CrossPlatformUnityBrowser(),
+                chainId: chainId,
+                jwt: jwtOrPayload,
+                payload: jwtOrPayload
+            );
+        }
+
         private async void TrackUsage(string source, string action, string walletType, string walletAddress)
         {
             if (string.IsNullOrEmpty(source) || string.IsNullOrEmpty(action) || string.IsNullOrEmpty(walletType) || string.IsNullOrEmpty(walletAddress))

Assets/Thirdweb/Runtime/Unity/ThirdwebManager.cs

@@ -16,7 +16,7 @@ public class InAppWalletModal : MonoBehaviour
         [field: SerializeField]
         private Button SubmitButton { get; set; }
 
-        public static Task<InAppWallet> VerifyOTP(InAppWallet wallet)
+        public static Task<InAppWallet> LoginWithOtp(InAppWallet wallet)
         {
 #if UNITY_6000_0_OR_NEWER
             var modal = FindAnyObjectByType<InAppWalletModal>();
@@ -47,7 +47,7 @@ public static Task<InAppWallet> VerifyOTP(InAppWallet wallet)
 
                 modal.OTPInputField.interactable = false;
                 modal.SubmitButton.interactable = false;
-                (var address, var canRetry) = await wallet.SubmitOTP(otp);
+                (var address, var canRetry) = await wallet.LoginWithOtp(otp);
                 if (address != null)
                 {
                     modal.InAppWalletCanvas.gameObject.SetActive(false);