Adding implementation for FileStreamResult and LocalRedirectResult

Author: uabarahona

src/Mvc/Mvc.Core/src/FileStreamResult.cs

@@ -5,8 +5,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Mvc
@@ -15,7 +17,7 @@ namespace Microsoft.AspNetCore.Mvc
     /// Represents an <see cref="ActionResult"/> that when executed will
     /// write a file from a stream to the response.
     /// </summary>
-    public class FileStreamResult : FileResult
+    public class FileStreamResult : FileResult, IResult
     {
         private Stream _fileStream;
 
@@ -79,5 +81,42 @@ public override Task ExecuteResultAsync(ActionContext context)
             var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<FileStreamResult>>();
             return executor.ExecuteAsync(context, this);
         }
+
+        async Task IResult.ExecuteAsync(HttpContext httpContext)
+        {
+            if (httpContext == null)
+            {
+                throw new ArgumentNullException(nameof(httpContext));
+            }
+
+            using (FileStream)
+            {
+                var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
+                var logger = loggerFactory.CreateLogger<RedirectResult>();
+                logger.ExecutingFileResult(this);
+
+                long? fileLength = null;
+                if (FileStream.CanSeek)
+                {
+                    fileLength = FileStream.Length;
+                }
+
+                var (range, rangeLength, serveBody) = FileResultExecutorBase.SetHeadersAndLog(
+                    httpContext,
+                    this,
+                    fileLength,
+                    EnableRangeProcessing,
+                    LastModified,
+                    EntityTag,
+                    logger);
+
+                if (!serveBody)
+                {
+                    return;
+                }
+
+                await FileStreamResultExecutor.WriteFileAsyncInternal(httpContext, this, range, rangeLength, logger);
+            }
+        }
     }
 }

src/Mvc/Mvc.Core/src/Infrastructure/FileStreamResultExecutor.cs

@@ -5,6 +5,7 @@
 
 using System;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 
@@ -77,9 +78,14 @@ protected virtual Task WriteFileAsync(
             RangeItemHeaderValue? range,
             long rangeLength)
         {
-            if (context == null)
+            return WriteFileAsyncInternal(context.HttpContext, result, range, rangeLength, Logger);
+        }
+
+        internal static Task WriteFileAsyncInternal(HttpContext httpContext, FileStreamResult result, RangeItemHeaderValue? range, long rangeLength, ILogger logger)
+        {
+            if (httpContext == null)
             {
-                throw new ArgumentNullException(nameof(context));
+                throw new ArgumentNullException(nameof(httpContext));
             }
 
             if (result == null)
@@ -94,10 +100,10 @@ protected virtual Task WriteFileAsync(
 
             if (range != null)
             {
-                Logger.WritingRangeToBody();
+                logger.WritingRangeToBody();
             }
 
-            return WriteFileAsync(context.HttpContext, result.FileStream, range, rangeLength);
+            return WriteFileAsync(httpContext, result.FileStream, range, rangeLength);
         }
     }
 }

src/Mvc/Mvc.Core/src/LocalRedirectResult.cs

@@ -4,17 +4,20 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Core;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Mvc
 {
     /// <summary>
     /// An <see cref="ActionResult"/> that returns a Found (302), Moved Permanently (301), Temporary Redirect (307),
     /// or Permanent Redirect (308) response with a Location header to the supplied local URL.
     /// </summary>
-    public class LocalRedirectResult : ActionResult
+    public class LocalRedirectResult : ActionResult, IResult
     {
         private string _localUrl;
 
@@ -103,5 +106,39 @@ public override Task ExecuteResultAsync(ActionContext context)
             var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<LocalRedirectResult>>();
             return executor.ExecuteAsync(context, this);
         }
+
+        Task IResult.ExecuteAsync(HttpContext httpContext)
+        {
+            if (httpContext == null)
+            {
+                throw new ArgumentNullException(nameof(httpContext));
+            }
+
+            // IsLocalUrl is called to handle  Urls starting with '~/'.
+            if (!UrlHelperBase.CheckIsLocalUrl(Url))
+            {
+                throw new InvalidOperationException(Resources.UrlNotLocal);
+            }
+
+            var destinationUrl = UrlHelperBase.Content(httpContext, Url);
+
+            var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
+            var logger = loggerFactory.CreateLogger<RedirectResult>();
+            logger.LocalRedirectResultExecuting(destinationUrl);
+
+            if (PreserveMethod)
+            {
+                httpContext.Response.StatusCode = Permanent
+                    ? StatusCodes.Status308PermanentRedirect
+                    : StatusCodes.Status307TemporaryRedirect;
+                httpContext.Response.Headers.Location = destinationUrl;
+            }
+            else
+            {
+                httpContext.Response.Redirect(destinationUrl, Permanent);
+            }
+
+            return Task.CompletedTask;
+        }
     }
 }