Add files and test (#49)

Author: ferhatelmas

src/stream-net-tests/IntegrationTests.cs

@@ -1,10 +1,9 @@
-using Newtonsoft.Json;
-using NUnit.Framework;
+using NUnit.Framework;
 using Stream;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace stream_net_tests
@@ -2467,5 +2466,28 @@ public async Task ReadPersonalization()
             Assert.True(d.ContainsKey("duration"));
             Assert.True(d.ContainsKey("results"));
         }
+
+        [Test]
+        public async Task TestUpload()
+        {
+            Stream.Upload upload;
+
+            using (var fs = File.OpenRead("../../../helloworld.txt"))
+            {
+                upload = await _client.Files.Upload(fs, "helloworld.txt");
+                Assert.IsNotEmpty(upload.File);
+            }
+            using (var fs = File.OpenRead("../../../helloworld.txt"))
+            {
+                upload = await _client.Files.Upload(fs, "helloworld.txt", "text/plain");
+                Assert.IsNotEmpty(upload.File);
+            }
+
+            using (FileStream fs = File.OpenRead(@"../../../helloworld.jpg"))
+            {
+                upload = await _client.Images.Upload(fs, "helloworld.jpg", "image/jpeg");
+                Assert.IsNotEmpty(upload.File);
+            }
+        }
     }
 }

src/stream-net-tests/UtilsTests.cs

@@ -24,7 +24,7 @@ internal Credentials()
                 new Stream.StreamClientOptions()
                 {
                     Location = Stream.StreamApiLocation.USEast,
-                    Timeout = 10000
+                    Timeout = 16000
                 });
         }
     }

src/stream-net-tests/helloworld.jpg

@@ -12,7 +12,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit.Console" Version="3.10.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
     <PackageReference Include="OpenCover" Version="4.7.922" />
     <ProjectReference Include="..\stream-net\stream-net.csproj">
       <Name>stream-net</Name>

src/stream-net-tests/helloworld.txt

@@ -11,6 +11,7 @@ public interface IStreamClient
         Users Users { get; }
         Personalization Personalization { get; }
 
+        Files Files { get; }
         Images Images { get; }
 
         Task ActivityPartialUpdate(string id = null, ForeignIDTime foreignIDTime = null, GenericData set = null, IEnumerable<string> unset = null);

src/stream-net-tests/stream-net-tests.csproj

@@ -12,19 +12,41 @@ public Images(StreamClient client)
             _client = client;
         }
 
-        public async Task<Image> Upload(System.IO.Stream image, string contentType)
+        public async Task<Upload> Upload(System.IO.Stream image, string name, string contentType)
         {
-            var request = _client.BuildUploadRequest();
+            var request = _client.BuildImageUploadRequest();
 
-            request.SetFileStream(image, contentType);
+            request.SetFileStream(image, name, contentType);
 
             var response = await _client.MakeRequest(request);
 
             if (response.StatusCode == System.Net.HttpStatusCode.Created)
-                return JsonConvert.DeserializeObject<Image>(response.Content);
+                return JsonConvert.DeserializeObject<Upload>(response.Content);
 
             throw StreamException.FromResponse(response);
         }
+    }
+
+    public class Files
+    {
+        readonly StreamClient _client;
+
+        public Files(StreamClient client)
+        {
+            _client = client;
+        }
 
+        public async Task<Upload> Upload(System.IO.Stream file, string name, string contentType = null)
+        {
+            var request = _client.BuildFileUploadRequest();
+            request.SetFileStream(file, name, contentType);
+
+            var response = await _client.MakeRequest(request);
+
+            if (response.StatusCode == System.Net.HttpStatusCode.Created)
+                return JsonConvert.DeserializeObject<Upload>(response.Content);
+
+            throw StreamException.FromResponse(response);
+        }
     }
 }

src/stream-net/IStreamClient.cs

@@ -1,7 +1,6 @@
-using System;
+using System;
 using System.Net;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -34,16 +33,9 @@ private HttpRequestMessage BuildRequestMessage(System.Net.Http.HttpMethod method
                 requestMessage.Headers.Add(h.Key, h.Value);
             });
 
-
             if (request.FileStream != null)
             {
-                var content = new MultipartFormDataContent();
-                var streamContent = new StreamContent(request.FileStream);
-
-                streamContent.Headers.Add("Content-Type", request.FileStreamContentType);
-
-                content.Add(streamContent, "file", "image.png");
-                requestMessage.Content = content;
+                requestMessage.Content = this.CreateFileStream(request);
             }
             else if (method == System.Net.Http.HttpMethod.Post || method == System.Net.Http.HttpMethod.Put)
             {
@@ -53,6 +45,21 @@ private HttpRequestMessage BuildRequestMessage(System.Net.Http.HttpMethod method
             return requestMessage;
         }
 
+        private HttpContent CreateFileStream(RestRequest request)
+        {
+            var content = new MultipartFormDataContent();
+            var streamContent = new StreamContent(request.FileStream);
+
+            if (request.FileStreamContentType != null)
+            {
+                streamContent.Headers.Add("Content-Type", request.FileStreamContentType);
+            }
+
+            streamContent.Headers.Add("Content-Disposition", "form-data; name=\"file\"; filename=\"" + request.FileStreamName + "\"");
+            content.Add(streamContent);
+            return content;
+        }
+
         public TimeSpan Timeout
         {
             get { return _timeout; }
@@ -64,7 +71,7 @@ private async Task<RestResponse> ExecuteHttpRequest(System.Net.Http.HttpMethod m
             var requestMessage = BuildRequestMessage(method, url, request);
             using (var cts = new CancellationTokenSource(_timeout))
             {
-                HttpResponseMessage response = await _client.SendAsync(requestMessage, cts.Token);
+                var response = await _client.SendAsync(requestMessage, cts.Token);
                 return await RestResponse.FromResponseMessage(response);
             }
         }

src/stream-net/Images.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Stream.Rest
 {
@@ -29,6 +28,8 @@ internal RestRequest(string resource, HttpMethod method)
         public System.IO.Stream FileStream { get; private set; }
         public string FileStreamContentType { get; private set; }
 
+        public string FileStreamName { get; private set; }
+
         public void AddHeader(string name, string value)
         {
             _headers[name] = value;
@@ -44,9 +45,10 @@ public void SetJsonBody(string json)
             JsonBody = json;
         }
 
-        public void SetFileStream(System.IO.Stream stream, string contentType)
+        public void SetFileStream(System.IO.Stream stream, string name, string contentType)
         {
             FileStream = stream;
+            FileStreamName = name;
             FileStreamContentType = contentType;
         }
 

src/stream-net/Rest/RestClient.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Net;
 using System.Net.Http;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Stream.Rest