From 766be6c929e261204a91b1bd27d123f4c720c782 Mon Sep 17 00:00:00 2001 From: Tony Valenti Date: Fri, 16 Oct 2020 10:37:17 -0500 Subject: [PATCH] Factor out default controller route. --- Oqtane.Server/Controllers/AliasController.cs | 2 +- Oqtane.Server/Controllers/FileController.cs | 2 +- Oqtane.Server/Controllers/FolderController.cs | 2 +- Oqtane.Server/Controllers/InstallationController.cs | 2 +- Oqtane.Server/Controllers/JobController.cs | 2 +- Oqtane.Server/Controllers/JobLogController.cs | 2 +- Oqtane.Server/Controllers/LogController.cs | 2 +- Oqtane.Server/Controllers/ModuleController.cs | 2 +- Oqtane.Server/Controllers/ModuleDefinitionController.cs | 2 +- Oqtane.Server/Controllers/NotificationController.cs | 2 +- Oqtane.Server/Controllers/PackageController.cs | 2 +- Oqtane.Server/Controllers/PageController.cs | 2 +- Oqtane.Server/Controllers/PageModuleController.cs | 2 +- Oqtane.Server/Controllers/ProfileController.cs | 2 +- Oqtane.Server/Controllers/RoleController.cs | 2 +- Oqtane.Server/Controllers/SettingController.cs | 2 +- Oqtane.Server/Controllers/SiteController.cs | 2 +- Oqtane.Server/Controllers/SiteTemplateController.cs | 2 +- Oqtane.Server/Controllers/SqlController.cs | 2 +- Oqtane.Server/Controllers/SystemController.cs | 2 +- Oqtane.Server/Controllers/TenantController.cs | 2 +- Oqtane.Server/Controllers/ThemeController.cs | 2 +- Oqtane.Server/Controllers/UserController.cs | 2 +- Oqtane.Server/Controllers/UserRoleController.cs | 2 +- .../Modules/HtmlText/Controllers/HtmlTextController.cs | 2 +- .../[Owner].[Module]/Controllers/[Module]Controller.cs | 2 +- Oqtane.Shared/Shared/ControllerRoutes.cs | 9 +++++++++ 27 files changed, 35 insertions(+), 26 deletions(-) create mode 100644 Oqtane.Shared/Shared/ControllerRoutes.cs diff --git a/Oqtane.Server/Controllers/AliasController.cs b/Oqtane.Server/Controllers/AliasController.cs index 7b202b46..188160a0 100644 --- a/Oqtane.Server/Controllers/AliasController.cs +++ b/Oqtane.Server/Controllers/AliasController.cs @@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Http; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class AliasController : Controller { private readonly IAliasRepository _aliases; diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index 73fad56e..fb43a7cb 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -22,7 +22,7 @@ using Microsoft.AspNetCore.Routing.Constraints; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class FileController : Controller { private readonly IWebHostEnvironment _environment; diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index b4ad16c4..aad20a77 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Hosting; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class FolderController : Controller { private readonly IWebHostEnvironment _environment; diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs index 91a9fd4e..6ca0dff7 100644 --- a/Oqtane.Server/Controllers/InstallationController.cs +++ b/Oqtane.Server/Controllers/InstallationController.cs @@ -14,7 +14,7 @@ using Oqtane.Themes; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class InstallationController : Controller { private readonly IConfigurationRoot _config; diff --git a/Oqtane.Server/Controllers/JobController.cs b/Oqtane.Server/Controllers/JobController.cs index d578c357..03cf4e3b 100644 --- a/Oqtane.Server/Controllers/JobController.cs +++ b/Oqtane.Server/Controllers/JobController.cs @@ -12,7 +12,7 @@ using Oqtane.Repository; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class JobController : Controller { private readonly IJobRepository _jobs; diff --git a/Oqtane.Server/Controllers/JobLogController.cs b/Oqtane.Server/Controllers/JobLogController.cs index 35637cb4..055e90a0 100644 --- a/Oqtane.Server/Controllers/JobLogController.cs +++ b/Oqtane.Server/Controllers/JobLogController.cs @@ -9,7 +9,7 @@ using Oqtane.Repository; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class JobLogController : Controller { private readonly IJobLogRepository _jobLogs; diff --git a/Oqtane.Server/Controllers/LogController.cs b/Oqtane.Server/Controllers/LogController.cs index 0afb9ad2..4de0abcb 100644 --- a/Oqtane.Server/Controllers/LogController.cs +++ b/Oqtane.Server/Controllers/LogController.cs @@ -9,7 +9,7 @@ using Oqtane.Shared; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class LogController : Controller { private readonly ILogManager _logger; diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs index 907b4892..6abcbe1f 100644 --- a/Oqtane.Server/Controllers/ModuleController.cs +++ b/Oqtane.Server/Controllers/ModuleController.cs @@ -11,7 +11,7 @@ using Oqtane.Security; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class ModuleController : Controller { private readonly IModuleRepository _modules; diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index 59265773..7e78fe87 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -19,7 +19,7 @@ using System.Text.Json; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class ModuleDefinitionController : Controller { private readonly IModuleDefinitionRepository _moduleDefinitions; diff --git a/Oqtane.Server/Controllers/NotificationController.cs b/Oqtane.Server/Controllers/NotificationController.cs index ec020e79..5c73eb78 100644 --- a/Oqtane.Server/Controllers/NotificationController.cs +++ b/Oqtane.Server/Controllers/NotificationController.cs @@ -10,7 +10,7 @@ using Oqtane.Security; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class NotificationController : Controller { private readonly INotificationRepository _notifications; diff --git a/Oqtane.Server/Controllers/PackageController.cs b/Oqtane.Server/Controllers/PackageController.cs index 95b22c33..10aa0696 100644 --- a/Oqtane.Server/Controllers/PackageController.cs +++ b/Oqtane.Server/Controllers/PackageController.cs @@ -15,7 +15,7 @@ using Oqtane.Shared; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class PackageController : Controller { private readonly IWebHostEnvironment _environment; diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index 5a6cff8b..aab9c23d 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -13,7 +13,7 @@ using Oqtane.Repository; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class PageController : Controller { private readonly IPageRepository _pages; diff --git a/Oqtane.Server/Controllers/PageModuleController.cs b/Oqtane.Server/Controllers/PageModuleController.cs index 093816d8..0b238ecf 100644 --- a/Oqtane.Server/Controllers/PageModuleController.cs +++ b/Oqtane.Server/Controllers/PageModuleController.cs @@ -11,7 +11,7 @@ using Oqtane.Security; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class PageModuleController : Controller { private readonly IPageModuleRepository _pageModules; diff --git a/Oqtane.Server/Controllers/ProfileController.cs b/Oqtane.Server/Controllers/ProfileController.cs index 91c0bd05..19411487 100644 --- a/Oqtane.Server/Controllers/ProfileController.cs +++ b/Oqtane.Server/Controllers/ProfileController.cs @@ -9,7 +9,7 @@ using Oqtane.Repository; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class ProfileController : Controller { private readonly IProfileRepository _profiles; diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs index a0ce556e..708e20c3 100644 --- a/Oqtane.Server/Controllers/RoleController.cs +++ b/Oqtane.Server/Controllers/RoleController.cs @@ -9,7 +9,7 @@ using Oqtane.Repository; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class RoleController : Controller { private readonly IRoleRepository _roles; diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs index 2ffaea12..8e6563c2 100644 --- a/Oqtane.Server/Controllers/SettingController.cs +++ b/Oqtane.Server/Controllers/SettingController.cs @@ -10,7 +10,7 @@ using Oqtane.Repository; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class SettingController : Controller { private readonly ISettingRepository _settings; diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs index d4a50e27..43a10dd1 100644 --- a/Oqtane.Server/Controllers/SiteController.cs +++ b/Oqtane.Server/Controllers/SiteController.cs @@ -10,7 +10,7 @@ using Oqtane.Repository; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class SiteController : Controller { private readonly ISiteRepository _sites; diff --git a/Oqtane.Server/Controllers/SiteTemplateController.cs b/Oqtane.Server/Controllers/SiteTemplateController.cs index ca98eadd..abb9e19b 100644 --- a/Oqtane.Server/Controllers/SiteTemplateController.cs +++ b/Oqtane.Server/Controllers/SiteTemplateController.cs @@ -7,7 +7,7 @@ using Oqtane.Shared; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class SiteTemplateController : Controller { private readonly ISiteTemplateRepository _siteTemplates; diff --git a/Oqtane.Server/Controllers/SqlController.cs b/Oqtane.Server/Controllers/SqlController.cs index 189002e8..7e7bedcc 100644 --- a/Oqtane.Server/Controllers/SqlController.cs +++ b/Oqtane.Server/Controllers/SqlController.cs @@ -14,7 +14,7 @@ using System; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class SqlController : Controller { private readonly ITenantRepository _tenants; diff --git a/Oqtane.Server/Controllers/SystemController.cs b/Oqtane.Server/Controllers/SystemController.cs index f45927a1..61c5593b 100644 --- a/Oqtane.Server/Controllers/SystemController.cs +++ b/Oqtane.Server/Controllers/SystemController.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Hosting; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class SystemController : Controller { private readonly IWebHostEnvironment _environment; diff --git a/Oqtane.Server/Controllers/TenantController.cs b/Oqtane.Server/Controllers/TenantController.cs index cf251468..6670d4dd 100644 --- a/Oqtane.Server/Controllers/TenantController.cs +++ b/Oqtane.Server/Controllers/TenantController.cs @@ -9,7 +9,7 @@ using Oqtane.Repository; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class TenantController : Controller { private readonly ITenantRepository _tenants; diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs index f99fb446..0aa6916c 100644 --- a/Oqtane.Server/Controllers/ThemeController.cs +++ b/Oqtane.Server/Controllers/ThemeController.cs @@ -16,7 +16,7 @@ using System.Text.Json; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class ThemeController : Controller { private readonly IThemeRepository _themes; diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index 1a42ccd8..5a97087a 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -18,7 +18,7 @@ using Oqtane.Extensions; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class UserController : Controller { private readonly IUserRepository _users; diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index 6eeb3de1..11c875de 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -9,7 +9,7 @@ using Oqtane.Repository; namespace Oqtane.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class UserRoleController : Controller { private readonly IUserRoleRepository _userRoles; diff --git a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs index 6db9e5de..74bf8564 100644 --- a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs +++ b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs @@ -12,7 +12,7 @@ using Oqtane.Controllers; namespace Oqtane.Modules.HtmlText.Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class HtmlTextController : ModuleControllerBase { private readonly IHtmlTextRepository _htmlText; diff --git a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Controllers/[Module]Controller.cs b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Controllers/[Module]Controller.cs index 5dcadfea..3e2fe7b8 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Controllers/[Module]Controller.cs +++ b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Controllers/[Module]Controller.cs @@ -10,7 +10,7 @@ using [Owner].[Module].Repository; namespace [Owner].[Module].Controllers { - [Route("{alias}/api/[controller]")] + [Route(ControllerRoutes.Default)] public class [Module]Controller : Controller { private readonly I[Module]Repository _[Module]Repository; diff --git a/Oqtane.Shared/Shared/ControllerRoutes.cs b/Oqtane.Shared/Shared/ControllerRoutes.cs new file mode 100644 index 00000000..07e170f3 --- /dev/null +++ b/Oqtane.Shared/Shared/ControllerRoutes.cs @@ -0,0 +1,9 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Oqtane.Shared { + public class ControllerRoutes { + public const string Default = "{alias}/api/[controller]"; + } +}