Automatically complete catch-all route parameter (#23)

Author: shibayan

README.md

@@ -184,9 +184,9 @@ public class Function1 : HttpFunctionBase
         ILogger log)
     {
 #if USE_PROXY
-        return ProxyStaticApp("https://example.com/{path}", fallbackExclude: $"^/_nuxt/.*");
+        return ProxyStaticApp("https://example.com", fallbackExclude: $"^/_nuxt/.*");
 #else
-        return LocalStaticApp($"{path}", fallbackExclude: $"^/_nuxt/.*");
+        return LocalStaticApp(fallbackPath: "404.html", fallbackExclude: $"^/_nuxt/.*");
 #endif
     }
 }

samples/ProxySample/ReverseProxy.cs

@@ -19,7 +19,7 @@ public IActionResult Run(
             [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", "put", "delete", "options", "head", "patch", Route = "{*path}")]
             HttpRequest req)
         {
-            return Proxy("https://shibayan.jp/{path}");
+            return Proxy("https://shibayan.jp");
         }
     }
 }

samples/WebsiteSample/StaticWebsite.cs

@@ -17,12 +17,11 @@ public StaticWebsite(IHttpContextAccessor httpContextAccessor)
         [FunctionName(nameof(StaticWebsite))]
         public IActionResult Run(
             [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", "put", "delete", "options", "head", "patch", Route = "{*path}")]
-            HttpRequest req,
-            string path)
+            HttpRequest req)
         {
-            //return ProxyStaticApp("https://ststaticwebsiteproxy.z11.web.core.windows.net/{path}", fallbackExclude: $"^/_nuxt/.*");
+            //return ProxyStaticApp("https://ststaticwebsiteproxy.z11.web.core.windows.net", fallbackExclude: $"^/_nuxt/.*");
 
-            return LocalStaticApp(path, fallbackPath: "200.html", fallbackExclude: $"^/_nuxt/.*");
+            return LocalStaticApp(fallbackPath: "200.html", fallbackExclude: $"^/_nuxt/.*");
         }
     }
 }

src/Azure.WebJobs.Extensions.HttpApi/HttpFunctionBase.cs

@@ -233,9 +233,9 @@ protected IActionResult ProxyStaticApp(string backendUri, string fallbackExclude
             return new ProxyStaticAppResult(backendUri) { FallbackExclude = fallbackExclude };
         }
 
-        protected IActionResult LocalStaticApp(string virtualPath, string defaultFile = "index.html", string fallbackPath = "404.html", string fallbackExclude = null)
+        protected IActionResult LocalStaticApp(string defaultFile = "index.html", string fallbackPath = "404.html", string fallbackExclude = null)
         {
-            return new LocalStaticAppResult(virtualPath) { DefaultFile = defaultFile, FallbackPath = fallbackPath, FallbackExclude = fallbackExclude };
+            return new LocalStaticAppResult { DefaultFile = defaultFile, FallbackPath = fallbackPath, FallbackExclude = fallbackExclude };
         }
 
         #endregion

src/Azure.WebJobs.Extensions.HttpApi/Proxy/LocalStaticAppResult.cs

@@ -7,13 +7,6 @@ namespace Azure.WebJobs.Extensions.HttpApi.Proxy
 {
     internal class LocalStaticAppResult : IActionResult
     {
-        public LocalStaticAppResult(string virtualPath)
-        {
-            VirtualPath = virtualPath;
-        }
-
-        public string VirtualPath { get; set; }
-
         public string DefaultFile { get; set; }
 
         public string FallbackPath { get; set; }

src/Azure.WebJobs.Extensions.HttpApi/Proxy/LocalStaticAppResultExecutor.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -22,7 +23,9 @@ internal class LocalStaticAppResultExecutor : IActionResultExecutor<LocalStaticA
 
         public async Task ExecuteAsync(ActionContext context, LocalStaticAppResult result)
         {
-            var virtualPath = result.VirtualPath ?? "/";
+            var (_, value) = context.RouteData.Values.Single();
+
+            var virtualPath = $"/{value?.ToString()}";
 
             var contents = _fileProvider.GetDirectoryContents(virtualPath);
 

src/Azure.WebJobs.Extensions.HttpApi/Proxy/ProxyResultExecutor.cs

@@ -1,4 +1,5 @@
-using System.Net;
+using System.Linq;
+using System.Net;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
@@ -30,15 +31,16 @@ private static string MakeBackendUri(string backendUri, ActionContext context)
         {
             var routeValues = context.RouteData.Values;
 
-            return _templateRegex.Replace(backendUri, match =>
+            var generatedBackendUri = _templateRegex.Replace(backendUri, m => routeValues[m.Groups[1].Value]?.ToString() ?? "");
+
+            if (generatedBackendUri == backendUri)
             {
-                if (routeValues.TryGetValue(match.Groups[1].Value, out var value) && value != null)
-                {
-                    return value.ToString();
-                }
+                var (_, value) = routeValues.Single();
+
+                generatedBackendUri += generatedBackendUri.EndsWith("/") ? value : $"/{value}";
+            }
 
-                return "";
-            });
+            return generatedBackendUri;
         }
     }
 }