Support NFT base64 uri and properties (#66)

Author: 0xFirekeeper

Thirdweb.Tests/Thirdweb.Storage/Thirdweb.Storage.Tests.cs

@@ -1,4 +1,6 @@
-namespace Thirdweb.Tests.Storage;
+using Newtonsoft.Json;
+
+namespace Thirdweb.Tests.Storage;
 
 public class StorageTests : BaseTests
 {
@@ -55,6 +57,19 @@ public async Task DownloadTest_Bytes()
         Assert.NotEmpty(res);
     }
 
+    [Fact(Timeout = 120000)]
+    public async Task DownloadTest_Base64Uri()
+    {
+        var uri =
+            "data:application/json;base64,eyJuYW1lIjogIllvbml4IiwgImRlc2NyaXB0aW9uIjogIkZyb20gYSBkaXN0YW50IGZ1dHVyZSwgVGFpa28gTGFicyBoYXMgZGV2ZWxvcGVkIGEgc2VjcmV0IHdlYXBvbiB0byBjb21iYXQgdGhlIGdyZWF0IGNhbGFtaXR5IGtub3duIGFzICdGZWVzLCcgYSBtYXNzaXZlIGdhcyBjbG91ZCB0aGF0IHBvaXNvbnMgdGhlIGVudGlyZSBwbGFuZXQsIHB1dHRpbmcgYWxsIGNpdGl6ZW5zIGF0IHJpc2suIEFsdGhvdWdoIHRoZSBpZGVhIGlzIGJyaWxsaWFudCwgdGhlIFRhaWtvIE1vbmtleXMgYXJlIHN0aWxsIGltbWF0dXJlLCBhbG1vc3Qgc3R1cGlkISBUaGUgb25seSB3YXkgdG8gZmlnaHQgdGhpcyBzY291cmdlIGlzIHRvIGZpbmQgYSB3YXkgdG8gdHJhaW4gdGhlbSwgdHVybmluZyB0aGVtIGludG8gdGhlIG1vc3QgcG93ZXJmdWwgc2VjcmV0IHdlYXBvbiBvZiBhbGwuIEJ5IGNoYW5jZSwgYSBicmlkZ2UgaGFzIG9wZW5lZCBiZXR3ZWVuIHR3byB3b3JsZHMsIGFuZCBpdCBzZWVtcyB0aGF0IHRoZSBNb25rZXkgUmVhbG0gaXMgdGhlIGJlc3QgcGxhY2UgdG8gaW1wbGVtZW50IHRoZSBncmFuZCBwbGFuISBGaWdodCBhbmQgYmVjb21lIHRoZSBiZXN0IG1vbmtleTsgb25seSB5b3UgY2FuIG1ha2UgR2FzIEZlZXMgYSBkaXN0YW50IG1lbW9yeS4iLCAiaW1hZ2UiOiAiaXBmczovL1FtVzFqOFRKZGRSOVdVWEhDODFlb05SWGoyYVY4NndzRnJWWnJVYTRyY1dyejIvU01UYWlrb0xvdy5qcGciLCAiYW5pbWF0aW9uX3VybCI6ICJpcGZzOi8vUW1XMWo4VEpkZFI5V1VYSEM4MWVvTlJYajJhVjg2d3NGclZaclVhNHJjV3J6Mi9TTVRhaWtvSGlnaC5qcGciLCAicHJvcGVydGllcyI6IHsiTnVtYmVyIjogMSwgIlJQRyBDbGFzcyI6ICJOb25lIiwgIkNsYW4iOiAiU3R1cGlkIE1vbmtzIiwgIkxldmVsIjogMX19";
+
+        var client = ThirdwebClient.Create(secretKey: this.SecretKey);
+        var res = await ThirdwebStorage.Download<NFTMetadata>(client, uri);
+        Assert.NotNull(res.Properties);
+        var propertiesObj = JsonConvert.DeserializeObject<Dictionary<string, object>>(JsonConvert.SerializeObject(res.Properties));
+        Assert.True(propertiesObj!.Count > 0);
+    }
+
     [Fact(Timeout = 120000)]
     public async Task DownloadTest_400()
     {

Thirdweb/Thirdweb.Extensions/ExtensionTypes.cs

@@ -236,6 +236,12 @@ public struct NFTMetadata
     /// </summary>
     [JsonProperty("attributes")]
     public object Attributes { get; set; }
+
+    /// <summary>
+    /// Gets or sets the properties of the NFT.
+    /// </summary>
+    [JsonProperty("properties")]
+    public object Properties { get; set; }
 }
 
 #endregion

Thirdweb/Thirdweb.Storage/ThirdwebStorage.cs

@@ -24,6 +24,13 @@ public static async Task<T> Download<T>(ThirdwebClient client, string uri, int?
             throw new ArgumentNullException(nameof(uri));
         }
 
+        if (uri.StartsWith("data:application/json;base64,"))
+        {
+            var base64Data = uri["data:application/json;base64,".Length..];
+            var jsonData = System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(base64Data));
+            return JsonConvert.DeserializeObject<T>(jsonData);
+        }
+
         uri = uri.ReplaceIPFS($"https://{client.ClientId}.ipfscdn.io/ipfs/");
 
         using var cts = new CancellationTokenSource(requestTimeout ?? client.FetchTimeoutOptions.GetTimeout(TimeoutType.Storage));
@@ -94,8 +101,6 @@ public static async Task<IPFSUploadResult> UploadRaw(ThirdwebClient client, byte
     /// <exception cref="ArgumentNullException">Thrown if the path is null or empty.</exception>
     public static async Task<IPFSUploadResult> Upload(ThirdwebClient client, string path)
     {
-        return string.IsNullOrEmpty(path)
-            ? throw new ArgumentNullException(nameof(path))
-            : await UploadRaw(client, await File.ReadAllBytesAsync(path).ConfigureAwait(false)).ConfigureAwait(false);
+        return string.IsNullOrEmpty(path) ? throw new ArgumentNullException(nameof(path)) : await UploadRaw(client, await File.ReadAllBytesAsync(path).ConfigureAwait(false)).ConfigureAwait(false);
     }
 }