clean up

src/applications/mixcore.gateway/Program.cs

@@ -25,16 +25,6 @@
 app.UseOutputCache();
 app.MapDefaultEndpoints();
 app.Run();
-static void ConfigureServices(WebApplicationBuilder builder)
-{
-    builder.Services.AddOutputCache();
-    builder.Services.AddControllers();
-    builder.Services.AddOcelot(builder.Configuration);
-    // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-    builder.Services.AddEndpointsApiExplorer();
-    builder.Services.AddSwaggerGen();
-
-}
 
 // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
 static void Configure(WebApplication app, IWebHostEnvironment env)

src/applications/mixcore/Controllers/HomeController.cs

@@ -11,28 +11,21 @@
 
 namespace Mixcore.Controllers
 {
-    public class HomeController : MvcBaseController
+    public class HomeController(
+        IHttpContextAccessor httpContextAccessor,
+        IPSecurityConfigService ipSecurityConfigService,
+        IMixCmsService mixCmsService,
+        TranslatorService translator,
+        DatabaseService databaseService,
+        UnitOfWorkInfo<MixCmsContext> uow,
+        MixRepoDbRepository repoDbRepository,
+        IMixMetadataService metadataService,
+        MixCacheService cacheService,
+        IMixTenantService tenantService,
+         IConfiguration configuration) : MvcBaseController(httpContextAccessor, ipSecurityConfigService, mixCmsService, translator, databaseService, uow, cacheService, tenantService, configuration)
     {
-        private readonly IMixMetadataService _metadataService;
-        private readonly MixRepoDbRepository _repoDbRepository;
-
-        public HomeController(
-            IHttpContextAccessor httpContextAccessor,
-            IPSecurityConfigService ipSecurityConfigService,
-            IMixCmsService mixCmsService,
-            TranslatorService translator,
-            DatabaseService databaseService,
-            UnitOfWorkInfo<MixCmsContext> uow,
-            MixRepoDbRepository repoDbRepository,
-            IMixMetadataService metadataService,
-            MixCacheService cacheService,
-            IMixTenantService tenantService,
-             IConfiguration configuration)
-            : base(httpContextAccessor, ipSecurityConfigService, mixCmsService, translator, databaseService, uow, cacheService, tenantService, configuration)
-        {
-            _repoDbRepository = repoDbRepository;
-            _metadataService = metadataService;
-        }
+        private readonly IMixMetadataService _metadataService = metadataService;
+        private readonly MixRepoDbRepository _repoDbRepository = repoDbRepository;
 
         protected override void ValidateRequest()
         {
@@ -54,10 +47,10 @@ protected override void ValidateRequest()
             }
         }
 
-        [Route("{seoName?}")]
+        [Route("")]
         public async Task<IActionResult> Index()
         {
-            string? seoName = Request.RouteValues["seoName"]?.ToString();
+            string seoName = Request.RouteValues["seoName"]?.ToString();
             if (!IsValid)
             {
                 return Redirect(RedirectUrl);
@@ -71,7 +64,7 @@ public async Task<IActionResult> Index()
         }
 
 
-        private async Task<PageContentViewModel?> LoadPage(string? seoName = null)
+        private async Task<PageContentViewModel> LoadPage(string seoName = null)
         {
             var pageRepo = PageContentViewModel.GetRepository(Uow, CacheService);
             Expression<Func<MixPageContent, bool>> predicate = p => p.MixTenantId == CurrentTenant.Id
@@ -101,7 +94,7 @@ public async Task<IActionResult> Index()
             }
             return page;
         }
-        private async Task<IActionResult> LoadAlias(string? seoName)
+        private async Task<IActionResult> LoadAlias(string seoName = null)
         {
             var alias = await MixUrlAliasViewModel.GetRepository(Uow, CacheService).GetSingleAsync(m => m.MixTenantId == CurrentTenant.Id && m.Alias == seoName);
             if (alias != null)

src/applications/mixcore/Controllers/PageController.cs

@@ -66,7 +66,7 @@ public async Task<IActionResult> Index(int id, string keyword)
         #endregion Routes
 
         #region Helper
-        protected async Task<IActionResult> Page(int pageId, string? keyword = null)
+        protected async Task<IActionResult> Page(int pageId, string keyword = null)
         {
             // Home Page
             var pageRepo = PageContentViewModel.GetRepository(Uow, _cacheService);
@@ -78,7 +78,6 @@ protected async Task<IActionResult> Page(int pageId, string? keyword = null)
             {
                 SortBy = MixQueryColumnName.Priority
             }, _cacheService);
-            page.Posts.Items.Take(2);
 
 
             ViewData["Title"] = page.SeoTitle;

src/applications/mixcore/Controllers/PostController.cs

@@ -80,7 +80,7 @@ public async Task<IActionResult> Index(int id, string seoName)
         #endregion Routes
 
         #region Helper
-        protected async Task<IActionResult> Post(int postId, string? seoName = null)
+        protected async Task<IActionResult> Post(int postId, string seoName = null)
         {
             // Home Post
             var postRepo = PostContentViewModel.GetRepository(Uow, _cacheService);

src/applications/mixcore/Controllers/SecurityController.cs

@@ -12,38 +12,33 @@
 
 namespace Mixcore.Controllers
 {
-    public class SecurityController : MixControllerBase
+    public class SecurityController(
+        IHttpContextAccessor httpContextAccessor,
+        IMixCmsService mixCmsService,
+        IPSecurityConfigService ipSecurityConfigService,
+        SignInManager<MixUser> signInManager,
+        ILogger<ExternalLoginModel> logger,
+        MixIdentityService idService,
+        TenantUserManager userManager,
+        MixEndpointService mixEndpointService,
+        IMixTenantService tenantService,
+         IConfiguration configuration) : MixControllerBase(httpContextAccessor, mixCmsService, ipSecurityConfigService, tenantService, configuration)
     {
-        private readonly SignInManager<MixUser> _signInManager;
-        private readonly TenantUserManager _userManager;
-        private readonly ILogger<ExternalLoginModel> _logger;
-        private readonly MixIdentityService _idService;
-        private readonly MixEndpointService _mixEndpointService;
-
-        public SecurityController(
-            IHttpContextAccessor httpContextAccessor,
-            IMixCmsService mixCmsService,
-            IPSecurityConfigService ipSecurityConfigService,
-            SignInManager<MixUser> signInManager,
-            ILogger<ExternalLoginModel> logger,
-            MixIdentityService idService,
-            TenantUserManager userManager,
-            MixEndpointService mixEndpointService,
-            IMixTenantService tenantService,
-             IConfiguration configuration)
-            : base(httpContextAccessor, mixCmsService, ipSecurityConfigService, tenantService, configuration)
-        {
-            _signInManager = signInManager;
-            _logger = logger;
-            _idService = idService;
-            _userManager = userManager;
-            _mixEndpointService = mixEndpointService;
-        }
+        private readonly SignInManager<MixUser> _signInManager = signInManager;
+        private readonly TenantUserManager _userManager = userManager;
+        private readonly ILogger<ExternalLoginModel> _logger = logger;
+        private readonly MixIdentityService _idService = idService;
+        private readonly MixEndpointService _mixEndpointService = mixEndpointService;
 
         [HttpGet]
         [Route("security/{page}")]
         public IActionResult Index(string page)
         {
+            if (page is null)
+            {
+                throw new MixException(MixErrorStatus.Badrequest, nameof(page));
+            }
+
             if (IsValid)
             {
                 return View();
@@ -72,9 +67,9 @@ public ActionResult<JObject> ExternalLogin([FromForm] string returnUrl, [FromFor
         [Route("security/external-login-result")]
         [HttpGet]
         [AllowAnonymous]
-        public async Task<ActionResult<JObject>> ExternalLoginResultAsync(string? returnUrl = null, string? remoteError = null)
+        public async Task<ActionResult<JObject>> ExternalLoginResultAsync(string returnUrl = null, string remoteError = null)
         {
-            returnUrl = returnUrl ?? Url.Content("~/");
+            returnUrl ??= Url.Content("~/");
             if (remoteError != null)
             {
                 return RedirectToPage("./Login", new { ReturnUrl = returnUrl });
@@ -89,7 +84,7 @@ public async Task<ActionResult<JObject>> ExternalLoginResultAsync(string? return
             var siginResult = await _signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKey, isPersistent: false, bypassTwoFactor: true);
             if (siginResult.Succeeded)
             {
-                string? email = info.Principal.FindFirstValue(ClaimTypes.Email);
+                string email = info.Principal.FindFirstValue(ClaimTypes.Email);
                 if (string.IsNullOrEmpty(email))
                 {
                     throw new MixException(MixErrorStatus.Badrequest, "Email not exist");
@@ -109,7 +104,7 @@ public async Task<ActionResult<JObject>> ExternalLoginResultAsync(string? return
             else
             {
                 // If the user does not have an account, then ask the user to create an account.
-                string? email = info.Principal.FindFirstValue(ClaimTypes.Email);
+                string email = info.Principal.FindFirstValue(ClaimTypes.Email);
                 if (string.IsNullOrEmpty(email))
                 {
                     throw new MixException(MixErrorStatus.Badrequest, "Email not exist");

src/applications/mixcore/Domain/Bases/MvcBaseController.cs

@@ -6,29 +6,21 @@
 namespace Mixcore.Domain.Bases
 {
     [ResponseCache(CacheProfileName = "Default")]
-    public class MvcBaseController : MixControllerBase
+    public class MvcBaseController(
+        IHttpContextAccessor httpContextAccessor,
+        IPSecurityConfigService ipSecurityConfigService,
+        IMixCmsService mixCmsService,
+        TranslatorService translator,
+        DatabaseService databaseService,
+        UnitOfWorkInfo<MixCmsContext> uow,
+        MixCacheService cacheService,
+        IMixTenantService tenantService,
+         IConfiguration configuration) : MixControllerBase(httpContextAccessor, mixCmsService, ipSecurityConfigService, tenantService, configuration)
     {
-        protected UnitOfWorkInfo<MixCmsContext> Uow;
-        protected readonly MixCacheService CacheService;
-        protected readonly TranslatorService Translator;
-        protected readonly DatabaseService DatabaseService;
-        public MvcBaseController(
-            IHttpContextAccessor httpContextAccessor,
-            IPSecurityConfigService ipSecurityConfigService,
-            IMixCmsService mixCmsService,
-            TranslatorService translator,
-            DatabaseService databaseService,
-            UnitOfWorkInfo<MixCmsContext> uow,
-            MixCacheService cacheService,
-            IMixTenantService tenantService,
-             IConfiguration configuration) : 
-            base(httpContextAccessor, mixCmsService, ipSecurityConfigService, tenantService, configuration)
-        {
-            Translator = translator;
-            DatabaseService = databaseService;
-            Uow = uow;
-            CacheService = cacheService;
-        }
+        protected UnitOfWorkInfo<MixCmsContext> Uow = uow;
+        protected readonly MixCacheService CacheService = cacheService;
+        protected readonly TranslatorService Translator = translator;
+        protected readonly DatabaseService DatabaseService = databaseService;
 
         protected override void ValidateRequest()
         {
@@ -51,7 +43,7 @@ protected override void ValidateRequest()
         }
 
         #region Helper
-        protected async Task<IActionResult> Page(int pageId, string? keyword = null)
+        protected async Task<IActionResult> Page(int pageId, string keyword = null)
         {
             // Home Page
             var pageRepo = PageContentViewModel.GetRepository(Uow, CacheService);

src/applications/mixcore/Domain/Models/MenuItem.cs

@@ -37,7 +37,7 @@ public string Href
 
         public List<MenuItem> MenuItems { get; set; }
 
-        public T? Property<T>(string fieldName)
+        public T Property<T>(string fieldName)
         {
             if (Obj != null)
             {

src/applications/mixcore/Domain/ViewModels/ApplicationViewModel.cs

@@ -16,7 +16,7 @@ public ApplicationViewModel()
 
         public ApplicationViewModel(MixApplication entity,
 
-            UnitOfWorkInfo? uowInfo = null) : base(entity, uowInfo)
+            UnitOfWorkInfo uowInfo = null) : base(entity, uowInfo)
         {
         }
 
@@ -35,7 +35,7 @@ public ApplicationViewModel(UnitOfWorkInfo unitOfWorkInfo) : base(unitOfWorkInfo
         public string MixDatabaseName { get; set; }
         public int? MixDbId { get; set; }
 
-        public JObject? ExtraData { get; set; }
+        public JObject ExtraData { get; set; }
         public TemplateViewModel Template { get; set; }
         #endregion
 
@@ -54,7 +54,7 @@ public override async Task ExpandView(CancellationToken cancellationToken = defa
 
         #region Public Method
 
-        public T? Property<T>(string fieldName)
+        public T Property<T>(string fieldName)
         {
             return ExtraData != null
                 ? ExtraData.Value<T>(fieldName)

src/applications/mixcore/Domain/ViewModels/ModuleContentViewModel.cs

@@ -16,7 +16,7 @@ public ModuleContentViewModel()
         }
 
         public ModuleContentViewModel(MixModuleContent entity,
-            UnitOfWorkInfo? uowInfo = null) : base(entity, uowInfo)
+            UnitOfWorkInfo uowInfo = null) : base(entity, uowInfo)
         {
         }
 
@@ -34,7 +34,7 @@ public ModuleContentViewModel(UnitOfWorkInfo unitOfWorkInfo) : base(unitOfWorkIn
 
         public string DetailUrl => $"/Module/{Id}/{SeoName}";
 
-        public JObject? AdditionalData { get; set; }
+        public JObject AdditionalData { get; set; }
         public PagingResponseModel<JObject> Data { get; set; }
         public PagingResponseModel<ModulePostAssociationViewModel> Posts { get; set; }
         #endregion
@@ -53,7 +53,7 @@ public override async Task ExpandView(CancellationToken cancellationToken = defa
 
         #region Public Methods
 
-        public T? Property<T>(string fieldName)
+        public T Property<T>(string fieldName)
         {
             return AdditionalData != null
                 ? AdditionalData.Value<T>(fieldName)

src/applications/mixcore/Domain/ViewModels/ModuleDataViewModel.cs

@@ -12,7 +12,7 @@ public ModuleDataViewModel()
 
         public ModuleDataViewModel(MixModuleData entity,
 
-            UnitOfWorkInfo? uowInfo = null) : base(entity, uowInfo)
+            UnitOfWorkInfo uowInfo = null) : base(entity, uowInfo)
         {
         }
 
@@ -33,7 +33,7 @@ public override Task ExpandView(CancellationToken cancellationToken = default)
         {
             if (!string.IsNullOrEmpty(Value) && Data == null)
             {
-                Data = new JObject();
+                Data = [];
                 var tmp = JObject.Parse(Value);
                 foreach (var prop in tmp.Properties())
                 {
@@ -46,7 +46,7 @@ public override Task ExpandView(CancellationToken cancellationToken = default)
         #endregion
 
         #region Helper
-        public string? Property(string name)
+        public string Property(string name)
         {
             return Data.Property(name)?.Value.ToString();
         }

src/applications/mixcore/Domain/ViewModels/ModulePostViewModel.cs

@@ -15,7 +15,7 @@ public ModulePostAssociationViewModel()
 
         public ModulePostAssociationViewModel(MixModulePostAssociation entity,
 
-            UnitOfWorkInfo? uowInfo = null)
+            UnitOfWorkInfo uowInfo = null)
             : base(entity, uowInfo)
         {
         }
@@ -29,7 +29,7 @@ public ModulePostAssociationViewModel(UnitOfWorkInfo unitOfWorkInfo) : base(unit
         #region Overrides
         public override async Task ExpandView(CancellationToken cancellationToken = default)
         {
-            Post = await PostContentViewModel.GetRepository(UowInfo, CacheService).GetSingleAsync(ChildId);
+            Post = await PostContentViewModel.GetRepository(UowInfo, CacheService).GetSingleAsync(ChildId, cancellationToken);
         }
         #endregion
 

src/applications/mixcore/Domain/ViewModels/PageContentViewModel.cs

@@ -18,7 +18,7 @@ public PageContentViewModel()
 
         public PageContentViewModel(MixPageContent entity,
 
-            UnitOfWorkInfo? uowInfo = null) : base(entity, uowInfo)
+            UnitOfWorkInfo uowInfo = null) : base(entity, uowInfo)
         {
         }
 
@@ -39,7 +39,7 @@ public PageContentViewModel(UnitOfWorkInfo unitOfWorkInfo) : base(unitOfWorkInfo
 
         public List<ModuleContentViewModel> Modules { get; set; }
         public PagingResponseModel<PagePostAssociationViewModel> Posts { get; set; }
-        public JObject? AdditionalData { get; set; }
+        public JObject AdditionalData { get; set; }
         #endregion
 
         #region Overrides
@@ -62,11 +62,11 @@ public async Task LoadDataAsync(MixRepoDbRepository mixRepoDbRepository,
         }
 
 
-        public ModuleContentViewModel? GetModule(string moduleName)
+        public ModuleContentViewModel GetModule(string moduleName)
         {
             return Modules?.FirstOrDefault(m => m.SystemName == moduleName);
         }
-        public T? Property<T>(string fieldName)
+        public T Property<T>(string fieldName)
         {
             return AdditionalData != null
                 ? AdditionalData.Value<T>(fieldName)