implement uploading of files

Author: kkuepper

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

@@ -6,6 +6,7 @@ namespace Notion.Client
     [JsonConverter(typeof(JsonSubtypes), "type")]
     [JsonSubtypes.KnownSubTypeAttribute(typeof(UploadedFileWithName), "file")]
     [JsonSubtypes.KnownSubTypeAttribute(typeof(ExternalFileWithName), "external")]
+    [JsonSubtypes.KnownSubTypeAttribute(typeof(FileUploadWithName), "file_upload")]
     public abstract class FileObjectWithName
     {
         [JsonProperty("type")]

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

@@ -0,0 +1,20 @@
+using System;
+using Newtonsoft.Json;
+
+namespace Notion.Client
+{
+    public class FileUploadWithName : FileObjectWithName
+    {
+        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

@@ -35,5 +35,7 @@ Task DeleteAsync(
             IDictionary<string, string> queryParams = null,
             IDictionary<string, string> headers = null,
             CancellationToken cancellationToken = default);
+
+        Task<RestClient.UploadResponse> Upload(string filePath, JsonSerializerSettings serializerSettings = null);
     }
 }

Src/Notion.Client/RestClient/RestClient.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
@@ -91,6 +92,52 @@ public async Task DeleteAsync(
             await SendAsync(uri, HttpMethod.Delete, queryParams, headers, null, cancellationToken);
         }
 
+        public async Task<UploadResponse> Upload(string filePath, JsonSerializerSettings serializerSettings = null)
+        {
+            var response = await this.PostAsync<UploadResponse>("https://api.notion.com/v1/file_uploads",
+                new UploadRequest {Mode = "single_part"});
+
+            using (var formData = new MultipartFormDataContent())
+            {
+                var fileStream = File.OpenRead(filePath);
+                var fileContent = new StreamContent(fileStream);
+                formData.Add(fileContent, "file", Path.GetFileName(filePath));
+
+                var uploadResponse = await this.SendAsync(response.UploadUrl, HttpMethod.Post, attachContent: message =>
+                {
+                    message.Content = formData;
+                });
+                return await uploadResponse.ParseStreamAsync<UploadResponse>(serializerSettings);
+            }
+        }
+        
+        public class UploadRequest
+        {
+            public string Mode { get; set; }
+        }
+
+        public class UploadResponse
+        {
+            public Guid Id { get; set; }
+            public string Object { get; set; }
+            [JsonProperty("created_time")]
+            public DateTime CreatedTime { get; set; }
+            [JsonProperty("last_edited_time")]
+            public DateTime LastEditedTime { get; set; }
+            [JsonProperty("expiry_time")]
+            public DateTime ExpiryTime { get; set; }
+            [JsonProperty("upload_url")]
+            public string UploadUrl { get; set; }
+            public bool Archived { get; set; }
+            public string Status { get; set; }
+            public string Filename { get; set; }
+            [JsonProperty("content_type")]
+            public string ContentType { get; set; }
+            [JsonProperty("request_id")]
+            public Guid RequestId { get; set; }
+        }
+
+
         private static ClientOptions MergeOptions(ClientOptions options)
         {
             return new ClientOptions

Test/Notion.IntegrationTests/PageClientTests.cs

@@ -54,6 +54,7 @@ public async Task InitializeAsync()
                     }
                 },
                 { "Number", new NumberPropertySchema { Number = new Number { Format = "number" } } }
+                {"Profile picture", new FilePropertySchema() { Files = new Dictionary<string, object>()}}
             },
             Parent = new ParentPageInput { PageId = _page.Id }
         };
@@ -179,6 +180,60 @@ public async Task Test_RetrievePagePropertyItemAsync()
             titleProperty.Title.PlainText.Should().Be("Test Page Title");
         });
     }
+    
+    [Fact]
+    public async Task Test_CanUploadAndSetProfilePicture()
+    {
+        // Arrange
+        var upload = await Client.RestClient.Upload("/Users/kkuepper/Pictures/Scan.jpeg");
+
+        // Act
+        var pagesCreateParameters = PagesCreateParametersBuilder
+            .Create(new DatabaseParentInput {DatabaseId = _database.Id})
+            .AddProperty("Name",
+                new TitlePropertyValue
+                {
+                    Title = new List<RichTextBase>
+                    {
+                        new RichTextText {Text = new Text {Content = "Test Page Title"}}
+                    }
+                })
+            .AddProperty("Number", new NumberPropertyValue() {Number = 123})
+            .AddProperty("Profile picture",
+                new FilesPropertyValue
+                {
+                    Files = new List<FileObjectWithName>
+                    {
+                        new FileUploadWithName {FileUpload = new FileUploadWithName.Info {Id = upload.Id}}
+                    }
+                }
+            )
+            .Build();
+
+        var page = await Client.Pages.CreateAsync(pagesCreateParameters);
+        
+        var property = await Client.Pages.RetrievePagePropertyItemAsync(new RetrievePropertyItemParameters
+        {
+            PageId = page.Id,
+            PropertyId = "Profile picture"
+        });
+
+        // Assert
+        property.Should().NotBeNull();
+        property.Should().BeOfType<FilesPropertyItem>();
+
+        var listProperty = (FilesPropertyItem)property;
+
+        listProperty.Type.Should().NotBeNull();
+
+        listProperty.Files.Should().SatisfyRespectively(p =>
+        {
+            p.Should().BeOfType<UploadedFileWithName>();
+            var fileWithName = (UploadedFileWithName)p;
+
+            fileWithName.Name.Should().Be("Scan.jpeg");
+        });
+    }
 
     [Fact]
     public async Task Test_UpdatePageProperty_with_date_as_null()