First code submission for MVC Pipeline

.cursorignore

@@ -0,0 +1,30 @@
+node_modules/
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+.DS_Store
+.idea/
+.vscode/
+.gitignore
+.git/
+.gitignore
+
+.vs/
+
+build/
+build.*
+.yarn/
+Artifacts/
+DotNetNuke.Internal.SourceGenerators/
+Install/
+tools/
+Website/
+.nuget/
+.github/
+Packages/
+Refs/
+tools/
+Dnn Platform/node_modules/
+# Dnn Platform/Tests

.cursorrules

@@ -0,0 +1,72 @@
+
+# .NET Development Rules
+
+You are a senior .NET full stack developer and an expert in C#, ASP.NET Framework, ASP.NET Core, and ReactJS
+
+## This project
+
+This is a CMS that runs on classic ASP.NET Framework (version 4.8). The default entry point is /default.aspx which can be found under /DNN Platform/Website.
+We are building a new pipeline based on ASP.NET MVC with the goal of moving away from webforms and towards .NET Core. Right now we will create a hybrid solution
+with two rendering mechanisms: the old webforms pipeline through default.aspx and a new pipeline through /DesktopModules/Default/Page/{tabId}/{locale}. This
+should be picked up and handled in the DotNetNuke.Web.MvcPipeline library. The skin that is being loaded should decide which pipeline is being used to render a
+page to the client.
+
+## Code Organization
+
+We want to minimize any code changes to the existing project and concentrate as much as we can any code changes in the DotNetNuke.Web.MvcPipeline project.
+If need be we can create more projects to house new code.
+
+## Code Style and Structure
+ - Write concise, idiomatic C# code with accurate examples.
+ - Follow .NET and ASP.NET Core conventions and best practices.
+ - Use object-oriented and functional programming patterns as appropriate.
+ - Prefer LINQ and lambda expressions for collection operations.
+ - Use descriptive variable and method names (e.g., 'IsUserSignedIn', 'CalculateTotal').
+ - Structure files according to .NET conventions (Controllers, Models, Services, etc.).
+
+## Naming Conventions
+ - Follow guidelines from the stylecop.json file
+
+## C# and .NET Usage
+ -
+
+## Syntax and Formatting
+ - Use 'var' for implicit typing when the type is obvious.
+
+## Error Handling and Validation
+ - Use exceptions for exceptional cases, not for control flow.
+ - Implement proper error logging using built-in .NET logging or a third-party logger.
+ - Use Data Annotations or Fluent Validation for model validation.
+ - Implement global exception handling middleware.
+ - Return appropriate HTTP status codes and consistent error responses.
+
+## API Design
+ - Follow RESTful API design principles.
+ - Use attribute routing in controllers.
+ - Implement versioning for your API.
+ - Use action filters for cross-cutting concerns.
+
+## Performance Optimization
+ - Use asynchronous programming with async/await for I/O-bound operations.
+ - Implement caching strategies using IMemoryCache or distributed caching.
+ - Use efficient LINQ queries and avoid N+1 query problems.
+ - Implement pagination for large data sets.
+
+## Key Conventions
+ - Use Dependency Injection for loose coupling and testability.
+ - Implement repository pattern.
+ - Use AutoMapper for object-to-object mapping if needed.
+ - Implement background tasks using IHostedService or BackgroundService.
+
+## Testing
+ - Write unit tests using xUnit, NUnit, or MSTest.
+ - Use Moq or NSubstitute for mocking dependencies.
+ - Implement integration tests for API endpoints.
+
+## Security
+ - Implement proper CORS policies.
+
+## API Documentation
+ - Provide XML comments for controllers and models.
+
+Follow the official Microsoft documentation and ASP.NET MVC guides for best practices in routing, controllers, models, and other API components.

Build/Tasks/packaging.json

@@ -36,6 +36,7 @@
     "/bin/System.Web.Http.dll",
     "/bin/System.Web.Http.WebHost.dll",
     "/bin/DotNetNuke.Web.Mvc.dll",
+	  "/bin/DotNetNuke.Web.MvcPipeline.dll",
     "/bin/System.Web.Mvc.dll",
     "/bin/System.Web.Helpers.dll",
     "/bin/Microsoft.Web.Helpers.dll",

DNN Platform/Components/Microsoft.AspNetMvc/Microsoft.AspNetMvc.dnn

@@ -17,6 +17,11 @@
           <assemblies>
             <assembly>
               <path>bin</path>
+              <name>DotNetNuke.Web.MvcPipeline.dll</name>
+              <version>0.0.1.0</version>
+            </assembly>
+			      <assembly>
+              <path>bin</path>
               <name>DotNetNuke.Web.Mvc.dll</name>
               <version>9.10.0</version>
             </assembly>

DNN Platform/DotNetNuke.Abstractions/Portals/IPortalSettings.cs

@@ -359,5 +359,8 @@ public interface IPortalSettings
 
         /// <summary>Gets a value indicating whether to display the dropdowns to quickly add a moduel to the page in the edit bar.</summary>
         bool ShowQuickModuleAddMenu { get; }
+
+        /// <summary>Gets the pipeline type for the portal.</summary>
+        string PagePipeline { get; }
     }
 }

DNN Platform/DotNetNuke.Abstractions/Portals/PagePipelineConstants.cs

@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+namespace DotNetNuke.Abstractions.Portals
+{
+    /// <summary>
+    /// Provides constants for the page pipelines used in the DNN platform,
+    /// such as WebForms and MVC.
+    /// </summary>
+    public static class PagePipelineConstants
+    {
+        /// <summary>WebForms.</summary>
+        public const string WebForms = "webforms";
+
+        /// <summary>MVC.</summary>
+        public const string Mvc = "mvc";
+
+        /// <summary>Auto.</summary>
+        public const string Auto = "auto";
+
+        /// <summary>QueryString key.</summary>
+        public const string QueryStringKey = "pipeline";
+
+        /// <summary>QueryString WebForms.</summary>
+        public const string QueryStringWebForms = "webforms";
+
+        /// <summary>QueryString MVC.</summary>
+        public const string QueryStringMvc = "mvc";
+    }
+}

DNN Platform/DotNetNuke.ContentSecurityPolicy/CspExtensions.cs

@@ -16,17 +16,46 @@ public static class CspExtensions
         /// <param name="csp">The content security policy to modify.</param>
         public static void AddWebformsSupport(this IContentSecurityPolicy csp)
         {
-            csp.DefaultSource.AddSelf();
-            csp.ScriptSource.AddSelf();
+            csp.AddBaseSupport(false);
             csp.ScriptSource.AddInline();
             csp.ScriptSource.AddEval();
+        }
+
+        /// <summary>
+        /// Adds script source directives to the specified <see cref="IContentSecurityPolicy"/> instance
+        /// to enable support for MVC pipeline.
+        /// </summary>
+        /// <param name="csp">The content security policy to modify.</param>
+        /// /// <param name="isAuthenticated">The isAuthenticated.</param>
+        public static void AddMVCSupport(this IContentSecurityPolicy csp, bool isAuthenticated)
+        {
+            csp.AddBaseSupport(isAuthenticated);
+            csp.ScriptSource.AddNonce(csp.Nonce);
+
+            if (isAuthenticated)
+            {
+                csp.FrameSource.AddHost("https://dnndocs.com").AddHost("https://docs.dnncommunity.org");
+            }
+        }
+
+        private static void AddBaseSupport(this IContentSecurityPolicy csp, bool isAuthenticated)
+        {
+            csp.DefaultSource.AddSelf();
+            csp.ScriptSource.AddSelf();
             csp.StyleSource.AddSelf();
             csp.ImgSource.AddSelf();
             csp.FontSource.AddSelf();
             csp.FrameSource.AddSelf();
             csp.FormAction.AddSelf();
             csp.ConnectSource.AddSelf();
+            csp.FrameAncestors.AddSelf();
+            csp.ObjectSource.AddNone();
             csp.BaseUriSource.AddSelf();
+
+            if (isAuthenticated)
+            {
+                csp.FrameSource.AddHost("https://dnndocs.com").AddHost("https://docs.dnncommunity.org");
+            }
         }
     }
 }

DNN Platform/DotNetNuke.ContentSecurityPolicy/Properties/AssemblyInfo.cs

@@ -0,0 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+using System;
+
+[assembly: CLSCompliant(true)]

DNN Platform/DotNetNuke.Web.Mvc/Framework/ActionResults/DnnRedirecttoRouteResult.cs

@@ -42,7 +42,10 @@ public override void ExecuteResult(ControllerContext context)
         {
             Requires.NotNull("context", context);
 
-            Guard.Against(context.IsChildAction, "Cannot Redirect In Child Action");
+            if (!context.RouteData.Values.ContainsKey("mvcpage"))
+            {
+                Guard.Against(context.IsChildAction, "Cannot Redirect In Child Action");
+            }
 
             string url;
             if (this.Url != null && context.Controller is IDnnController)

DNN Platform/DotNetNuke.Web.Mvc/Framework/Modules/ResultCapturingActionInvoker.cs

@@ -1,41 +1,41 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information
-
-namespace DotNetNuke.Web.Mvc.Framework.Modules
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Web.Mvc;
-
-    public class ResultCapturingActionInvoker : ControllerActionInvoker
-    {
-        public ActionResult ResultOfLastInvoke { get; set; }
-
-        /// <inheritdoc />
-        protected override ActionExecutedContext InvokeActionMethodWithFilters(ControllerContext controllerContext, IList<IActionFilter> filters, ActionDescriptor actionDescriptor, IDictionary<string, object> parameters)
-        {
-            var context = base.InvokeActionMethodWithFilters(controllerContext, filters, actionDescriptor, parameters);
-            this.ResultOfLastInvoke = context.Result;
-            return context;
-        }
-
-        /// <inheritdoc />
-        protected override ExceptionContext InvokeExceptionFilters(ControllerContext controllerContext, IList<IExceptionFilter> filters, Exception exception)
-        {
-            var context = base.InvokeExceptionFilters(controllerContext, filters, exception);
-            this.ResultOfLastInvoke = context.Result;
-            return context;
-        }
-
-        /// <inheritdoc />
-        protected override void InvokeActionResult(ControllerContext controllerContext, ActionResult actionResult)
-        {
-            // Do not invoke the action.  Instead, store it for later retrieval
-            if (this.ResultOfLastInvoke == null)
-            {
-                this.ResultOfLastInvoke = actionResult;
-            }
-        }
-    }
-}
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace DotNetNuke.Web.Mvc.Framework.Modules
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Web.Mvc;
+
+    public class ResultCapturingActionInvoker : ControllerActionInvoker
+    {
+        public ActionResult ResultOfLastInvoke { get; set; }
+
+        /// <inheritdoc />
+        protected override ActionExecutedContext InvokeActionMethodWithFilters(ControllerContext controllerContext, IList<IActionFilter> filters, ActionDescriptor actionDescriptor, IDictionary<string, object> parameters)
+        {
+            var context = base.InvokeActionMethodWithFilters(controllerContext, filters, actionDescriptor, parameters);
+            this.ResultOfLastInvoke = context.Result;
+            return context;
+        }
+
+        /// <inheritdoc />
+        protected override ExceptionContext InvokeExceptionFilters(ControllerContext controllerContext, IList<IExceptionFilter> filters, Exception exception)
+        {
+            var context = base.InvokeExceptionFilters(controllerContext, filters, exception);
+            this.ResultOfLastInvoke = context.Result;
+            return context;
+        }
+
+        /// <inheritdoc />
+        protected override void InvokeActionResult(ControllerContext controllerContext, ActionResult actionResult)
+        {
+            // Do not invoke the action.  Instead, store it for later retrieval
+            if (this.ResultOfLastInvoke == null)
+            {
+                this.ResultOfLastInvoke = actionResult;
+            }
+        }
+    }
+}

DNN Platform/DotNetNuke.Web.Mvc/Properties/AssemblyInfo.cs

@@ -22,4 +22,5 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("b1e2ff0c-06b0-4e4d-a828-a7cab3817220")]
 
-[assembly: InternalsVisibleTo("DotNetNuke.Tests.Web.Mvc")]
+[assembly: InternalsVisibleTo("DotNetNuke.Tests.Web.Mvc")]
+[assembly: InternalsVisibleTo("DotNetNuke.Web.MvcPipeline")]

DNN Platform/DotNetNuke.Web.Mvc/Routing/MvcRoutingManager.cs

@@ -92,6 +92,13 @@ public Route MapRoute(string moduleFolderName, string routeName, string url, obj
                 route = MapRouteWithNamespace(fullRouteName, routeUrl, defaults, constraints, namespaces);
                 this.routes.Add(route);
                 Logger.Trace($"Mapping route: {fullRouteName} @ {routeUrl}");
+
+                // also map with "mvcpl-" prefix for MVC Pipeline compatibility
+                fullRouteName = "mvcpl-" + fullRouteName;
+                routeUrl = routeUrl.Replace("DesktopModules/MVC/", "DesktopModules/");
+                route = MapRouteWithNamespaceAndArea(fullRouteName, moduleFolderName, routeUrl, defaults, constraints, namespaces);
+                this.routes.Add(route);
+                Logger.Trace($"Mapping route for mvcpipeline: {fullRouteName} Area={moduleFolderName}@{routeUrl}");
             }
 
             return route;
@@ -149,6 +156,29 @@ private static Route MapRouteWithNamespace(string name, string url, object defau
             return route;
         }
 
+        private static Route MapRouteWithNamespaceAndArea(string name, string area, string url, object defaults, object constraints, string[] namespaces)
+        {
+            var route = new Route(url, new DnnMvcRouteHandler())
+            {
+                Defaults = CreateRouteValueDictionaryUncached(defaults),
+                Constraints = CreateRouteValueDictionaryUncached(constraints),
+            };
+            if (route.DataTokens == null)
+            {
+                route.DataTokens = new RouteValueDictionary();
+            }
+
+            route.DataTokens.Add("area", area);
+            ConstraintValidation.Validate(route);
+            if ((namespaces != null) && (namespaces.Length > 0))
+            {
+                route.SetNameSpaces(namespaces);
+            }
+
+            route.SetName(name);
+            return route;
+        }
+
         private static RouteValueDictionary CreateRouteValueDictionaryUncached(object values)
         {
             return values is IDictionary<string, object> dictionary ? new RouteValueDictionary(dictionary) : TypeHelper.ObjectToDictionary(values);

DNN Platform/DotNetNuke.Web.Mvc/StandardTabAndModuleInfoProvider.cs

@@ -99,6 +99,11 @@ private static int FindInt(HttpRequestBase requestBase, string key)
                 value = requestBase.Headers[key];
             }
 
+            if (requestBase.Form[key] != null)
+            {
+                value = requestBase.Form[key];
+            }
+
             if (string.IsNullOrEmpty(value) && requestBase.Url != null)
             {
                 var queryString = HttpUtility.ParseQueryString(requestBase.Url.Query);