Merge pull request #7460 from abpframework/maliming/IRemoteStreamContent

Refactor IRemoteStreamContent related functions.
abpframework · Jan 27, 2021 · c2fa7be · c2fa7be
2 parents 09c3943 + 271a236
commit c2fa7be
Show file tree

Hide file tree

Showing 11 changed files with 150 additions and 52 deletions.
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.Auditing;
-using Volo.Abp.AspNetCore.Mvc.Content;
+using Volo.Abp.AspNetCore.Mvc.ContentFormatters;
 using Volo.Abp.AspNetCore.Mvc.Conventions;
 using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
 using Volo.Abp.AspNetCore.Mvc.Features;

diff --git a/...rc/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Content/InternalRemoteStreamContent.cs b/...rc/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Content/InternalRemoteStreamContent.cs
diff --git a/...tent/RemoteStreamContentInputFormatter.cs → ...ters/RemoteStreamContentInputFormatter.cs b/...tent/RemoteStreamContentInputFormatter.cs → ...ters/RemoteStreamContentInputFormatter.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Threading.Tasks;
-using Microsoft.Net.Http.Headers;
 using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Net.Http.Headers;
 using Volo.Abp.Content;
 
-namespace Volo.Abp.AspNetCore.Mvc.Content
+namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters
 {
     public class RemoteStreamContentInputFormatter : InputFormatter
     {
@@ -20,9 +20,10 @@ protected override bool CanReadType(Type type)
 
         public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context)
         {
-            return InputFormatterResult.SuccessAsync(
-                new InternalRemoteStreamContent(context.HttpContext)
-            );
+            return InputFormatterResult.SuccessAsync(new RemoteStreamContent(context.HttpContext.Request.Body)
+            {
+                ContentType = context.HttpContext.Request.ContentType
+            });
         }
     }
 }
diff --git a/...ent/RemoteStreamContentOutputFormatter.cs → ...ers/RemoteStreamContentOutputFormatter.cs b/...ent/RemoteStreamContentOutputFormatter.cs → ...ers/RemoteStreamContentOutputFormatter.cs
@@ -4,7 +4,7 @@
 using Microsoft.Net.Http.Headers;
 using Volo.Abp.Content;
 
-namespace Volo.Abp.AspNetCore.Mvc.Content
+namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters
 {
     public class RemoteStreamContentOutputFormatter : OutputFormatter
     {
@@ -21,9 +21,16 @@ protected override bool CanWriteType(Type type)
         public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context)
         {
             var remoteStream = (IRemoteStreamContent)context.Object;
-            using (var stream = remoteStream.GetStream())
+
+            if (remoteStream != null)
             {
-                await stream.CopyToAsync(context.HttpContext.Response.Body);
+                context.HttpContext.Response.ContentType = remoteStream.ContentType;
+
+                using (var stream = remoteStream.GetStream())
+                {
+                    stream.Position = 0;
+                    await stream.CopyToAsync(context.HttpContext.Response.Body);
+                }
             }
         }
     }

diff --git a/...rk/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Content/ReferencedRemoteStreamContent.cs b/...rk/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Content/ReferencedRemoteStreamContent.cs
diff --git a/.../Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs b/.../Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
@@ -14,7 +14,6 @@
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.DynamicProxy;
 using Volo.Abp.Http.Client.Authentication;
-using Volo.Abp.Http.Client.Content;
 using Volo.Abp.Http.Modeling;
 using Volo.Abp.Http.ProxyScripting.Generators;
 using Volo.Abp.Json;
@@ -112,7 +111,10 @@ private async Task<T> MakeRequestAndGetResultAsync<T>(IAbpMethodInvocation invoc
                 /* returning a class that holds a reference to response
                  * content just to be sure that GC does not dispose of
                  * it before we finish doing our work with the stream */
-                return (T)((object)new ReferencedRemoteStreamContent(await responseContent.ReadAsStreamAsync(), responseContent));
+                return (T)(object)new RemoteStreamContent(await responseContent.ReadAsStreamAsync())
+                {
+                    ContentType = responseContent.Headers.ContentType?.ToString()
+                };
             }
 
             var stringContent = await responseContent.ReadAsStringAsync();

diff --git a/....Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController.cs b/....Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController.cs
@@ -0,0 +1,36 @@
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Shouldly;
+using Volo.Abp.Content;
+
+namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters
+{
+    [Route("api/remote-stream-content-test")]
+    public class RemoteStreamContentTestController : AbpController
+    {
+        [HttpGet]
+        [Route("Download")]
+        public async Task<IRemoteStreamContent> DownloadAsync()
+        {
+            var memoryStream = new MemoryStream();
+            await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("DownloadAsync"));
+
+            return new RemoteStreamContent(memoryStream)
+            {
+                ContentType = "application/rtf"
+            };
+        }
+
+        [HttpPost]
+        [Route("Upload")]
+        public async Task<string> UploadAsync([FromBody]IRemoteStreamContent streamContent)
+        {
+            using (var reader = new StreamReader(streamContent.GetStream()))
+            {
+                return await reader.ReadToEndAsync() + ":" + streamContent.ContentType;
+            }
+        }
+    }
+}
diff --git a/...ests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController_Tests.cs b/...ests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController_Tests.cs
@@ -0,0 +1,37 @@
+using System.IO;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Shouldly;
+using Xunit;
+
+namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters
+{
+    public class RemoteStreamContentTestController_Tests : AspNetCoreMvcTestBase
+    {
+        [Fact]
+        public async Task DownloadAsync()
+        {
+            var result = await GetResponseAsync("/api/remote-stream-content-test/download");
+            result.Content.Headers.ContentType?.ToString().ShouldBe("application/rtf");
+            (await result.Content.ReadAsStringAsync()).ShouldBe("DownloadAsync");
+        }
+
+        [Fact]
+        public async Task UploadAsync()
+        {
+            using (var requestMessage = new HttpRequestMessage(HttpMethod.Post, "/api/remote-stream-content-test/upload"))
+            {
+                var memoryStream = new MemoryStream();
+                await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("UploadAsync"));
+                memoryStream.Position = 0;
+                requestMessage.Content = new StreamContent(memoryStream);
+                requestMessage.Content.Headers.Add("Content-Type", "application/rtf");
+
+                var response = await Client.SendAsync(requestMessage);
+
+                (await response.Content.ReadAsStringAsync()).ShouldBe("UploadAsync:application/rtf");
+            }
+        }
+    }
+}
diff --git a/....Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs b/....Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs
@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute.Extensions;
 using Shouldly;
 using Volo.Abp.Application.Dtos;
+using Volo.Abp.Content;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Http.Client;
 using Volo.Abp.TestApp.Application;
@@ -168,5 +171,31 @@ public async Task GetWithComplexType()
             result.Inner1.Value2.ShouldBe("value two");
             result.Inner1.Inner2.Value3.ShouldBe("value three");
         }
+
+        [Fact]
+        public async Task DownloadAsync()
+        {
+            var result = await _peopleAppService.DownloadAsync();
+
+            result.ContentType.ShouldBe("application/rtf");
+            using (var reader = new StreamReader(result.GetStream()))
+            {
+                var str = await reader.ReadToEndAsync();
+                str.ShouldBe("DownloadAsync");
+            }
+        }
+
+        [Fact]
+        public async Task UploadAsync()
+        {
+            var memoryStream = new MemoryStream();
+            await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("UploadAsync"));
+            memoryStream.Position = 0;
+            var result = await _peopleAppService.UploadAsync(new RemoteStreamContent(memoryStream)
+            {
+                ContentType = "application/rtf"
+            });
+            result.ShouldBe("UploadAsync:application/rtf");
+        }
     }
 }
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/IPeopleAppService.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/IPeopleAppService.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
+using Volo.Abp.Content;
 using Volo.Abp.TestApp.Application.Dto;
 
 namespace Volo.Abp.TestApp.Application
@@ -20,5 +21,9 @@ public interface IPeopleAppService : ICrudAppService<PersonDto, Guid>
         Task GetWithAuthorized();
 
         Task<GetWithComplexTypeInput> GetWithComplexType(GetWithComplexTypeInput input);
+
+        Task<IRemoteStreamContent> DownloadAsync();
+
+        Task<string> UploadAsync(IRemoteStreamContent streamContent);
     }
 }
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs
@@ -1,12 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.TestApp.Domain;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Application.Services;
+using Volo.Abp.Content;
 using Volo.Abp.TestApp.Application.Dto;
 
 namespace Volo.Abp.TestApp.Application
@@ -64,5 +67,24 @@ public Task<GetWithComplexTypeInput> GetWithComplexType(GetWithComplexTypeInput
         {
             return Task.FromResult(input);
         }
+
+        public async Task<IRemoteStreamContent> DownloadAsync()
+        {
+            var memoryStream = new MemoryStream();
+            await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("DownloadAsync"));
+
+            return new RemoteStreamContent(memoryStream)
+            {
+                ContentType = "application/rtf"
+            };
+        }
+
+        public async Task<string> UploadAsync(IRemoteStreamContent streamContent)
+        {
+            using (var reader = new StreamReader(streamContent.GetStream()))
+            {
+                return await reader.ReadToEndAsync() + ":" + streamContent.ContentType;
+            }
+        }
     }
 }