Update Wallet.Authenticate LoginPayload serialization to match Web Auth payload

Author: 0xFirekeeper

Assets/Thirdweb/Core/Scripts/Types.cs

@@ -422,39 +422,62 @@ public override readonly string ToString()
     [System.Serializable]
     public class LoginPayloadData
     {
-        public string type;
-        public string domain;
-        public string address;
-        public string statement;
-        public string uri;
-        public string version;
-        public string chain_id;
-        public string nonce;
-        public string issued_at;
-        public string expiration_time;
-        public string invalid_before;
-        public List<string> resources;
+        [JsonProperty("type")]
+        public string Type { get; set; }
+
+        [JsonProperty("domain")]
+        public string Domain { get; set; }
+
+        [JsonProperty("address")]
+        public string Address { get; set; }
+
+        [JsonProperty("statement")]
+        public string Statement { get; set; }
+
+        [JsonProperty("uri", NullValueHandling = NullValueHandling.Ignore)]
+        public string Uri { get; set; }
+
+        [JsonProperty("version", NullValueHandling = NullValueHandling.Ignore)]
+        public string Version { get; set; }
+
+        [JsonProperty("chain_id", NullValueHandling = NullValueHandling.Ignore)]
+        public string ChainId { get; set; }
+
+        [JsonProperty("nonce", NullValueHandling = NullValueHandling.Ignore)]
+        public string Nonce { get; set; }
+
+        [JsonProperty("issued_at", NullValueHandling = NullValueHandling.Ignore)]
+        public string IssuedAt { get; set; }
+
+        [JsonProperty("expiration_time", NullValueHandling = NullValueHandling.Ignore)]
+        public string ExpirationTime { get; set; }
+
+        [JsonProperty("invalid_before", NullValueHandling = NullValueHandling.Ignore)]
+        public string InvalidBefore { get; set; }
+
+        [JsonProperty("resources", NullValueHandling = NullValueHandling.Ignore)]
+        public List<string> Resources { get; set; }
 
         public LoginPayloadData()
         {
-            type = "evm";
+            Type = "evm";
         }
 
         public override string ToString()
         {
             return $"LoginPayloadData:"
-                + $"\n>type: {type}"
-                + $"\n>domain: {domain}"
-                + $"\n>address: {address}"
-                + $"\n>statement: {statement}"
-                + $"\n>uri: {uri}"
-                + $"\n>version: {version}"
-                + $"\n>chain_id: {chain_id}"
-                + $"\n>nonce: {nonce}"
-                + $"\n>issued_at: {issued_at}"
-                + $"\n>expiration_time: {expiration_time}"
-                + $"\n>invalid_before: {invalid_before}"
-                + $"\n>resources: {resources}";
+                + $"\n>type: {Type}"
+                + $"\n>domain: {Domain}"
+                + $"\n>address: {Address}"
+                + $"\n>statement: {Statement}"
+                + $"\n>uri: {Uri}"
+                + $"\n>version: {Version}"
+                + $"\n>chain_id: {ChainId}"
+                + $"\n>nonce: {Nonce}"
+                + $"\n>issued_at: {IssuedAt}"
+                + $"\n>expiration_time: {ExpirationTime}"
+                + $"\n>invalid_before: {InvalidBefore}"
+                + $"\n>resources: {Resources}";
         }
     }
 

Assets/Thirdweb/Core/Scripts/Wallet.cs

@@ -11,6 +11,7 @@
 using Newtonsoft.Json.Linq;
 using Nethereum.Hex.HexTypes;
 using Newtonsoft.Json;
+using System.Linq;
 
 namespace Thirdweb
 {
@@ -91,8 +92,8 @@ public async Task<LoginPayload> Authenticate(string domain)
                 var siwe = ThirdwebManager.Instance.SDK.session.SiweSession;
                 var siweMsg = new SiweMessage()
                 {
-                    Resources = new List<string>(),
-                    Uri = $"https://{domain}",
+                    Resources = null,
+                    Uri = null,
                     Statement = "Please ensure that the domain above matches the URL of the current website.",
                     Address = await GetAddress(),
                     Domain = domain,
@@ -109,25 +110,38 @@ public async Task<LoginPayload> Authenticate(string domain)
                 siweMsg.SetNotBefore(DateTime.UtcNow);
                 siweMsg = siwe.AssignNewNonce(siweMsg);
 
-                var finalMsg = SiweMessageStringBuilder.BuildMessage(siweMsg);
+                var resourcesString = siweMsg.Resources != null ? "\nResources:" + string.Join("", siweMsg.Resources.Select(r => $"\n- {r}")) : string.Empty;
+                var finalMsg =
+                    $"{siweMsg.Domain} wants you to sign in with your Ethereum account:"
+                    + $"\n{siweMsg.Address}\n\n"
+                    + $"{(string.IsNullOrEmpty(siweMsg.Statement) ? "" : $"{siweMsg.Statement}\n")}"
+                    + $"{(string.IsNullOrEmpty(siweMsg.Uri) ? "" : $"\nURI: {siweMsg.Uri}")}"
+                    + $"\nVersion: {siweMsg.Version}"
+                    + $"\nChain ID: {siweMsg.ChainId}"
+                    + $"\nNonce: {siweMsg.Nonce}"
+                    + $"\nIssued At: {siweMsg.IssuedAt}"
+                    + $"{(string.IsNullOrEmpty(siweMsg.ExpirationTime) ? "" : $"\nExpiration Time: {siweMsg.ExpirationTime}")}"
+                    + $"{(string.IsNullOrEmpty(siweMsg.NotBefore) ? "" : $"\nNot Before: {siweMsg.NotBefore}")}"
+                    + $"{(string.IsNullOrEmpty(siweMsg.RequestId) ? "" : $"\nRequest ID: {siweMsg.RequestId}")}"
+                    + resourcesString;
                 var signature = await Sign(finalMsg);
 
                 return new LoginPayload()
                 {
                     signature = signature,
                     payload = new LoginPayloadData()
                     {
-                        domain = siweMsg.Domain,
-                        address = siweMsg.Address,
-                        statement = siweMsg.Statement,
-                        uri = siweMsg.Uri,
-                        version = siweMsg.Version,
-                        chain_id = siweMsg.ChainId,
-                        nonce = siweMsg.Nonce,
-                        issued_at = siweMsg.IssuedAt,
-                        expiration_time = siweMsg.ExpirationTime,
-                        invalid_before = siweMsg.NotBefore,
-                        resources = siweMsg.Resources,
+                        Domain = siweMsg.Domain,
+                        Address = siweMsg.Address,
+                        Statement = siweMsg.Statement,
+                        Uri = siweMsg.Uri,
+                        Version = siweMsg.Version,
+                        ChainId = siweMsg.ChainId,
+                        Nonce = siweMsg.Nonce,
+                        IssuedAt = siweMsg.IssuedAt,
+                        ExpirationTime = siweMsg.ExpirationTime,
+                        InvalidBefore = siweMsg.NotBefore,
+                        Resources = siweMsg.Resources,
                     }
                 };
             }
@@ -149,22 +163,35 @@ public async Task<string> Verify(LoginPayload payload)
                 var siwe = ThirdwebManager.Instance.SDK.session.SiweSession;
                 var siweMessage = new SiweMessage()
                 {
-                    Domain = payload.payload.domain,
-                    Address = payload.payload.address,
-                    Statement = payload.payload.statement,
-                    Uri = payload.payload.uri,
-                    Version = payload.payload.version,
-                    ChainId = payload.payload.chain_id,
-                    Nonce = payload.payload.nonce,
-                    IssuedAt = payload.payload.issued_at,
-                    ExpirationTime = payload.payload.expiration_time,
-                    NotBefore = payload.payload.invalid_before,
-                    Resources = payload.payload.resources,
+                    Domain = payload.payload.Domain,
+                    Address = payload.payload.Address,
+                    Statement = payload.payload.Statement,
+                    Uri = payload.payload.Uri,
+                    Version = payload.payload.Version,
+                    ChainId = payload.payload.ChainId,
+                    Nonce = payload.payload.Nonce,
+                    IssuedAt = payload.payload.IssuedAt,
+                    ExpirationTime = payload.payload.ExpirationTime,
+                    NotBefore = payload.payload.InvalidBefore,
+                    Resources = payload.payload.Resources,
                     RequestId = null
                 };
                 var signature = payload.signature;
                 var validUser = await siwe.IsUserAddressRegistered(siweMessage);
-                var msg = SiweMessageStringBuilder.BuildMessage(siweMessage);
+                var resourcesString = siweMessage.Resources != null ? "\nResources:" + string.Join("", siweMessage.Resources.Select(r => $"\n- {r}")) : string.Empty;
+                var msg =
+                    $"{siweMessage.Domain} wants you to sign in with your Ethereum account:"
+                    + $"\n{siweMessage.Address}\n\n"
+                    + $"{(string.IsNullOrEmpty(siweMessage.Statement) ? "" : $"{siweMessage.Statement}\n")}"
+                    + $"{(string.IsNullOrEmpty(siweMessage.Uri) ? "" : $"\nURI: {siweMessage.Uri}")}"
+                    + $"\nVersion: {siweMessage.Version}"
+                    + $"\nChain ID: {siweMessage.ChainId}"
+                    + $"\nNonce: {siweMessage.Nonce}"
+                    + $"\nIssued At: {siweMessage.IssuedAt}"
+                    + $"{(string.IsNullOrEmpty(siweMessage.ExpirationTime) ? "" : $"\nExpiration Time: {siweMessage.ExpirationTime}")}"
+                    + $"{(string.IsNullOrEmpty(siweMessage.NotBefore) ? "" : $"\nNot Before: {siweMessage.NotBefore}")}"
+                    + $"{(string.IsNullOrEmpty(siweMessage.RequestId) ? "" : $"\nRequest ID: {siweMessage.RequestId}")}"
+                    + resourcesString;
                 if (validUser)
                 {
                     string recoveredAddress = await RecoverAddress(msg, signature);