Make WalletUI functions overrideable

0xFirekeeper · 0xFirekeeper · commit dff75c973ad2 · 2024-01-16T00:31:30.000+03:00
diff --git a/Assets/Thirdweb/Core/Scripts/WalletsUI/EmbeddedWalletUI.cs b/Assets/Thirdweb/Core/Scripts/WalletsUI/EmbeddedWalletUI.cs
@@ -61,7 +61,7 @@ private void Awake()
 
         #region Connection Flow
 
-        public async Task<User> Connect(EmbeddedWallet embeddedWallet, string email, AuthOptions authOptions)
+        public virtual async Task<User> Connect(EmbeddedWallet embeddedWallet, string email, AuthOptions authOptions)
         {
             var config = Resources.Load<ThirdwebConfig>("ThirdwebConfig");
             _customScheme = config != null ? config.customScheme : null;
@@ -135,7 +135,7 @@ public async Task<User> Connect(EmbeddedWallet embeddedWallet, string email, Aut
             return _user;
         }
 
-        public void Cancel()
+        public virtual void Cancel()
         {
             _exception = new UnityException("User cancelled");
         }
@@ -144,7 +144,7 @@ public void Cancel()
 
         #region Email OTP Flow
 
-        private async Task LoginWithOTP()
+        public virtual async Task LoginWithOTP()
         {
             if (_email == null)
                 throw new UnityException("Email is required for OTP login");
@@ -154,7 +154,7 @@ private async Task LoginWithOTP()
             EmbeddedWalletCanvas.SetActive(true);
         }
 
-        private async Task OnSendOTP()
+        public virtual async Task OnSendOTP()
         {
             try
             {
@@ -169,7 +169,7 @@ private async Task OnSendOTP()
             }
         }
 
-        private async void OnSubmitOTP()
+        public virtual async void OnSubmitOTP()
         {
             OTPInput.interactable = false;
             RecoveryInput.interactable = false;
@@ -207,7 +207,7 @@ private async void OnSubmitOTP()
 
         #region OAuth2 Flow
 
-        private async Task LoginWithOauth(string authProviderStr)
+        public virtual async Task LoginWithOauth(string authProviderStr)
         {
             if (Application.isMobilePlatform && string.IsNullOrEmpty(_customScheme))
                 throw new UnityException("No custom scheme provided for mobile deeplinks, please set one in your ThirdwebConfig (found in ThirdwebManager)");
@@ -251,7 +251,7 @@ private async Task LoginWithOauth(string authProviderStr)
             }
         }
 
-        private async void OnSubmitRecoveryOauth(string authProviderStr, string authResult)
+        public virtual async void OnSubmitRecoveryOauth(string authProviderStr, string authResult)
         {
             try
             {
@@ -266,7 +266,7 @@ private async void OnSubmitRecoveryOauth(string authProviderStr, string authResu
             }
         }
 
-        private async Task<string> GetLoginLink(string authProvider)
+        public virtual async Task<string> GetLoginLink(string authProvider)
         {
             string loginUrl = await _embeddedWallet.FetchHeadlessOauthLoginLinkAsync(authProvider);
             string platform = "unity";
@@ -279,7 +279,7 @@ private async Task<string> GetLoginLink(string authProvider)
 
         #region JWT Flow
 
-        private async Task LoginWithJWT(string jwtToken, string encryptionKey, string recoveryCode = null)
+        public virtual async Task LoginWithJWT(string jwtToken, string encryptionKey, string recoveryCode = null)
         {
             if (string.IsNullOrEmpty(jwtToken))
                 throw new UnityException("JWT token is required for JWT login!");
@@ -295,7 +295,7 @@ private async Task LoginWithJWT(string jwtToken, string encryptionKey, string re
 
         #region Auth Endpoint Flow
 
-        private async Task LoginWithAuthEndpoint(string payload, string encryptionKey, string recoveryCode = null)
+        public virtual async Task LoginWithAuthEndpoint(string payload, string encryptionKey, string recoveryCode = null)
         {
             if (string.IsNullOrEmpty(payload))
                 throw new UnityException("Auth payload is required for Auth Endpoint login!");
@@ -311,15 +311,15 @@ private async Task LoginWithAuthEndpoint(string payload, string encryptionKey, s
 
         #region Common
 
-        private void DisplayRecoveryInput(bool hideOtpInput)
+        public virtual void DisplayRecoveryInput(bool hideOtpInput)
         {
             if (hideOtpInput)
                 OTPInput.gameObject.SetActive(false);
             RecoveryInput.gameObject.SetActive(true);
             EmbeddedWalletCanvas.SetActive(true);
         }
 
-        private void ShowRecoveryCodes(EmbeddedWallet.VerifyResult res)
+        public virtual void ShowRecoveryCodes(EmbeddedWallet.VerifyResult res)
         {
             if (res.MainRecoveryCode != null && res.WasEmailed.HasValue && res.WasEmailed.Value == false)
             {
diff --git a/Assets/Thirdweb/Core/Scripts/WalletsUI/MetamaskUI.cs b/Assets/Thirdweb/Core/Scripts/WalletsUI/MetamaskUI.cs
@@ -43,7 +43,7 @@ private void Awake()
 
         // Core
 
-        public async Task<string> Connect()
+        public virtual async Task<string> Connect()
         {
             OTPPanel.SetActive(false);
 
@@ -78,14 +78,14 @@ public async Task<string> Connect()
             return MetaMaskUnity.Instance.Wallet.SelectedAddress;
         }
 
-        public void Cancel()
+        public virtual void Cancel()
         {
             _exception = new UnityException("User cancelled");
         }
 
         // QR
 
-        private void ShowQR(string universalLink, string deepLink)
+        public virtual void ShowQR(string universalLink, string deepLink)
         {
             var qrCodeAsTexture2D = GenerateQRTexture(universalLink);
             QRCodeImage.sprite = Sprite.Create(qrCodeAsTexture2D, new Rect(0, 0, qrCodeAsTexture2D.width, qrCodeAsTexture2D.height), new Vector2(0.5f, 0.5f));
@@ -94,7 +94,7 @@ private void ShowQR(string universalLink, string deepLink)
             QRCodeImage.mainTexture.filterMode = FilterMode.Point;
         }
 
-        private Texture2D GenerateQRTexture(string text)
+        public virtual Texture2D GenerateQRTexture(string text)
         {
             Texture2D encoded = new Texture2D(256, 256);
             var color32 = EncodeToQR(text, encoded.width, encoded.height);
@@ -103,7 +103,7 @@ private Texture2D GenerateQRTexture(string text)
             return encoded;
         }
 
-        private Color32[] EncodeToQR(string textForEncoding, int width, int height)
+        public virtual Color32[] EncodeToQR(string textForEncoding, int width, int height)
         {
             var writer = new BarcodeWriter
             {
@@ -115,48 +115,48 @@ private Color32[] EncodeToQR(string textForEncoding, int width, int height)
 
         // Top level Event Listeners
 
-        private void OnWalletConnected(object sender, EventArgs e)
+        public virtual void OnWalletConnected(object sender, EventArgs e)
         {
             _connected = true;
         }
 
-        private void OnWalletAuthorized(object sender, EventArgs e)
+        public virtual void OnWalletAuthorized(object sender, EventArgs e)
         {
             _authorized = true;
         }
 
         // IMetaMaskUnityTransportListener
 
-        public void OnMetaMaskConnectRequest(string universalLink, string deepLink)
+        public virtual void OnMetaMaskConnectRequest(string universalLink, string deepLink)
         {
             ShowQR(universalLink, deepLink);
         }
 
-        public void OnMetaMaskRequest(string id, MetaMaskEthereumRequest request)
+        public virtual void OnMetaMaskRequest(string id, MetaMaskEthereumRequest request)
         {
             return;
         }
 
-        public void OnMetaMaskFailure(Exception error)
+        public virtual void OnMetaMaskFailure(Exception error)
         {
             _exception = error;
         }
 
-        public void OnMetaMaskSuccess()
+        public virtual void OnMetaMaskSuccess()
         {
             _connected = true;
             _authorized = true;
         }
 
-        public void OnMetaMaskOTP(int otp)
+        public virtual void OnMetaMaskOTP(int otp)
         {
             OTPPanel.SetActive(true);
 
             var shouldShowOtpCode = DateTime.Now - MetaMaskUnity.Instance.Wallet.LastActive >= TimeSpan.FromHours(1);
 
             // They simply need to press resume in the app
             OTPText.gameObject.SetActive(shouldShowOtpCode);
-            
+
             if (shouldShowOtpCode)
             {
                 OTPText.text = otp.ToString();
@@ -167,7 +167,7 @@ public void OnMetaMaskOTP(int otp)
             }
         }
 
-        public void OnMetaMaskDisconnected()
+        public virtual void OnMetaMaskDisconnected()
         {
             if (!MetaMaskUnity.Instance.Wallet.Transport.IsMobile || !MetaMaskUnity.Instance.Wallet.HasSession)
             {
diff --git a/Assets/Thirdweb/Core/Scripts/WalletsUI/WalletConnectUI.cs b/Assets/Thirdweb/Core/Scripts/WalletsUI/WalletConnectUI.cs
@@ -42,7 +42,7 @@ private void Awake()
             }
         }
 
-        public async Task<(WalletConnectSignClient, string, string)> Connect(string walletConnectProjectId, BigInteger chainId)
+        public virtual async Task<(WalletConnectSignClient, string, string)> Connect(string walletConnectProjectId, BigInteger chainId)
         {
             WalletConnectCanvas.SetActive(true);
 
@@ -135,7 +135,7 @@ private void Awake()
             }
         }
 
-        private static Texture2D GenerateQRTexture(string text)
+        public virtual Texture2D GenerateQRTexture(string text)
         {
             Texture2D encoded = new Texture2D(256, 256);
             var color32 = EncodeToQR(text, encoded.width, encoded.height);
@@ -144,7 +144,7 @@ private static Texture2D GenerateQRTexture(string text)
             return encoded;
         }
 
-        private static Color32[] EncodeToQR(string textForEncoding, int width, int height)
+        public virtual Color32[] EncodeToQR(string textForEncoding, int width, int height)
         {
             var writer = new BarcodeWriter
             {

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ private void Awake()`
`61`	`61`
`62`	`62`	`#region Connection Flow`
`63`	`63`
`64`		`- public async Task<User> Connect(EmbeddedWallet embeddedWallet, string email, AuthOptions authOptions)`
	`64`	`+ public virtual async Task<User> Connect(EmbeddedWallet embeddedWallet, string email, AuthOptions authOptions)`
`65`	`65`	`{`
`66`	`66`	`var config = Resources.Load<ThirdwebConfig>("ThirdwebConfig");`
`67`	`67`	`_customScheme = config != null ? config.customScheme : null;`
`@@ -135,7 +135,7 @@ public async Task<User> Connect(EmbeddedWallet embeddedWallet, string email, Aut`
`135`	`135`	`return _user;`
`136`	`136`	`}`
`137`	`137`
`138`		`- public void Cancel()`
	`138`	`+ public virtual void Cancel()`
`139`	`139`	`{`
`140`	`140`	`_exception = new UnityException("User cancelled");`
`141`	`141`	`}`
`@@ -144,7 +144,7 @@ public void Cancel()`
`144`	`144`
`145`	`145`	`#region Email OTP Flow`
`146`	`146`
`147`		`- private async Task LoginWithOTP()`
	`147`	`+ public virtual async Task LoginWithOTP()`
`148`	`148`	`{`
`149`	`149`	`if (_email == null)`
`150`	`150`	`throw new UnityException("Email is required for OTP login");`
`@@ -154,7 +154,7 @@ private async Task LoginWithOTP()`
`154`	`154`	`EmbeddedWalletCanvas.SetActive(true);`
`155`	`155`	`}`
`156`	`156`
`157`		`- private async Task OnSendOTP()`
	`157`	`+ public virtual async Task OnSendOTP()`
`158`	`158`	`{`
`159`	`159`	`try`
`160`	`160`	`{`
`@@ -169,7 +169,7 @@ private async Task OnSendOTP()`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
`172`		`- private async void OnSubmitOTP()`
	`172`	`+ public virtual async void OnSubmitOTP()`
`173`	`173`	`{`
`174`	`174`	`OTPInput.interactable = false;`
`175`	`175`	`RecoveryInput.interactable = false;`
`@@ -207,7 +207,7 @@ private async void OnSubmitOTP()`
`207`	`207`
`208`	`208`	`#region OAuth2 Flow`
`209`	`209`
`210`		`- private async Task LoginWithOauth(string authProviderStr)`
	`210`	`+ public virtual async Task LoginWithOauth(string authProviderStr)`
`211`	`211`	`{`
`212`	`212`	`if (Application.isMobilePlatform && string.IsNullOrEmpty(_customScheme))`
`213`	`213`	`throw new UnityException("No custom scheme provided for mobile deeplinks, please set one in your ThirdwebConfig (found in ThirdwebManager)");`
`@@ -251,7 +251,7 @@ private async Task LoginWithOauth(string authProviderStr)`
`251`	`251`	`}`
`252`	`252`	`}`
`253`	`253`
`254`		`- private async void OnSubmitRecoveryOauth(string authProviderStr, string authResult)`
	`254`	`+ public virtual async void OnSubmitRecoveryOauth(string authProviderStr, string authResult)`
`255`	`255`	`{`
`256`	`256`	`try`
`257`	`257`	`{`
`@@ -266,7 +266,7 @@ private async void OnSubmitRecoveryOauth(string authProviderStr, string authResu`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`
`269`		`- private async Task<string> GetLoginLink(string authProvider)`
	`269`	`+ public virtual async Task<string> GetLoginLink(string authProvider)`
`270`	`270`	`{`
`271`	`271`	`string loginUrl = await _embeddedWallet.FetchHeadlessOauthLoginLinkAsync(authProvider);`
`272`	`272`	`string platform = "unity";`
`@@ -279,7 +279,7 @@ private async Task<string> GetLoginLink(string authProvider)`
`279`	`279`
`280`	`280`	`#region JWT Flow`
`281`	`281`
`282`		`- private async Task LoginWithJWT(string jwtToken, string encryptionKey, string recoveryCode = null)`
	`282`	`+ public virtual async Task LoginWithJWT(string jwtToken, string encryptionKey, string recoveryCode = null)`
`283`	`283`	`{`
`284`	`284`	`if (string.IsNullOrEmpty(jwtToken))`
`285`	`285`	`throw new UnityException("JWT token is required for JWT login!");`
`@@ -295,7 +295,7 @@ private async Task LoginWithJWT(string jwtToken, string encryptionKey, string re`
`295`	`295`
`296`	`296`	`#region Auth Endpoint Flow`
`297`	`297`
`298`		`- private async Task LoginWithAuthEndpoint(string payload, string encryptionKey, string recoveryCode = null)`
	`298`	`+ public virtual async Task LoginWithAuthEndpoint(string payload, string encryptionKey, string recoveryCode = null)`
`299`	`299`	`{`
`300`	`300`	`if (string.IsNullOrEmpty(payload))`
`301`	`301`	`throw new UnityException("Auth payload is required for Auth Endpoint login!");`
`@@ -311,15 +311,15 @@ private async Task LoginWithAuthEndpoint(string payload, string encryptionKey, s`
`311`	`311`
`312`	`312`	`#region Common`
`313`	`313`
`314`		`- private void DisplayRecoveryInput(bool hideOtpInput)`
	`314`	`+ public virtual void DisplayRecoveryInput(bool hideOtpInput)`
`315`	`315`	`{`
`316`	`316`	`if (hideOtpInput)`
`317`	`317`	`OTPInput.gameObject.SetActive(false);`
`318`	`318`	`RecoveryInput.gameObject.SetActive(true);`
`319`	`319`	`EmbeddedWalletCanvas.SetActive(true);`
`320`	`320`	`}`
`321`	`321`
`322`		`- private void ShowRecoveryCodes(EmbeddedWallet.VerifyResult res)`
	`322`	`+ public virtual void ShowRecoveryCodes(EmbeddedWallet.VerifyResult res)`
`323`	`323`	`{`
`324`	`324`	`if (res.MainRecoveryCode != null && res.WasEmailed.HasValue && res.WasEmailed.Value == false)`
`325`	`325`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ private void Awake()`
`43`	`43`
`44`	`44`	`// Core`
`45`	`45`
`46`		`- public async Task<string> Connect()`
	`46`	`+ public virtual async Task<string> Connect()`
`47`	`47`	`{`
`48`	`48`	`OTPPanel.SetActive(false);`
`49`	`49`
`@@ -78,14 +78,14 @@ public async Task<string> Connect()`
`78`	`78`	`return MetaMaskUnity.Instance.Wallet.SelectedAddress;`
`79`	`79`	`}`
`80`	`80`
`81`		`- public void Cancel()`
	`81`	`+ public virtual void Cancel()`
`82`	`82`	`{`
`83`	`83`	`_exception = new UnityException("User cancelled");`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`// QR`
`87`	`87`
`88`		`- private void ShowQR(string universalLink, string deepLink)`
	`88`	`+ public virtual void ShowQR(string universalLink, string deepLink)`
`89`	`89`	`{`
`90`	`90`	`var qrCodeAsTexture2D = GenerateQRTexture(universalLink);`
`91`	`91`	`QRCodeImage.sprite = Sprite.Create(qrCodeAsTexture2D, new Rect(0, 0, qrCodeAsTexture2D.width, qrCodeAsTexture2D.height), new Vector2(0.5f, 0.5f));`
`@@ -94,7 +94,7 @@ private void ShowQR(string universalLink, string deepLink)`
`94`	`94`	`QRCodeImage.mainTexture.filterMode = FilterMode.Point;`
`95`	`95`	`}`
`96`	`96`
`97`		`- private Texture2D GenerateQRTexture(string text)`
	`97`	`+ public virtual Texture2D GenerateQRTexture(string text)`
`98`	`98`	`{`
`99`	`99`	`Texture2D encoded = new Texture2D(256, 256);`
`100`	`100`	`var color32 = EncodeToQR(text, encoded.width, encoded.height);`
`@@ -103,7 +103,7 @@ private Texture2D GenerateQRTexture(string text)`
`103`	`103`	`return encoded;`
`104`	`104`	`}`
`105`	`105`
`106`		`- private Color32[] EncodeToQR(string textForEncoding, int width, int height)`
	`106`	`+ public virtual Color32[] EncodeToQR(string textForEncoding, int width, int height)`
`107`	`107`	`{`
`108`	`108`	`var writer = new BarcodeWriter`
`109`	`109`	`{`
`@@ -115,48 +115,48 @@ private Color32[] EncodeToQR(string textForEncoding, int width, int height)`
`115`	`115`
`116`	`116`	`// Top level Event Listeners`
`117`	`117`
`118`		`- private void OnWalletConnected(object sender, EventArgs e)`
	`118`	`+ public virtual void OnWalletConnected(object sender, EventArgs e)`
`119`	`119`	`{`
`120`	`120`	`_connected = true;`
`121`	`121`	`}`
`122`	`122`
`123`		`- private void OnWalletAuthorized(object sender, EventArgs e)`
	`123`	`+ public virtual void OnWalletAuthorized(object sender, EventArgs e)`
`124`	`124`	`{`
`125`	`125`	`_authorized = true;`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`// IMetaMaskUnityTransportListener`
`129`	`129`
`130`		`- public void OnMetaMaskConnectRequest(string universalLink, string deepLink)`
	`130`	`+ public virtual void OnMetaMaskConnectRequest(string universalLink, string deepLink)`
`131`	`131`	`{`
`132`	`132`	`ShowQR(universalLink, deepLink);`
`133`	`133`	`}`
`134`	`134`
`135`		`- public void OnMetaMaskRequest(string id, MetaMaskEthereumRequest request)`
	`135`	`+ public virtual void OnMetaMaskRequest(string id, MetaMaskEthereumRequest request)`
`136`	`136`	`{`
`137`	`137`	`return;`
`138`	`138`	`}`
`139`	`139`
`140`		`- public void OnMetaMaskFailure(Exception error)`
	`140`	`+ public virtual void OnMetaMaskFailure(Exception error)`
`141`	`141`	`{`
`142`	`142`	`_exception = error;`
`143`	`143`	`}`
`144`	`144`
`145`		`- public void OnMetaMaskSuccess()`
	`145`	`+ public virtual void OnMetaMaskSuccess()`
`146`	`146`	`{`
`147`	`147`	`_connected = true;`
`148`	`148`	`_authorized = true;`
`149`	`149`	`}`
`150`	`150`
`151`		`- public void OnMetaMaskOTP(int otp)`
	`151`	`+ public virtual void OnMetaMaskOTP(int otp)`
`152`	`152`	`{`
`153`	`153`	`OTPPanel.SetActive(true);`
`154`	`154`
`155`	`155`	`var shouldShowOtpCode = DateTime.Now - MetaMaskUnity.Instance.Wallet.LastActive >= TimeSpan.FromHours(1);`
`156`	`156`
`157`	`157`	`// They simply need to press resume in the app`
`158`	`158`	`OTPText.gameObject.SetActive(shouldShowOtpCode);`
`159`		`-`
	`159`	`+`
`160`	`160`	`if (shouldShowOtpCode)`
`161`	`161`	`{`
`162`	`162`	`OTPText.text = otp.ToString();`
`@@ -167,7 +167,7 @@ public void OnMetaMaskOTP(int otp)`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
`170`		`- public void OnMetaMaskDisconnected()`
	`170`	`+ public virtual void OnMetaMaskDisconnected()`
`171`	`171`	`{`
`172`	`172`	`if (!MetaMaskUnity.Instance.Wallet.Transport.IsMobile \|\| !MetaMaskUnity.Instance.Wallet.HasSession)`
`173`	`173`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ private void Awake()`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- public async Task<(WalletConnectSignClient, string, string)> Connect(string walletConnectProjectId, BigInteger chainId)`
	`45`	`+ public virtual async Task<(WalletConnectSignClient, string, string)> Connect(string walletConnectProjectId, BigInteger chainId)`
`46`	`46`	`{`
`47`	`47`	`WalletConnectCanvas.SetActive(true);`
`48`	`48`
`@@ -135,7 +135,7 @@ private void Awake()`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
`138`		`- private static Texture2D GenerateQRTexture(string text)`
	`138`	`+ public virtual Texture2D GenerateQRTexture(string text)`
`139`	`139`	`{`
`140`	`140`	`Texture2D encoded = new Texture2D(256, 256);`
`141`	`141`	`var color32 = EncodeToQR(text, encoded.width, encoded.height);`
`@@ -144,7 +144,7 @@ private static Texture2D GenerateQRTexture(string text)`
`144`	`144`	`return encoded;`
`145`	`145`	`}`
`146`	`146`
`147`		`- private static Color32[] EncodeToQR(string textForEncoding, int width, int height)`
	`147`	`+ public virtual Color32[] EncodeToQR(string textForEncoding, int width, int height)`
`148`	`148`	`{`
`149`	`149`	`var writer = new BarcodeWriter`
`150`	`150`	`{`