Unified Identity - Account Linking (#55)

0xFirekeeper · web-flow · commit 36522af16987 · 2024-08-13T00:39:32.000+03:00
diff --git a/Thirdweb.Console/Program.cs b/Thirdweb.Console/Program.cs
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet.Authentication/Server.Types.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet.Authentication/Server.Types.cs
@@ -24,6 +24,39 @@ internal VerifyResult(bool isNewUser, string authToken, string walletUserId, str
             internal string PhoneNumber { get; }
         }
 
+        [DataContract]
+        internal class AccountConnectResponse
+        {
+            [DataMember(Name = "linkedAccounts", IsRequired = true)]
+            public List<LinkedAccount> LinkedAccounts { get; set; }
+        }
+
+        [DataContract]
+        public class LinkedAccount
+        {
+            [DataMember(Name = "type", IsRequired = true)]
+            public string Type { get; set; }
+
+            [DataMember(Name = "details", IsRequired = true)]
+            public LinkedAccountDetails Details { get; set; }
+
+            [DataContract]
+            public class LinkedAccountDetails
+            {
+                [DataMember(Name = "email", EmitDefaultValue = false)]
+                public string Email { get; set; }
+
+                [DataMember(Name = "address", EmitDefaultValue = false)]
+                public string Address { get; set; }
+
+                [DataMember(Name = "phone", EmitDefaultValue = false)]
+                public string Phone { get; set; }
+
+                [DataMember(Name = "id", EmitDefaultValue = false)]
+                public string Id { get; set; }
+            }
+        }
+
         [DataContract]
         private class SendEmailOtpReturnType
         {
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet.Authentication/Server.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet.Authentication/Server.cs
@@ -5,7 +5,9 @@ namespace Thirdweb.EWS
 {
     internal abstract class ServerBase
     {
-        internal abstract Task<string> VerifyThirdwebClientIdAsync(string domain);
+        internal abstract Task<List<Server.LinkedAccount>> LinkAccountAsync(string currentAccountToken, string authTokenToConnect);
+        internal abstract Task<List<Server.LinkedAccount>> GetLinkedAccountsAsync(string currentAccountToken);
+
         internal abstract Task<Server.UserWallet> FetchUserDetailsAsync(string emailAddress, string authToken);
         internal abstract Task StoreAddressAndSharesAsync(string walletAddress, string authShare, string encryptedRecoveryShare, string authToken);
 
@@ -50,16 +52,29 @@ internal Server(ThirdwebClient client, IThirdwebHttpClient httpClient)
             thirdwebHttpClientType = httpClient.GetType();
         }
 
-        // embedded-wallet/verify-thirdweb-client-id
-        internal override async Task<string> VerifyThirdwebClientIdAsync(string parentDomain)
+        // account/connect
+        internal override async Task<List<LinkedAccount>> LinkAccountAsync(string currentAccountToken, string authTokenToConnect)
         {
-            Dictionary<string, string> queryParams = new() { { "clientId", clientId }, { "parentDomain", parentDomain } };
-            var uri = MakeUri2023("/embedded-wallet/verify-thirdweb-client-id", queryParams);
-            var content = MakeHttpContent(new { clientId, parentDomain });
+            var uri = MakeUri2024("/account/connect");
+            var content = MakeHttpContent(new { accountAuthTokenToConnect = authTokenToConnect });
+            httpClient.AddHeader("Authorization", $"Bearer iaw-auth-token:{currentAccountToken}");
             var response = await httpClient.PostAsync(uri.ToString(), content).ConfigureAwait(false);
+            httpClient.RemoveHeader("Authorization");
             await CheckStatusCodeAsync(response).ConfigureAwait(false);
-            var error = await DeserializeAsync<HttpErrorWithMessage>(response).ConfigureAwait(false);
-            return error.Error;
+
+            var res = await DeserializeAsync<AccountConnectResponse>(response).ConfigureAwait(false);
+            return res == null || res.LinkedAccounts == null || res.LinkedAccounts.Count == 0 ? throw new InvalidOperationException("No linked accounts returned") : res.LinkedAccounts;
+        }
+
+        // accounts GET
+        internal override async Task<List<LinkedAccount>> GetLinkedAccountsAsync(string currentAccountToken)
+        {
+            var uri = MakeUri2024("/accounts");
+            var response = await SendHttpWithAuthAsync(uri, currentAccountToken).ConfigureAwait(false);
+            await CheckStatusCodeAsync(response).ConfigureAwait(false);
+
+            var res = await DeserializeAsync<AccountConnectResponse>(response).ConfigureAwait(false);
+            return res == null || res.LinkedAccounts == null || res.LinkedAccounts.Count == 0 ? new List<LinkedAccount>() : res.LinkedAccounts;
         }
 
         // embedded-wallet/embedded-wallet-user-details
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet.Storage/LocalStorage.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet.Storage/LocalStorage.cs
@@ -20,7 +20,7 @@ internal LocalStorage(string clientId, string storageDirectoryPath = null)
         {
             string directory;
             directory = storageDirectoryPath ?? Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-            directory = Path.Combine(directory, "EWS");
+            directory = Path.Combine(directory, "Thirdweb", "InAppWallet");
             _ = Directory.CreateDirectory(directory);
             filePath = Path.Combine(directory, $"{clientId}.txt");
             try
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.AccountLinking.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.AccountLinking.cs
@@ -0,0 +1,15 @@
+namespace Thirdweb.EWS
+{
+    internal partial class EmbeddedWallet
+    {
+        public async Task<List<Server.LinkedAccount>> LinkAccountAsync(string currentAccountToken, string authTokenToConnect)
+        {
+            return await server.LinkAccountAsync(currentAccountToken, authTokenToConnect).ConfigureAwait(false);
+        }
+
+        public async Task<List<Server.LinkedAccount>> GetLinkedAccountsAsync(string currentAccountToken)
+        {
+            return await server.GetLinkedAccountsAsync(currentAccountToken).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.AuthEndpoint.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.AuthEndpoint.cs
@@ -2,10 +2,9 @@ namespace Thirdweb.EWS
 {
     internal partial class EmbeddedWallet
     {
-        public async Task<VerifyResult> SignInWithAuthEndpointAsync(string payload, string encryptionKey)
+        public async Task<Server.VerifyResult> SignInWithAuthEndpointAsync(string payload)
         {
-            var result = await server.VerifyAuthEndpointAsync(payload).ConfigureAwait(false);
-            return await PostAuthSetup(result, encryptionKey, "AuthEndpoint").ConfigureAwait(false);
+            return await server.VerifyAuthEndpointAsync(payload).ConfigureAwait(false);
         }
     }
 }
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.EmailOTP.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.EmailOTP.cs
@@ -11,18 +11,10 @@ internal partial class EmbeddedWallet
             return (userWallet.IsNewUser, isNewDevice);
         }
 
-        public async Task<VerifyResult> VerifyEmailOtpAsync(string emailAddress, string otp)
+        public async Task<Server.VerifyResult> VerifyEmailOtpAsync(string emailAddress, string otp)
         {
             emailAddress = emailAddress.ToLower();
-            try
-            {
-                var result = await server.VerifyEmailOtpAsync(emailAddress, otp).ConfigureAwait(false);
-                return await PostAuthSetup(result, null, "Email").ConfigureAwait(false);
-            }
-            catch (VerificationException ex)
-            {
-                return new VerifyResult(ex.CanRetry);
-            }
+            return await server.VerifyEmailOtpAsync(emailAddress, otp).ConfigureAwait(false);
         }
     }
 }
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.JWT.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.JWT.cs
@@ -2,10 +2,9 @@ namespace Thirdweb.EWS
 {
     internal partial class EmbeddedWallet
     {
-        public async Task<VerifyResult> SignInWithJwtAsync(string jwt, string encryptionKey)
+        public async Task<Server.VerifyResult> SignInWithJwtAsync(string jwt)
         {
-            var result = await server.VerifyJwtAsync(jwt).ConfigureAwait(false);
-            return await PostAuthSetup(result, encryptionKey, "JWT").ConfigureAwait(false);
+            return await server.VerifyJwtAsync(jwt).ConfigureAwait(false);
         }
     }
 }
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.Misc.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.Misc.cs
@@ -4,16 +4,12 @@ namespace Thirdweb.EWS
 {
     internal partial class EmbeddedWallet
     {
-        public async Task VerifyThirdwebClientIdAsync(string domain)
+        internal string GetCurrentAuthToken()
         {
-            var error = await server.VerifyThirdwebClientIdAsync(domain).ConfigureAwait(false);
-            if (error != "")
-            {
-                throw new InvalidOperationException($"Invalid thirdweb client id for domain {domain} | {error}");
-            }
+            return localStorage.Data?.AuthToken;
         }
 
-        private async Task<VerifyResult> PostAuthSetup(Server.VerifyResult result, string twManagedRecoveryCodeOverride, string authProvider)
+        internal async Task<VerifyResult> PostAuthSetup(Server.VerifyResult result, string twManagedRecoveryCodeOverride, string authProvider)
         {
             var walletUserId = result.WalletUserId;
             var authToken = result.AuthToken;
@@ -52,15 +48,12 @@ public async Task<User> GetUserAsync(string email, string phone, string authProv
             switch (userWallet.Status)
             {
                 case "Logged Out":
-                    await SignOutAsync().ConfigureAwait(false);
                     throw new InvalidOperationException("User is logged out");
                 case "Logged In, Wallet Uninitialized":
-                    await SignOutAsync().ConfigureAwait(false);
                     throw new InvalidOperationException("User is logged in but wallet is uninitialized");
                 case "Logged In, Wallet Initialized":
                     if (string.IsNullOrEmpty(localStorage.Data?.DeviceShare))
                     {
-                        await SignOutAsync().ConfigureAwait(false);
                         throw new InvalidOperationException("User is logged in but wallet is uninitialized");
                     }
 
@@ -70,12 +63,10 @@ public async Task<User> GetUserAsync(string email, string phone, string authProv
 
                     if ((email != null && email != emailAddress) || (phone != null && phone != phoneNumber))
                     {
-                        await SignOutAsync().ConfigureAwait(false);
                         throw new InvalidOperationException("User email or phone number do not match");
                     }
                     else if (email == null && localStorage.Data.AuthProvider != authProvider)
                     {
-                        await SignOutAsync().ConfigureAwait(false);
                         throw new InvalidOperationException($"User auth provider does not match. Expected {localStorage.Data.AuthProvider}, got {authProvider}");
                     }
                     else if (authShare == null)
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.OAuth.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.OAuth.cs
@@ -4,10 +4,9 @@ namespace Thirdweb.EWS
 {
     internal partial class EmbeddedWallet
     {
-        public async Task<VerifyResult> SignInWithOauthAsync(string authProvider, string authResult)
+        public async Task<Server.VerifyResult> SignInWithOauthAsync(string authProvider, string authResult)
         {
-            var result = await server.VerifyOAuthAsync(authResult).ConfigureAwait(false);
-            return await PostAuthSetup(result, null, authProvider).ConfigureAwait(false);
+            return await server.VerifyOAuthAsync(authResult).ConfigureAwait(false);
         }
 
         public async Task<string> FetchHeadlessOauthLoginLinkAsync(string authProvider, string platform)
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.PhoneOTP.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.PhoneOTP.cs
@@ -10,17 +10,9 @@ internal partial class EmbeddedWallet
             return (userWallet.IsNewUser, isNewDevice);
         }
 
-        public async Task<VerifyResult> VerifyPhoneOtpAsync(string phoneNumber, string otp)
+        public async Task<Server.VerifyResult> VerifyPhoneOtpAsync(string phoneNumber, string otp)
         {
-            try
-            {
-                var result = await server.VerifyPhoneOtpAsync(phoneNumber, otp).ConfigureAwait(false);
-                return await PostAuthSetup(result, null, "Phone").ConfigureAwait(false);
-            }
-            catch (VerificationException ex)
-            {
-                return new VerifyResult(ex.CanRetry);
-            }
+            return await server.VerifyPhoneOtpAsync(phoneNumber, otp).ConfigureAwait(false);
         }
     }
 }
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.SIWE.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet/EmbeddedWallet.SIWE.cs
@@ -4,15 +4,14 @@ namespace Thirdweb.EWS
 {
     internal partial class EmbeddedWallet
     {
-        public async Task<VerifyResult> SignInWithSiweAsync(IThirdwebWallet signer, BigInteger chainId)
+        public async Task<Server.VerifyResult> SignInWithSiweAsync(IThirdwebWallet signer, BigInteger chainId)
         {
             var address = await signer.GetAddress().ConfigureAwait(false);
             var payload = await server.FetchSiwePayloadAsync(address, chainId.ToString()).ConfigureAwait(false);
             var payloadMsg = Utils.GenerateSIWE(payload);
             var signature = await signer.PersonalSign(payloadMsg).ConfigureAwait(false);
 
-            var result = await server.VerifySiweAsync(payload, signature).ConfigureAwait(false);
-            return await PostAuthSetup(result, address, null).ConfigureAwait(false);
+            return await server.VerifySiweAsync(payload, signature).ConfigureAwait(false);
         }
     }
 }
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/InAppWallet.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/InAppWallet.cs

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ internal LocalStorage(string clientId, string storageDirectoryPath = null)`
`20`	`20`	`{`
`21`	`21`	`string directory;`
`22`	`22`	`directory = storageDirectoryPath ?? Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);`
`23`		`- directory = Path.Combine(directory, "EWS");`
	`23`	`+ directory = Path.Combine(directory, "Thirdweb", "InAppWallet");`
`24`	`24`	`_ = Directory.CreateDirectory(directory);`
`25`	`25`	`filePath = Path.Combine(directory, $"{clientId}.txt");`
`26`	`26`	`try`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,9 @@ namespace Thirdweb.EWS`
`2`	`2`	`{`
`3`	`3`	`internal partial class EmbeddedWallet`
`4`	`4`	`{`
`5`		`- public async Task<VerifyResult> SignInWithAuthEndpointAsync(string payload, string encryptionKey)`
	`5`	`+ public async Task<Server.VerifyResult> SignInWithAuthEndpointAsync(string payload)`
`6`	`6`	`{`
`7`		`- var result = await server.VerifyAuthEndpointAsync(payload).ConfigureAwait(false);`
`8`		`- return await PostAuthSetup(result, encryptionKey, "AuthEndpoint").ConfigureAwait(false);`
	`7`	`+ return await server.VerifyAuthEndpointAsync(payload).ConfigureAwait(false);`
`9`	`8`	`}`
`10`	`9`	`}`
`11`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,18 +11,10 @@ internal partial class EmbeddedWallet`
`11`	`11`	`return (userWallet.IsNewUser, isNewDevice);`
`12`	`12`	`}`
`13`	`13`
`14`		`- public async Task<VerifyResult> VerifyEmailOtpAsync(string emailAddress, string otp)`
	`14`	`+ public async Task<Server.VerifyResult> VerifyEmailOtpAsync(string emailAddress, string otp)`
`15`	`15`	`{`
`16`	`16`	`emailAddress = emailAddress.ToLower();`
`17`		`- try`
`18`		`- {`
`19`		`- var result = await server.VerifyEmailOtpAsync(emailAddress, otp).ConfigureAwait(false);`
`20`		`- return await PostAuthSetup(result, null, "Email").ConfigureAwait(false);`
`21`		`- }`
`22`		`- catch (VerificationException ex)`
`23`		`- {`
`24`		`- return new VerifyResult(ex.CanRetry);`
`25`		`- }`
	`17`	`+ return await server.VerifyEmailOtpAsync(emailAddress, otp).ConfigureAwait(false);`
`26`	`18`	`}`
`27`	`19`	`}`
`28`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,12 @@ namespace Thirdweb.EWS`
`4`	`4`	`{`
`5`	`5`	`internal partial class EmbeddedWallet`
`6`	`6`	`{`
`7`		`- public async Task VerifyThirdwebClientIdAsync(string domain)`
	`7`	`+ internal string GetCurrentAuthToken()`
`8`	`8`	`{`
`9`		`- var error = await server.VerifyThirdwebClientIdAsync(domain).ConfigureAwait(false);`
`10`		`- if (error != "")`
`11`		`- {`
`12`		`- throw new InvalidOperationException($"Invalid thirdweb client id for domain {domain} \| {error}");`
`13`		`- }`
	`9`	`+ return localStorage.Data?.AuthToken;`
`14`	`10`	`}`
`15`	`11`
`16`		`- private async Task<VerifyResult> PostAuthSetup(Server.VerifyResult result, string twManagedRecoveryCodeOverride, string authProvider)`
	`12`	`+ internal async Task<VerifyResult> PostAuthSetup(Server.VerifyResult result, string twManagedRecoveryCodeOverride, string authProvider)`
`17`	`13`	`{`
`18`	`14`	`var walletUserId = result.WalletUserId;`
`19`	`15`	`var authToken = result.AuthToken;`
`@@ -52,15 +48,12 @@ public async Task<User> GetUserAsync(string email, string phone, string authProv`
`52`	`48`	`switch (userWallet.Status)`
`53`	`49`	`{`
`54`	`50`	`case "Logged Out":`
`55`		`- await SignOutAsync().ConfigureAwait(false);`
`56`	`51`	`throw new InvalidOperationException("User is logged out");`
`57`	`52`	`case "Logged In, Wallet Uninitialized":`
`58`		`- await SignOutAsync().ConfigureAwait(false);`
`59`	`53`	`throw new InvalidOperationException("User is logged in but wallet is uninitialized");`
`60`	`54`	`case "Logged In, Wallet Initialized":`
`61`	`55`	`if (string.IsNullOrEmpty(localStorage.Data?.DeviceShare))`
`62`	`56`	`{`
`63`		`- await SignOutAsync().ConfigureAwait(false);`
`64`	`57`	`throw new InvalidOperationException("User is logged in but wallet is uninitialized");`
`65`	`58`	`}`
`66`	`59`
`@@ -70,12 +63,10 @@ public async Task<User> GetUserAsync(string email, string phone, string authProv`
`70`	`63`
`71`	`64`	`if ((email != null && email != emailAddress) \|\| (phone != null && phone != phoneNumber))`
`72`	`65`	`{`
`73`		`- await SignOutAsync().ConfigureAwait(false);`
`74`	`66`	`throw new InvalidOperationException("User email or phone number do not match");`
`75`	`67`	`}`
`76`	`68`	`else if (email == null && localStorage.Data.AuthProvider != authProvider)`
`77`	`69`	`{`
`78`		`- await SignOutAsync().ConfigureAwait(false);`
`79`	`70`	`throw new InvalidOperationException($"User auth provider does not match. Expected {localStorage.Data.AuthProvider}, got {authProvider}");`
`80`	`71`	`}`
`81`	`72`	`else if (authShare == null)`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,9 @@ namespace Thirdweb.EWS`
`4`	`4`	`{`
`5`	`5`	`internal partial class EmbeddedWallet`
`6`	`6`	`{`
`7`		`- public async Task<VerifyResult> SignInWithOauthAsync(string authProvider, string authResult)`
	`7`	`+ public async Task<Server.VerifyResult> SignInWithOauthAsync(string authProvider, string authResult)`
`8`	`8`	`{`
`9`		`- var result = await server.VerifyOAuthAsync(authResult).ConfigureAwait(false);`
`10`		`- return await PostAuthSetup(result, null, authProvider).ConfigureAwait(false);`
	`9`	`+ return await server.VerifyOAuthAsync(authResult).ConfigureAwait(false);`
`11`	`10`	`}`
`12`	`11`
`13`	`12`	`public async Task<string> FetchHeadlessOauthLoginLinkAsync(string authProvider, string platform)`