Merge pull request #223 from 0xsequence/Feature/getEmailFromWallet

andygruening · web-flow · commit 7ebe426df381 · 2024-12-10T17:06:42.000+01:00
Add ability to get email from sequence wallet
diff --git a/Assets/SequenceSDK/WaaS/Tests/MockWaaSWallet.cs b/Assets/SequenceSDK/WaaS/Tests/MockWaaSWallet.cs
@@ -99,5 +99,10 @@ public Task<IntentResponseGetIdToken> GetIdToken(string nonce = null)
         {
             throw new NotImplementedException();
         }
+
+        public string GetEmail()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/Packages/Sequence-Unity/Sequence/SequenceSDK/EmbeddedWallet/EOAWalletToSequenceWalletAdapter.cs b/Packages/Sequence-Unity/Sequence/SequenceSDK/EmbeddedWallet/EOAWalletToSequenceWalletAdapter.cs
@@ -314,6 +314,11 @@ public Task<IntentResponseGetIdToken> GetIdToken(string nonce = null)
         {
             throw new NotSupportedException();
         }
+
+        public string GetEmail()
+        {
+            throw new NotSupportedException();
+        }
     }
     #endregion
 
diff --git a/Packages/Sequence-Unity/Sequence/SequenceSDK/EmbeddedWallet/IWallet.cs b/Packages/Sequence-Unity/Sequence/SequenceSDK/EmbeddedWallet/IWallet.cs
@@ -160,6 +160,17 @@ public Task<TransactionReturn> SendTransactionWithFeeOptions(Chain network, Tran
         public event Action<IntentResponseGetIdToken> OnIdTokenRetrieved;
         public event Action<string> OnFailedToRetrieveIdToken;
 
+        /// <summary>
+        /// Get an idToken JWT issued from the Sequence API
+        /// </summary>
+        /// <param name="nonce"></param>
+        /// <returns></returns>
         public Task<IntentResponseGetIdToken> GetIdToken(string nonce = null);
+
+        /// <summary>
+        /// Get the email associated with this session
+        /// </summary>
+        /// <returns></returns>
+        public string GetEmail();
     }
 }
diff --git a/Packages/Sequence-Unity/Sequence/SequenceSDK/EmbeddedWallet/SequenceLogin.cs b/Packages/Sequence-Unity/Sequence/SequenceSDK/EmbeddedWallet/SequenceLogin.cs
@@ -214,7 +214,7 @@ private void Configure()
 
         private void TryToLoginWithStoredSessionWallet()
         {
-            (EOAWallet, string) walletInfo = (null, "");
+            (EOAWallet, string, string) walletInfo = (null, "", "");
             try
             {
                 walletInfo = AttemptToCreateWalletFromSecureStorage();
@@ -234,7 +234,7 @@ private void TryToLoginWithStoredSessionWallet()
             
             _sessionId = IntentDataOpenSession.CreateSessionId(_sessionWallet.GetAddress());
             
-            SequenceWallet wallet = new SequenceWallet(new Address(walletInfo.Item2), _sessionId, new IntentSender(new HttpClient(WaaSWithAuthUrl), walletInfo.Item1, _sessionId, _waasProjectId, _waasVersion));
+            SequenceWallet wallet = new SequenceWallet(new Address(walletInfo.Item2), _sessionId, new IntentSender(new HttpClient(WaaSWithAuthUrl), walletInfo.Item1, _sessionId, _waasProjectId, _waasVersion), walletInfo.Item3);
 
             EnsureSessionIsValid(wallet);
         }
@@ -268,19 +268,24 @@ private async Task EnsureSessionIsValid(SequenceWallet wallet)
             FailedLoginWithStoredSessionWallet("Stored session wallet is not active");
         }
 
-        private (EOAWallet, string) AttemptToCreateWalletFromSecureStorage()
+        private (EOAWallet, string, string) AttemptToCreateWalletFromSecureStorage()
         {
             ISecureStorage secureStorage = SecureStorageFactory.CreateSecureStorage();
             string walletInfo = secureStorage.RetrieveString(Application.companyName + "-" + Application.productName + "-" + _walletKey);
             if (string.IsNullOrEmpty(walletInfo))
             {
-                return (null, "");
+                return (null, "", "");
             }
             string[] walletInfoSplit = walletInfo.Split('-');
             string privateKey = walletInfoSplit[0];
             string walletAddress = walletInfoSplit[1];
+            string email = "";
+            if (walletInfoSplit.Length == 3)
+            {
+                email = walletInfoSplit[2];
+            }
             EOAWallet wallet = new EOAWallet(privateKey);
-            return (wallet, walletAddress);
+            return (wallet, walletAddress, email);
         }
         
         public event ILogin.OnLoginSuccessHandler OnLoginSuccess;
@@ -374,7 +379,7 @@ public async Task ConnectToWaaS(IntentDataOpenSession loginIntent, LoginMethod m
                 string sessionId = registerSessionResponse.sessionId;
                 walletAddress = registerSessionResponse.wallet;
                 OnLoginSuccess?.Invoke(sessionId, walletAddress);
-                SequenceWallet wallet = new SequenceWallet(new Address(walletAddress), sessionId, new IntentSender(new HttpClient(SequenceLogin.WaaSWithAuthUrl), _sessionWallet, sessionId, _waasProjectId, _waasVersion));
+                SequenceWallet wallet = new SequenceWallet(new Address(walletAddress), sessionId, new IntentSender(new HttpClient(SequenceLogin.WaaSWithAuthUrl), _sessionWallet, sessionId, _waasProjectId, _waasVersion), email);
                 PlayerPrefs.SetInt(WaaSLoginMethod, (int)method);
                 PlayerPrefs.SetString(OpenIdAuthenticator.LoginEmail, email);
                 PlayerPrefs.Save();
@@ -415,7 +420,7 @@ public async Task ConnectToWaaS(IntentDataOpenSession loginIntent, LoginMethod m
             {
                 if (_storeSessionWallet && SecureStorageFactory.IsSupportedPlatform())
                 {
-                    StoreWalletSecurely(walletAddress);
+                    StoreWalletSecurely(walletAddress, email);
                 }
             }
             catch (Exception e)
@@ -596,13 +601,13 @@ public async Task ConnectToWaaSAsGuest()
             await connector.ConnectToWaaSViaGuest();
         }
 
-        private void StoreWalletSecurely(string waasWalletAddress)
+        private void StoreWalletSecurely(string waasWalletAddress, string email)
         {
             ISecureStorage secureStorage = SecureStorageFactory.CreateSecureStorage();
             byte[] privateKeyBytes = new byte[32];
             _sessionWallet.privKey.WriteToSpan(privateKeyBytes);
             string privateKey = privateKeyBytes.ByteArrayToHexString();
-            secureStorage.StoreString(Application.companyName + "-" + Application.productName + "-" + _walletKey, privateKey + "-" + waasWalletAddress);
+            secureStorage.StoreString(Application.companyName + "-" + Application.productName + "-" + _walletKey, privateKey + "-" + waasWalletAddress + "-" + email);
         }
 
         public async Task FederateAccount(IntentDataFederateAccount federateAccount, LoginMethod method, string email)
diff --git a/Packages/Sequence-Unity/Sequence/SequenceSDK/EmbeddedWallet/SequenceWallet.cs b/Packages/Sequence-Unity/Sequence/SequenceSDK/EmbeddedWallet/SequenceWallet.cs
@@ -22,14 +22,16 @@ public class SequenceWallet : IWallet
         private IIntentSender _intentSender;
         private const string _sequenceCreatedContractEvent = "CreatedContract(address)";
         private string _builderApiKey;
+        private string _email;
 
-        public SequenceWallet(Address address, string sessionId, IIntentSender intentSender)
+        public SequenceWallet(Address address, string sessionId, IIntentSender intentSender, string email = "")
         {
             _address = address;
             _httpClient = new HttpClient("https://api.sequence.app/rpc");
             _intentSender = intentSender;
             SessionId = sessionId;
             _builderApiKey = SequenceConfig.GetConfig().BuilderAPIKey;
+            _email = email;
         }
 
         public Address GetWalletAddress()
@@ -440,5 +442,9 @@ public async Task<IntentResponseGetIdToken> GetIdToken(string nonce = null)
             }
         }
 
+        public string GetEmail()
+        {
+            return _email;
+        }
     }
 }
diff --git a/Packages/Sequence-Unity/Sequence/SequenceSDK/Relayer/MintingRequestProofValidator.cs b/Packages/Sequence-Unity/Sequence/SequenceSDK/Relayer/MintingRequestProofValidator.cs
@@ -15,7 +15,7 @@ public static class MintingRequestProofValidator
     {
         public static async Task<bool> IsValidMintingRequestProof(Chain chain, MintingRequestProof proof)
         {
-            SequenceWallet wallet = new SequenceWallet(proof.SigningAddress, null, null);
+            SequenceWallet wallet = new SequenceWallet(proof.SigningAddress, null, null, "");
 
             try
             {
diff --git a/Packages/Sequence-Unity/package.json b/Packages/Sequence-Unity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xyz.0xsequence.waas-unity",
-  "version": "3.12.1",
+  "version": "3.13.0",
   "displayName": "Sequence Embedded Wallet SDK",
   "description": "A Unity SDK for the Sequence WaaS API",
   "unity": "2021.3",

Original file line number	Diff line number	Diff line change
`@@ -99,5 +99,10 @@ public Task<IntentResponseGetIdToken> GetIdToken(string nonce = null)`
`99`	`99`	`{`
`100`	`100`	`throw new NotImplementedException();`
`101`	`101`	`}`
	`102`	`+`
	`103`	`+ public string GetEmail()`
	`104`	`+ {`
	`105`	`+ throw new NotImplementedException();`
	`106`	`+ }`
`102`	`107`	`}`
`103`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -314,6 +314,11 @@ public Task<IntentResponseGetIdToken> GetIdToken(string nonce = null)`
`314`	`314`	`{`
`315`	`315`	`throw new NotSupportedException();`
`316`	`316`	`}`
	`317`	`+`
	`318`	`+ public string GetEmail()`
	`319`	`+ {`
	`320`	`+ throw new NotSupportedException();`
	`321`	`+ }`
`317`	`322`	`}`
`318`	`323`	`#endregion`
`319`	`324`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ private void Configure()`
`214`	`214`
`215`	`215`	`private void TryToLoginWithStoredSessionWallet()`
`216`	`216`	`{`
`217`		`- (EOAWallet, string) walletInfo = (null, "");`
	`217`	`+ (EOAWallet, string, string) walletInfo = (null, "", "");`
`218`	`218`	`try`
`219`	`219`	`{`
`220`	`220`	`walletInfo = AttemptToCreateWalletFromSecureStorage();`
`@@ -234,7 +234,7 @@ private void TryToLoginWithStoredSessionWallet()`
`234`	`234`
`235`	`235`	`_sessionId = IntentDataOpenSession.CreateSessionId(_sessionWallet.GetAddress());`
`236`	`236`
`237`		`- SequenceWallet wallet = new SequenceWallet(new Address(walletInfo.Item2), _sessionId, new IntentSender(new HttpClient(WaaSWithAuthUrl), walletInfo.Item1, _sessionId, _waasProjectId, _waasVersion));`
	`237`	`+ SequenceWallet wallet = new SequenceWallet(new Address(walletInfo.Item2), _sessionId, new IntentSender(new HttpClient(WaaSWithAuthUrl), walletInfo.Item1, _sessionId, _waasProjectId, _waasVersion), walletInfo.Item3);`
`238`	`238`
`239`	`239`	`EnsureSessionIsValid(wallet);`
`240`	`240`	`}`
`@@ -268,19 +268,24 @@ private async Task EnsureSessionIsValid(SequenceWallet wallet)`
`268`	`268`	`FailedLoginWithStoredSessionWallet("Stored session wallet is not active");`
`269`	`269`	`}`
`270`	`270`
`271`		`- private (EOAWallet, string) AttemptToCreateWalletFromSecureStorage()`
	`271`	`+ private (EOAWallet, string, string) AttemptToCreateWalletFromSecureStorage()`
`272`	`272`	`{`
`273`	`273`	`ISecureStorage secureStorage = SecureStorageFactory.CreateSecureStorage();`
`274`	`274`	`string walletInfo = secureStorage.RetrieveString(Application.companyName + "-" + Application.productName + "-" + _walletKey);`
`275`	`275`	`if (string.IsNullOrEmpty(walletInfo))`
`276`	`276`	`{`
`277`		`- return (null, "");`
	`277`	`+ return (null, "", "");`
`278`	`278`	`}`
`279`	`279`	`string[] walletInfoSplit = walletInfo.Split('-');`
`280`	`280`	`string privateKey = walletInfoSplit[0];`
`281`	`281`	`string walletAddress = walletInfoSplit[1];`
	`282`	`+ string email = "";`
	`283`	`+ if (walletInfoSplit.Length == 3)`
	`284`	`+ {`
	`285`	`+ email = walletInfoSplit[2];`
	`286`	`+ }`
`282`	`287`	`EOAWallet wallet = new EOAWallet(privateKey);`
`283`		`- return (wallet, walletAddress);`
	`288`	`+ return (wallet, walletAddress, email);`
`284`	`289`	`}`
`285`	`290`
`286`	`291`	`public event ILogin.OnLoginSuccessHandler OnLoginSuccess;`
`@@ -374,7 +379,7 @@ public async Task ConnectToWaaS(IntentDataOpenSession loginIntent, LoginMethod m`
`374`	`379`	`string sessionId = registerSessionResponse.sessionId;`
`375`	`380`	`walletAddress = registerSessionResponse.wallet;`
`376`	`381`	`OnLoginSuccess?.Invoke(sessionId, walletAddress);`
`377`		`- SequenceWallet wallet = new SequenceWallet(new Address(walletAddress), sessionId, new IntentSender(new HttpClient(SequenceLogin.WaaSWithAuthUrl), _sessionWallet, sessionId, _waasProjectId, _waasVersion));`
	`382`	`+ SequenceWallet wallet = new SequenceWallet(new Address(walletAddress), sessionId, new IntentSender(new HttpClient(SequenceLogin.WaaSWithAuthUrl), _sessionWallet, sessionId, _waasProjectId, _waasVersion), email);`
`378`	`383`	`PlayerPrefs.SetInt(WaaSLoginMethod, (int)method);`
`379`	`384`	`PlayerPrefs.SetString(OpenIdAuthenticator.LoginEmail, email);`
`380`	`385`	`PlayerPrefs.Save();`
`@@ -415,7 +420,7 @@ public async Task ConnectToWaaS(IntentDataOpenSession loginIntent, LoginMethod m`
`415`	`420`	`{`
`416`	`421`	`if (_storeSessionWallet && SecureStorageFactory.IsSupportedPlatform())`
`417`	`422`	`{`
`418`		`- StoreWalletSecurely(walletAddress);`
	`423`	`+ StoreWalletSecurely(walletAddress, email);`
`419`	`424`	`}`
`420`	`425`	`}`
`421`	`426`	`catch (Exception e)`
`@@ -596,13 +601,13 @@ public async Task ConnectToWaaSAsGuest()`
`596`	`601`	`await connector.ConnectToWaaSViaGuest();`
`597`	`602`	`}`
`598`	`603`
`599`		`- private void StoreWalletSecurely(string waasWalletAddress)`
	`604`	`+ private void StoreWalletSecurely(string waasWalletAddress, string email)`
`600`	`605`	`{`
`601`	`606`	`ISecureStorage secureStorage = SecureStorageFactory.CreateSecureStorage();`
`602`	`607`	`byte[] privateKeyBytes = new byte[32];`
`603`	`608`	`_sessionWallet.privKey.WriteToSpan(privateKeyBytes);`
`604`	`609`	`string privateKey = privateKeyBytes.ByteArrayToHexString();`
`605`		`- secureStorage.StoreString(Application.companyName + "-" + Application.productName + "-" + _walletKey, privateKey + "-" + waasWalletAddress);`
	`610`	`+ secureStorage.StoreString(Application.companyName + "-" + Application.productName + "-" + _walletKey, privateKey + "-" + waasWalletAddress + "-" + email);`
`606`	`611`	`}`
`607`	`612`
`608`	`613`	`public async Task FederateAccount(IntentDataFederateAccount federateAccount, LoginMethod method, string email)`
Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,16 @@ public class SequenceWallet : IWallet`
`22`	`22`	`private IIntentSender _intentSender;`
`23`	`23`	`private const string _sequenceCreatedContractEvent = "CreatedContract(address)";`
`24`	`24`	`private string _builderApiKey;`
	`25`	`+ private string _email;`
`25`	`26`
`26`		`- public SequenceWallet(Address address, string sessionId, IIntentSender intentSender)`
	`27`	`+ public SequenceWallet(Address address, string sessionId, IIntentSender intentSender, string email = "")`
`27`	`28`	`{`
`28`	`29`	`_address = address;`
`29`	`30`	`_httpClient = new HttpClient("https://api.sequence.app/rpc");`
`30`	`31`	`_intentSender = intentSender;`
`31`	`32`	`SessionId = sessionId;`
`32`	`33`	`_builderApiKey = SequenceConfig.GetConfig().BuilderAPIKey;`
	`34`	`+ _email = email;`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`public Address GetWalletAddress()`
`@@ -440,5 +442,9 @@ public async Task<IntentResponseGetIdToken> GetIdToken(string nonce = null)`
`440`	`442`	`}`
`441`	`443`	`}`
`442`	`444`
	`445`	`+ public string GetEmail()`
	`446`	`+ {`
	`447`	`+ return _email;`
	`448`	`+ }`
`443`	`449`	`}`
`444`	`450`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class MintingRequestProofValidator`
`15`	`15`	`{`
`16`	`16`	`public static async Task<bool> IsValidMintingRequestProof(Chain chain, MintingRequestProof proof)`
`17`	`17`	`{`
`18`		`- SequenceWallet wallet = new SequenceWallet(proof.SigningAddress, null, null);`
	`18`	`+ SequenceWallet wallet = new SequenceWallet(proof.SigningAddress, null, null, "");`
`19`	`19`
`20`	`20`	`try`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "xyz.0xsequence.waas-unity",`
`3`		`- "version": "3.12.1",`
	`3`	`+ "version": "3.13.0",`
`4`	`4`	`"displayName": "Sequence Embedded Wallet SDK",`
`5`	`5`	`"description": "A Unity SDK for the Sequence WaaS API",`
`6`	`6`	`"unity": "2021.3",`