Adding new property for httptrigger invoke url

Author: alrod

src/WebJobs.Script.WebHost/Controllers/FunctionsController.cs

@@ -31,7 +31,7 @@ namespace Microsoft.Azure.WebJobs.Script.WebHost.Controllers
     public class FunctionsController : Controller
     {
         private readonly IWebFunctionsManager _functionsManager;
-        private readonly ScriptHostManager _scriptHostManager;
+        private readonly WebScriptHostManager _scriptHostManager;
         private readonly ILogger _logger;
         private static readonly Regex FunctionNameValidationRegex = new Regex(@"^[a-z][a-z0-9_\-]{0,127}$(?<!^host$)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
@@ -47,15 +47,15 @@ public FunctionsController(IWebFunctionsManager functionsManager, WebScriptHostM
         [Authorize(Policy = PolicyNames.AdminAuthLevel)]
         public async Task<IActionResult> List()
         {
-            return Ok(await _functionsManager.GetFunctionsMetadata(Request));
+            return Ok(await _functionsManager.GetFunctionsMetadata(Request, _scriptHostManager.Router));
         }
 
         [HttpGet]
         [Route("admin/functions/{name}")]
         [Authorize(Policy = PolicyNames.AdminAuthLevel)]
         public async Task<IActionResult> Get(string name)
         {
-            (var success, var function) = await _functionsManager.TryGetFunction(name, Request);
+            (var success, var function) = await _functionsManager.TryGetFunction(name, Request, _scriptHostManager.Router);
 
             return success
                 ? Ok(function)

src/WebJobs.Script.WebHost/Extensions/FunctionMetadataExtensions.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.Management.Models;
 using Microsoft.Azure.WebJobs.Script.WebHost.Management;
@@ -21,7 +22,7 @@ public static class FunctionMetadataExtensions
         /// <param name="request">Current HttpRequest</param>
         /// <param name="config">ScriptHostConfig</param>
         /// <returns>Promise of a FunctionMetadataResponse</returns>
-        public static async Task<FunctionMetadataResponse> ToFunctionMetadataResponse(this FunctionMetadata functionMetadata, HttpRequest request, ScriptHostConfiguration config)
+        public static async Task<FunctionMetadataResponse> ToFunctionMetadataResponse(this FunctionMetadata functionMetadata, HttpRequest request, ScriptHostConfiguration config, IRouter router = null)
         {
             var functionPath = Path.Combine(config.RootScriptPath, functionMetadata.Name);
             var functionMetadataFilePath = Path.Combine(functionPath, ScriptConstants.FunctionMetadataFileName);
@@ -45,7 +46,8 @@ public static async Task<FunctionMetadataResponse> ToFunctionMetadataResponse(th
                 // Properties below this comment are not present in the kudu version.
                 IsDirect = functionMetadata.IsDirect,
                 IsDisabled = functionMetadata.IsDisabled,
-                IsProxy = functionMetadata.IsProxy
+                IsProxy = functionMetadata.IsProxy,
+                HttpTriggerInvokeUrl = GetFunctionInvokeUrl(functionMetadata.Name, baseUrl, request, router)
             };
             return response;
         }
@@ -124,5 +126,18 @@ private static async Task<string> GetTestData(string testDataPath, ScriptHostCon
 
         private static Uri GetFunctionHref(string functionName, string baseUrl) =>
             new Uri($"{baseUrl}/admin/functions/{functionName}");
+
+        private static Uri GetFunctionInvokeUrl(string functionName, string baseUrl, HttpRequest request, IRouter router)
+        {
+            if (router == null)
+            {
+                return null;
+            }
+
+            VirtualPathData path = router.GetVirtualPath(
+                new VirtualPathContext(request.HttpContext, new RouteValueDictionary(), new RouteValueDictionary(), functionName));
+
+            return (path != null) ? new Uri(new Uri(baseUrl), path.VirtualPath) : null;
+        }
     }
 }

src/WebJobs.Script.WebHost/Management/IWebFunctionsManager.cs

@@ -4,15 +4,16 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.Azure.WebJobs.Script.Management.Models;
 
 namespace Microsoft.Azure.WebJobs.Script.WebHost.Management
 {
     public interface IWebFunctionsManager
     {
-        Task<IEnumerable<FunctionMetadataResponse>> GetFunctionsMetadata(HttpRequest request);
+        Task<IEnumerable<FunctionMetadataResponse>> GetFunctionsMetadata(HttpRequest request, IRouter router = null);
 
-        Task<(bool, FunctionMetadataResponse)> TryGetFunction(string name, HttpRequest request);
+        Task<(bool, FunctionMetadataResponse)> TryGetFunction(string name, HttpRequest request, IRouter router = null);
 
         Task<(bool, bool, FunctionMetadataResponse)> CreateOrUpdate(string name, FunctionMetadataResponse functionMetadata, HttpRequest request);
 

src/WebJobs.Script.WebHost/Management/WebFunctionsManager.cs

@@ -10,6 +10,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.Management.Models;
 using Microsoft.Azure.WebJobs.Script.WebHost.Extensions;
@@ -45,9 +46,9 @@ public WebFunctionsManager(WebHostSettings webSettings, ILoggerFactory loggerFac
         /// </summary>
         /// <param name="request">Current HttpRequest for figuring out baseUrl</param>
         /// <returns>collection of FunctionMetadataResponse</returns>
-        public async Task<IEnumerable<FunctionMetadataResponse>> GetFunctionsMetadata(HttpRequest request)
+        public async Task<IEnumerable<FunctionMetadataResponse>> GetFunctionsMetadata(HttpRequest request, IRouter router = null)
         {
-            return await GetFunctionsMetadata().Select(fm => fm.ToFunctionMetadataResponse(request, _config)).WhenAll();
+            return await GetFunctionsMetadata().Select(fm => fm.ToFunctionMetadataResponse(request, _config, router)).WhenAll();
         }
 
         /// <summary>
@@ -129,12 +130,12 @@ await functionMetadata
         /// <param name="name">Function name to retrieve</param>
         /// <param name="request">Current HttpRequest</param>
         /// <returns>(success, FunctionMetadataResponse)</returns>
-        public async Task<(bool, FunctionMetadataResponse)> TryGetFunction(string name, HttpRequest request)
+        public async Task<(bool, FunctionMetadataResponse)> TryGetFunction(string name, HttpRequest request, IRouter router = null)
         {
             var functionMetadata = ScriptHost.ReadFunctionMetadata(Path.Combine(_config.RootScriptPath, name), new Dictionary<string, Collection<string>>(), fileSystem: FileUtility.Instance);
             if (functionMetadata != null)
             {
-                return (true, await functionMetadata.ToFunctionMetadataResponse(request, _config));
+                return (true, await functionMetadata.ToFunctionMetadataResponse(request, _config, router));
             }
             else
             {

src/WebJobs.Script.WebHost/Models/FunctionMetadataResponse.cs

@@ -46,6 +46,12 @@ public class FunctionMetadataResponse
         [JsonProperty(PropertyName = "href")]
         public Uri Href { get; set; }
 
+        /// <summary>
+        /// Gets or sets httptrigger invoke url
+        /// </summary>
+        [JsonProperty(PropertyName = "httptrigger_invoke_url")]
+        public Uri HttpTriggerInvokeUrl { get; set; }
+
         /// <summary>
         /// Gets or sets function config json
         /// </summary>

src/WebJobs.Script.WebHost/WebScriptHostManager.cs

@@ -110,6 +110,8 @@ public WebScriptHostManager(ScriptHostConfiguration config,
 
         public ISecretManager SecretManager => _secretManager;
 
+        public IWebJobsRouter Router => _router;
+
         /// <summary>
         /// Gets or sets a value indicating whether http requests should be
         /// temporarily delayed due to host state.