Fixed: only run custom path cutting logic when RouteAttribute is used

Author: Bart Koelman

src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs

@@ -12,6 +12,7 @@
 using JsonApiDotNetCore.Managers.Contracts;
 using JsonApiDotNetCore.Models.JsonApiDocuments;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
@@ -181,7 +182,7 @@ private static string GetBasePath(string resourceName, IJsonApiOptions options,
                 builder.Append(httpRequest.Host);
             }
 
-            string customRoute = GetCustomRoute(httpRequest.Path.Value, resourceName, options.Namespace);
+            string customRoute = GetCustomRoute(resourceName, options.Namespace, httpRequest.HttpContext);
             if (!string.IsNullOrEmpty(customRoute))
             {
                 builder.Append('/');
@@ -196,13 +197,20 @@ private static string GetBasePath(string resourceName, IJsonApiOptions options,
             return builder.ToString();
         }
 
-        private static string GetCustomRoute(string path, string resourceName, string apiNamespace)
+        private static string GetCustomRoute(string resourceName, string apiNamespace, HttpContext httpContext)
         {
-            var trimmedComponents = path.Trim('/').Split('/').ToList();
-            var resourceNameIndex = trimmedComponents.FindIndex(c => c == resourceName);
-            var newComponents = trimmedComponents.Take(resourceNameIndex).ToArray();
-            var customRoute = string.Join('/', newComponents);
-            return customRoute == apiNamespace ? null : customRoute;
+            var endpoint = httpContext.GetEndpoint();
+            var routeAttribute = endpoint.Metadata.GetMetadata<RouteAttribute>();
+            if (routeAttribute != null)
+            {
+                var trimmedComponents = httpContext.Request.Path.Value.Trim('/').Split('/').ToList();
+                var resourceNameIndex = trimmedComponents.FindIndex(c => c == resourceName);
+                var newComponents = trimmedComponents.Take(resourceNameIndex).ToArray();
+                var customRoute = string.Join('/', newComponents);
+                return customRoute == apiNamespace ? null : customRoute;
+            }
+
+            return null;
         }
 
         private static bool GetIsRelationshipPath(RouteValueDictionary routeValues)

test/UnitTests/Middleware/JsonApiMiddlewareTests.cs

@@ -144,6 +144,7 @@ private static DefaultHttpContext CreateHttpContext(string path, bool isRelation
                 feature.RouteValues["id"] = id;
             }
             context.Features.Set<IRouteValuesFeature>(feature);
+            context.SetEndpoint(new Endpoint(null, new EndpointMetadataCollection(), null));
             return context;
         }