Set route params in aikido context

Author: teta2k

Aikido.Zen.DotNetCore/Middleware/ContextMiddleware.cs

@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using System.Globalization;
 using System.Runtime.CompilerServices;
 using Aikido.Zen.Core;
 using Aikido.Zen.Core.Helpers;
@@ -130,6 +131,7 @@ private bool TryPrepareContext(HttpContext httpContext, out ConcurrentDictionary
                     UserAgent = httpContext.Request.Headers.TryGetValue("User-Agent", out var userAgent) ? userAgent.FirstOrDefault() ?? string.Empty : string.Empty,
                     Source = Environment.Version.Major >= 5 ? "DotNetCore" : "DotNetFramework",
                     Route = GetParametrizedRoute(httpContext),
+                    RouteParams = FlattenRouteParameters(httpContext.GetRouteData()?.Values),
                     User = httpContext.Items["Aikido.Zen.CurrentUser"] as User
                 };
                 return true;
@@ -145,6 +147,29 @@ private bool TryPrepareContext(HttpContext httpContext, out ConcurrentDictionary
 
         }
 
+        private static IDictionary<string, string> FlattenRouteParameters(RouteValueDictionary routeValues)
+        {
+            var result = new Dictionary<string, string>();
+
+            foreach (var kvp in routeValues)
+            {
+                if (kvp.Value == null)
+                {
+                    continue;
+                }
+
+                var value = Convert.ToString(kvp.Value, CultureInfo.InvariantCulture);
+                if (value == null)
+                {
+                    continue;
+                }
+
+                result[kvp.Key] = value;
+            }
+
+            return result;
+        }
+
         /// <summary>
         /// Flattens query parameters into individual dictionary entries with indexing for multiple values.
         /// </summary>

Aikido.Zen.DotNetFramework/HttpModules/ContextModule.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
@@ -82,6 +83,7 @@ private async Task Context_BeginRequest(object sender, EventArgs e)
                     UserAgent = httpContext.Request.UserAgent,
                     Source = "DotNetFramework",
                     Route = GetParametrizedRoute(httpContext),
+                    RouteParams = FlattenRouteParameters(httpContext.Request?.RequestContext?.RouteData?.Values),
                 };
 
                 Agent.Instance.SetContextMiddlewareInstalled(true);
@@ -218,6 +220,34 @@ private static IDictionary<string, string> FlattenHeaders(System.Collections.Spe
             return result;
         }
 
+        private static IDictionary<string, string> FlattenRouteParameters(RouteValueDictionary routeValues)
+        {
+            var result = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+            if (routeValues == null)
+            {
+                return result;
+            }
+
+            foreach (var kvp in routeValues)
+            {
+                if (kvp.Value == null)
+                {
+                    continue;
+                }
+
+                var value = Convert.ToString(kvp.Value, CultureInfo.InvariantCulture);
+                if (value == null)
+                {
+                    continue;
+                }
+
+                result[kvp.Key] = value;
+            }
+
+            return result;
+        }
+
         /// <summary>
         /// Gets a parameterized route from the HTTP context, matching against the route collection
         /// and applying route parameter detection when needed.