Add check for PluginControllerAttribute and compare area name (#11911)

* Add check for PluginControllerAttribute and compare area name

* Added null check

Author: bergmania

src/Umbraco.Infrastructure/Runtime/RuntimeState.cs

@@ -44,9 +44,28 @@ private RuntimeState()
         {
         }
 
+        public RuntimeState(
+            IOptions<GlobalSettings> globalSettings,
+            IOptions<UnattendedSettings> unattendedSettings,
+            IUmbracoVersion umbracoVersion,
+            IUmbracoDatabaseFactory databaseFactory,
+            ILogger<RuntimeState> logger,
+            PendingPackageMigrations packageMigrationState,
+            IConflictingRouteService conflictingRouteService)
+        {
+            _globalSettings = globalSettings;
+            _unattendedSettings = unattendedSettings;
+            _umbracoVersion = umbracoVersion;
+            _databaseFactory = databaseFactory;
+            _logger = logger;
+            _packageMigrationState = packageMigrationState;
+            _conflictingRouteService = conflictingRouteService;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RuntimeState"/> class.
         /// </summary>
+        [Obsolete("use ctor with all params")]
         public RuntimeState(
             IOptions<GlobalSettings> globalSettings,
             IOptions<UnattendedSettings> unattendedSettings,
@@ -65,24 +84,6 @@ public RuntimeState(
         {
         }
 
-        public RuntimeState(
-            IOptions<GlobalSettings> globalSettings,
-            IOptions<UnattendedSettings> unattendedSettings,
-            IUmbracoVersion umbracoVersion,
-            IUmbracoDatabaseFactory databaseFactory,
-            ILogger<RuntimeState> logger,
-            PendingPackageMigrations packageMigrationState,
-            IConflictingRouteService conflictingRouteService)
-        {
-            _globalSettings = globalSettings;
-            _unattendedSettings = unattendedSettings;
-            _umbracoVersion = umbracoVersion;
-            _databaseFactory = databaseFactory;
-            _logger = logger;
-            _packageMigrationState = packageMigrationState;
-            _conflictingRouteService = conflictingRouteService;
-        }
-
         /// <inheritdoc />
         public Version Version => _umbracoVersion.Version;
 

src/Umbraco.Web.BackOffice/Services/ConflictingRouteService.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Linq;
+using System.Reflection;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Controllers;
 
 namespace Umbraco.Cms.Web.BackOffice.Services
@@ -21,10 +23,20 @@ public bool HasConflictingRoutes(out string controllerName)
             var controllers = _typeLoader.GetTypes<UmbracoApiControllerBase>().ToList();
             foreach (Type controller in controllers)
             {
-                if (controllers.Count(x => x.Name == controller.Name) > 1)
+                var potentialConflicting = controllers.Where(x => x.Name == controller.Name).ToArray();
+                if (potentialConflicting.Length > 1)
                 {
-                    controllerName = controller.Name;
-                    return true;
+                    //If we have any with same controller name and located in the same area, then it is a confict.
+                    var conflicting = potentialConflicting
+                        .Select(x => x.GetCustomAttribute<PluginControllerAttribute>())
+                        .GroupBy(x => x?.AreaName)
+                        .Any(x => x?.Count() > 1);
+
+                    if (conflicting)
+                    {
+                        controllerName = controller.Name;
+                        return true;
+                    }
                 }
             }