respond 404 if the route is not defined

Author: jaredcnance

JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs

@@ -29,7 +29,9 @@ public async Task Invoke(HttpContext context)
         _logger.LogInformation("Passing request to JsonApiService: " + context.Request.Path);
 
         if(context.Request.ContentType == "application/vnd.api+json") {
-          _router.HandleJsonApiRoute(context, _serviceProvider);
+          var routeWasHandled = _router.HandleJsonApiRoute(context, _serviceProvider);
+          if(!routeWasHandled)
+            RespondNotFound(context);
         }
         else
         {
@@ -46,5 +48,11 @@ private void RespondUnsupportedMediaType(HttpContext context)
         context.Response.StatusCode = 415;
         context.Response.Body.Flush();
       }
+
+      private void RespondNotFound(HttpContext context)
+      {
+        context.Response.StatusCode = 404;
+        context.Response.Body.Flush();
+      }
   }
 }

JsonApiDotNetCore/Routing/RouteBuilder.cs

@@ -20,7 +20,10 @@ public RouteBuilder(JsonApiModelConfiguration configuration)
 
     public Route BuildFromRequest(HttpRequest request)
     {
-      var remainingPathString = SetBaseRouteDefinition(request.Path);
+      PathString remainingPathString;
+      _baseRouteDefinition = SetBaseRouteDefinition(request.Path, out remainingPathString);
+
+      if(_baseRouteDefinition == null) return null;
 
       var querySet = new QuerySet(request.Query);
 
@@ -52,18 +55,18 @@ private bool PathStringIsEmpty(PathString pathString)
       return pathString.HasValue ? string.IsNullOrEmpty(pathString.ToString().TrimStart('/')) : true;
     }
 
-    private PathString SetBaseRouteDefinition(PathString path)
+    private RouteDefinition SetBaseRouteDefinition(PathString path, out PathString remainingPath)
     {
+      PathString remainingPathTemp;
       foreach (var rte in _configuration.Routes)
       {
-        PathString remainingPathString;
-        if (path.StartsWithSegments(new PathString(rte.PathString), StringComparison.OrdinalIgnoreCase, out remainingPathString))
+        if (path.StartsWithSegments(new PathString(rte.PathString), StringComparison.OrdinalIgnoreCase, out remainingPathTemp))
         {
-          _baseRouteDefinition = rte;
-          return remainingPathString;
+          remainingPath = remainingPathTemp;
+          return rte;
         }
       }
-      throw new Exception("Route is not defined.");
+      return null;
     }
 
     private PathString SetBaseResourceId(PathString remainPathString)