Update Middleware.cs

Author: elanatframework

class/Middleware.cs

@@ -43,6 +43,28 @@ public async Task Invoke(HttpContext context)
     }
 }
 
+public class UseCodeBehindNextNotFoundMiddleware
+{
+    private readonly RequestDelegate _next;
+
+    public UseCodeBehindNextNotFoundMiddleware(RequestDelegate next)
+    {
+        _next = next;
+    }
+
+    public async Task Invoke(HttpContext context)
+    {
+        CodeBehind.CodeBehindExecute execute = new CodeBehind.CodeBehindExecute();
+
+        string PageResult = execute.Run(context);
+
+        if (execute.FoundPage)
+            await context.Response.WriteAsync(PageResult);
+        else
+            await _next(context);
+    }
+}
+
 public class UseCodeBehindRouteMiddleware
 {
     private readonly RequestDelegate _next;
@@ -74,17 +96,39 @@ public async Task Invoke(HttpContext context)
     {
         CodeBehind.CodeBehindExecute execute = new CodeBehind.CodeBehindExecute();
 
-        string PageResult = execute.Run(context);
+        string PageResult = execute.RunRoute(context, 0);
 
-        if (execute.FoundPage)
-            await context.Response.WriteAsync(execute.RunRoute(context, 0));
+        if (execute.FoundController)
+            await context.Response.WriteAsync(PageResult);
         else
             await context.Response.WriteAsync(execute.RunErrorPage(404, context));
 
         await _next(context);
     }
 }
 
+public class UseCodeBehindRouteNextNotFoundMiddleware
+{
+    private readonly RequestDelegate _next;
+
+    public UseCodeBehindRouteNextNotFoundMiddleware(RequestDelegate next)
+    {
+        _next = next;
+    }
+
+    public async Task Invoke(HttpContext context)
+    {
+        CodeBehind.CodeBehindExecute execute = new CodeBehind.CodeBehindExecute();
+
+        string PageResult = execute.RunRoute(context, 0);
+
+        if (execute.FoundController)
+            await context.Response.WriteAsync(PageResult);
+        else
+            await _next(context);
+    }
+}
+
 public class UseRoleAccessMiddleware
 {
     private readonly RequestDelegate _next;
@@ -145,6 +189,11 @@ public static IApplicationBuilder UseCodeBehind(this IApplicationBuilder builder
             return builder.UseMiddleware<UseCodeBehindMiddleware>();
     }
 
+    public static IApplicationBuilder UseCodeBehindNextNotFound(this IApplicationBuilder builder)
+    {
+        return builder.UseMiddleware<UseCodeBehindNextNotFoundMiddleware>();
+    }
+
     public static IApplicationBuilder UseCodeBehindRoute(this IApplicationBuilder builder)
     {
         return builder.UseMiddleware<UseCodeBehindRouteMiddleware>();
@@ -158,6 +207,11 @@ public static IApplicationBuilder UseCodeBehindRoute(this IApplicationBuilder bu
             return builder.UseMiddleware<UseCodeBehindRouteMiddleware>();
     }
 
+    public static IApplicationBuilder UseCodeBehindRouteNextNotFound(this IApplicationBuilder builder)
+    {
+        return builder.UseMiddleware<UseCodeBehindRouteNextNotFoundMiddleware>();
+    }
+
     /// <summary>
     /// Session Must Be Activated
     /// </summary>