set correct mime type and add uploading content to ImageBlock

Author: kkuepper

Src/Notion.Client/Models/File/FileObject.cs

@@ -6,6 +6,7 @@ namespace Notion.Client
 {
     [JsonConverter(typeof(JsonSubtypes), "type")]
     [JsonSubtypes.KnownSubTypeAttribute(typeof(UploadedFile), "file")]
+    [JsonSubtypes.KnownSubTypeAttribute(typeof(UploadingFile), "file_upload")]
     [JsonSubtypes.KnownSubTypeAttribute(typeof(ExternalFile), "external")]
     public abstract class FileObject : IPageIcon
     {

Src/Notion.Client/Models/File/UploadingFile.cs

@@ -0,0 +1,19 @@
+using System;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class UploadingFile : FileObject
+    {
+        public override string Type => "file_upload";
+
+        [JsonProperty("file_upload")]
+        public Info FileUpload { get; set; }
+
+        public class Info
+        {
+            [JsonProperty("id")]
+            public Guid Id { get; set; }
+        }
+    }
+}

Src/Notion.Client/RestClient/IRestClient.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
@@ -37,5 +38,6 @@ Task DeleteAsync(
             CancellationToken cancellationToken = default);
 
         Task<RestClient.UploadResponse> Upload(string filePath, JsonSerializerSettings serializerSettings = null);
+        Task<RestClient.UploadResponse> Upload(Stream stream, string filename, JsonSerializerSettings serializerSettings = null);
     }
 }

Src/Notion.Client/RestClient/RestClient.cs

@@ -106,12 +106,29 @@ public async Task<UploadResponse> Upload(Stream stream, string filename, JsonSer
             using (var formData = new MultipartFormDataContent())
             {
                 var fileContent = new StreamContent(stream);
-                formData.Add(fileContent, "file", filename);
 
-                var uploadResponse = await this.SendAsync(response.UploadUrl, HttpMethod.Post, attachContent: message =>
+                var mimeMapping = new Dictionary<string, string>
+                {
+                    {".jpg", "image/jpeg"},
+                    {".jpeg", "image/jpeg"},
+                    {".png", "image/png"},
+                    {".tif", "image/tiff"},
+                    {".tiff", "image/tiff"},
+                    {".gif", "image/gif"},
+                    {".svg", "image/svg+xml"}
+                };
+                
+                if (mimeMapping.TryGetValue(Path.GetExtension(filename).ToLower(), out var mapping))
                 {
-                    message.Content = formData;
-                });
+                    fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(mapping);
+                }
+                formData.Add(fileContent, "file", filename);
+
+                var uploadResponse = await this.SendAsync(response.UploadUrl, HttpMethod.Post,
+                    attachContent: message =>
+                    {
+                        message.Content = formData;
+                    });
                 return await uploadResponse.ParseStreamAsync<UploadResponse>(serializerSettings);
             }
         }

Test/Notion.IntegrationTests/PageClientTests.cs

@@ -198,7 +198,7 @@ public async Task Test_CanUploadAndSetProfilePicture()
                         new RichTextText {Text = new Text {Content = "Test Page Title"}}
                     }
                 })
-            .AddProperty("Number", new NumberPropertyValue() {Number = 123})
+            .AddProperty("Number", new NumberPropertyValue {Number = 123})
             .AddProperty("Profile picture",
                 new FilesPropertyValue
                 {
@@ -208,6 +208,10 @@ public async Task Test_CanUploadAndSetProfilePicture()
                     }
                 }
             )
+            .AddPageContent(new ImageBlock
+            {
+                Image = new UploadingFile {FileUpload = new UploadingFile.Info {Id = upload.Id}}
+            })
             .Build();
 
         var page = await Client.Pages.CreateAsync(pagesCreateParameters);