From 78c2236c672f4f59a0f6e25a347b1eff22ec9b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 15 Jul 2020 16:38:38 +0300 Subject: [PATCH] Clean solution --- .../CmsKit/CmsKitAdminApplicationModule.cs | 1 + .../Volo/CmsKit/CmsKitAdminHttpApiModule.cs | 16 +- .../Volo.CmsKit.Application.Contracts.csproj | 3 - .../CmsKitApplicationContractsModule.cs | 7 +- .../CmsKitPermissionDefinitionProvider.cs | 19 --- .../CmsKit/Permissions/CmsKitPermissions.cs | 14 -- .../CmsKit/Reactions/CreateReactionDto.cs | 11 -- .../CmsKit/Reactions/GetReactionResultDto.cs | 11 -- .../CmsKit/Reactions/IReactionAppService.cs | 12 -- .../Volo/CmsKit/Reactions/ReactionCountDto.cs | 9 -- .../Volo/CmsKit/Samples/ISampleAppService.cs | 12 -- .../Volo/CmsKit/Samples/SampleDto.cs | 7 - .../Volo.CmsKit.Application.csproj | 3 - .../Volo/CmsKit/CmsKitAppService.cs | 14 -- .../CmsKitApplicationAutoMapperProfile.cs | 14 -- .../Volo/CmsKit/CmsKitApplicationModule.cs | 20 +-- .../CmsKit/Reactions/ReactionAppService.cs | 17 --- .../Volo/CmsKit/Samples/SampleAppService.cs | 29 ---- .../Volo/CmsKit/CmsKitCommonHttpApiModule.cs | 14 +- .../Volo.CmsKit.HttpApi.Client.csproj | 3 +- .../Volo/CmsKit/CmsKitHttpApiClientModule.cs | 18 +-- .../Volo.CmsKit.HttpApi.csproj | 3 +- .../Volo/CmsKit/CmsKitController.cs | 13 -- .../Volo/CmsKit/CmsKitHttpApiModule.cs | 29 +--- .../Volo/CmsKit/Samples/SampleController.cs | 33 ----- .../CmsKit/CmsKitPublicApplicationModule.cs | 1 + .../Volo/CmsKit/CmsKitPublicHttpApiModule.cs | 16 +- .../CmsKitWebAutoMapperProfile.cs | 14 -- .../src/Volo.CmsKit.Web/CmsKitWebModule.cs | 55 +------ .../Menus/CmsKitMenuContributor.cs | 23 --- .../src/Volo.CmsKit.Web/Menus/CmsKitMenus.cs | 11 -- .../Volo.CmsKit.Web/Pages/CmsKit/Index.cshtml | 9 -- .../Pages/CmsKit/Index.cshtml.cs | 9 -- .../Pages/CmsKit/_ViewImports.cshtml | 7 - .../Volo.CmsKit.Web/Pages/CmsKitPageModel.cs | 16 -- .../Volo.CmsKit.Web/Volo.CmsKit.Web.csproj | 12 -- .../Samples/SampleAppService_Tests.cs | 30 ---- .../ClientDemoService.cs | 138 +----------------- .../ConsoleTestAppHostedService.cs | 6 +- .../Program.cs | 2 +- 40 files changed, 43 insertions(+), 638 deletions(-) delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPermissionDefinitionProvider.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPermissions.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/CreateReactionDto.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/GetReactionResultDto.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/IReactionAppService.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/ReactionCountDto.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Samples/ISampleAppService.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Samples/SampleDto.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitAppService.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationAutoMapperProfile.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/Reactions/ReactionAppService.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/Samples/SampleAppService.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitController.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/Samples/SampleController.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebAutoMapperProfile.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Web/Menus/CmsKitMenuContributor.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Web/Menus/CmsKitMenus.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/Index.cshtml delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/Index.cshtml.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/_ViewImports.cshtml delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKitPageModel.cs delete mode 100644 modules/cms-kit/test/Volo.CmsKit.Application.Tests/Samples/SampleAppService_Tests.cs diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminApplicationModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminApplicationModule.cs index 5a92aa71da..5d78c939d2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminApplicationModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminApplicationModule.cs @@ -15,6 +15,7 @@ namespace Volo.CmsKit public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddAutoMapperObjectMapper(); + Configure(options => { options.AddMaps(validate: true); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminHttpApiModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminHttpApiModule.cs index 851c9f5d93..cc093630fc 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminHttpApiModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminHttpApiModule.cs @@ -1,10 +1,6 @@ -using Localization.Resources.AbpUi; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.AspNetCore.Mvc; -using Volo.Abp.Localization; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Modularity; using Volo.CmsKit.Admin; -using Volo.CmsKit.Localization; namespace Volo.CmsKit { @@ -21,15 +17,5 @@ namespace Volo.CmsKit mvcBuilder.AddApplicationPartIfNotExists(typeof(CmsKitAdminHttpApiModule).Assembly); }); } - - public override void ConfigureServices(ServiceConfigurationContext context) - { - Configure(options => - { - options.Resources - .Get() - .AddBaseTypes(typeof(AbpUiResource)); - }); - } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj index 3c8c46b999..40743570c5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj @@ -9,10 +9,7 @@ - - - diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs index 363563f48f..02ce83a237 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs @@ -1,14 +1,9 @@ -using Volo.Abp.Application; -using Volo.Abp.Modularity; -using Volo.Abp.Authorization; +using Volo.Abp.Modularity; using Volo.CmsKit.Admin; namespace Volo.CmsKit { [DependsOn( - typeof(CmsKitDomainSharedModule), - typeof(AbpDddApplicationContractsModule), - typeof(AbpAuthorizationModule), typeof(CmsKitPublicApplicationContractsModule), typeof(CmsKitAdminApplicationContractsModule) )] diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPermissionDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPermissionDefinitionProvider.cs deleted file mode 100644 index 8db4aa69fb..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPermissionDefinitionProvider.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Volo.CmsKit.Localization; -using Volo.Abp.Authorization.Permissions; -using Volo.Abp.Localization; - -namespace Volo.CmsKit.Permissions -{ - public class CmsKitPermissionDefinitionProvider : PermissionDefinitionProvider - { - public override void Define(IPermissionDefinitionContext context) - { - var myGroup = context.AddGroup(CmsKitPermissions.GroupName, L("Permission:CmsKit")); - } - - private static LocalizableString L(string name) - { - return LocalizableString.Create(name); - } - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPermissions.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPermissions.cs deleted file mode 100644 index b2eca573c0..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPermissions.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Volo.Abp.Reflection; - -namespace Volo.CmsKit.Permissions -{ - public class CmsKitPermissions - { - public const string GroupName = "CmsKit"; - - public static string[] GetAll() - { - return ReflectionHelper.GetPublicConstantsRecursively(typeof(CmsKitPermissions)); - } - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/CreateReactionDto.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/CreateReactionDto.cs deleted file mode 100644 index 422b0eceb9..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/CreateReactionDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Volo.CmsKit.Reactions -{ - public class CreateReactionDto - { - public string EntityName { get; set; } - - public string EntityId { get; set; } - - public string ReactionType { get; set; } - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/GetReactionResultDto.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/GetReactionResultDto.cs deleted file mode 100644 index 0d3a32f430..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/GetReactionResultDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; - -namespace Volo.CmsKit.Reactions -{ - public class GetReactionResultDto - { - public List AllReactions { get; set; } - - //TODO: Reactions of the current user (if available) - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/IReactionAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/IReactionAppService.cs deleted file mode 100644 index 75d676c802..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/IReactionAppService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Application.Services; - -namespace Volo.CmsKit.Reactions -{ - public interface IReactionAppService : IApplicationService - { - public Task CreateAsync(CreateReactionDto input); - - public Task GetAsync(string entityName, string entityId); - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/ReactionCountDto.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/ReactionCountDto.cs deleted file mode 100644 index 8b25851475..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/ReactionCountDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Volo.CmsKit.Reactions -{ - public class ReactionCountDto - { - public string ReactionType { get; set; } - - public int Count { get; set; } - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Samples/ISampleAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Samples/ISampleAppService.cs deleted file mode 100644 index 1d16db72d4..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Samples/ISampleAppService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Application.Services; - -namespace Volo.CmsKit.Samples -{ - public interface ISampleAppService : IApplicationService - { - Task GetAsync(); - - Task GetAuthorizedAsync(); - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Samples/SampleDto.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Samples/SampleDto.cs deleted file mode 100644 index 89f8b03836..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Samples/SampleDto.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Volo.CmsKit.Samples -{ - public class SampleDto - { - public int Value { get; set; } - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj b/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj index ab528fe08b..fa1557674e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj @@ -9,11 +9,8 @@ - - - diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitAppService.cs deleted file mode 100644 index 64bbbcb685..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitAppService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Volo.CmsKit.Localization; -using Volo.Abp.Application.Services; - -namespace Volo.CmsKit -{ - public abstract class CmsKitAppService : ApplicationService - { - protected CmsKitAppService() - { - LocalizationResource = typeof(CmsKitResource); - ObjectMapperContext = typeof(CmsKitApplicationModule); - } - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationAutoMapperProfile.cs deleted file mode 100644 index 285b265c23..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationAutoMapperProfile.cs +++ /dev/null @@ -1,14 +0,0 @@ -using AutoMapper; - -namespace Volo.CmsKit -{ - public class CmsKitApplicationAutoMapperProfile : Profile - { - public CmsKitApplicationAutoMapperProfile() - { - /* You can configure your AutoMapper mapping configuration here. - * Alternatively, you can split your mapping configurations - * into multiple profile classes for a better organization. */ - } - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs index 0a435ded21..ab649bbfb4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs @@ -1,28 +1,14 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.AutoMapper; -using Volo.Abp.Modularity; -using Volo.Abp.Application; -using Volo.CmsKit.Admin; +using Volo.Abp.Modularity; namespace Volo.CmsKit { [DependsOn( - typeof(CmsKitDomainModule), - typeof(CmsKitApplicationContractsModule), typeof(CmsKitPublicApplicationModule), typeof(CmsKitAdminApplicationModule), - typeof(AbpDddApplicationModule), - typeof(AbpAutoMapperModule) + typeof(CmsKitApplicationContractsModule) )] public class CmsKitApplicationModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddMaps(validate: true); - }); - } + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/Reactions/ReactionAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/Reactions/ReactionAppService.cs deleted file mode 100644 index ac17380662..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/Reactions/ReactionAppService.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Threading.Tasks; - -namespace Volo.CmsKit.Reactions -{ - public class ReactionAppService : CmsKitAppService, IReactionAppService - { - public Task CreateAsync(CreateReactionDto input) - { - throw new System.NotImplementedException(); - } - - public Task GetAsync(string entityName, string entityId) - { - throw new System.NotImplementedException(); - } - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/Samples/SampleAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/Samples/SampleAppService.cs deleted file mode 100644 index 3622e66a05..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/Samples/SampleAppService.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; - -namespace Volo.CmsKit.Samples -{ - public class SampleAppService : CmsKitAppService, ISampleAppService - { - public Task GetAsync() - { - return Task.FromResult( - new SampleDto - { - Value = 42 - } - ); - } - - [Authorize] - public Task GetAuthorizedAsync() - { - return Task.FromResult( - new SampleDto - { - Value = 42 - } - ); - } - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo/CmsKit/CmsKitCommonHttpApiModule.cs b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo/CmsKit/CmsKitCommonHttpApiModule.cs index 45d679fe5d..b839fe9ef7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo/CmsKit/CmsKitCommonHttpApiModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo/CmsKit/CmsKitCommonHttpApiModule.cs @@ -1,5 +1,8 @@ -using Volo.Abp.AspNetCore.Mvc; +using Localization.Resources.AbpUi; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.Localization; using Volo.Abp.Modularity; +using Volo.CmsKit.Localization; namespace Volo.CmsKit { @@ -9,5 +12,14 @@ namespace Volo.CmsKit )] public class CmsKitCommonHttpApiModule : AbpModule { + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.Resources + .Get() + .AddBaseTypes(typeof(AbpUiResource)); + }); + } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj index aaca64503f..1d2f34b26c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj @@ -9,8 +9,9 @@ - + + diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo/CmsKit/CmsKitHttpApiClientModule.cs b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo/CmsKit/CmsKitHttpApiClientModule.cs index 7977fa5ffc..ca2d21c38f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo/CmsKit/CmsKitHttpApiClientModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo/CmsKit/CmsKitHttpApiClientModule.cs @@ -1,22 +1,14 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Http.Client; -using Volo.Abp.Modularity; +using Volo.Abp.Modularity; namespace Volo.CmsKit { [DependsOn( - typeof(CmsKitApplicationContractsModule), - typeof(AbpHttpClientModule))] + typeof(CmsKitAdminHttpApiClientModule), + typeof(CmsKitPublicHttpApiClientModule), + typeof(CmsKitApplicationContractsModule) + )] public class CmsKitHttpApiClientModule : AbpModule { - public const string RemoteServiceName = "CmsKit"; - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddHttpClientProxies( - typeof(CmsKitApplicationContractsModule).Assembly, - RemoteServiceName - ); - } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.csproj b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.csproj index 5df70b920a..c3775e5084 100644 --- a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.csproj @@ -9,8 +9,9 @@ - + + diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitController.cs b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitController.cs deleted file mode 100644 index a4374d2cc4..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitController.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Volo.CmsKit.Localization; -using Volo.Abp.AspNetCore.Mvc; - -namespace Volo.CmsKit -{ - public abstract class CmsKitController : AbpController - { - protected CmsKitController() - { - LocalizationResource = typeof(CmsKitResource); - } - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitHttpApiModule.cs b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitHttpApiModule.cs index 2fa9c7fb35..8756d6a48d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitHttpApiModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitHttpApiModule.cs @@ -1,33 +1,14 @@ -using Localization.Resources.AbpUi; -using Volo.CmsKit.Localization; -using Volo.Abp.AspNetCore.Mvc; -using Volo.Abp.Localization; -using Volo.Abp.Modularity; -using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Modularity; namespace Volo.CmsKit { [DependsOn( - typeof(CmsKitApplicationContractsModule), - typeof(AbpAspNetCoreMvcModule))] + typeof(CmsKitAdminApplicationModule), + typeof(CmsKitPublicApplicationModule), + typeof(CmsKitApplicationContractsModule) + )] public class CmsKitHttpApiModule : AbpModule { - public override void PreConfigureServices(ServiceConfigurationContext context) - { - PreConfigure(mvcBuilder => - { - mvcBuilder.AddApplicationPartIfNotExists(typeof(CmsKitHttpApiModule).Assembly); - }); - } - public override void ConfigureServices(ServiceConfigurationContext context) - { - Configure(options => - { - options.Resources - .Get() - .AddBaseTypes(typeof(AbpUiResource)); - }); - } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/Samples/SampleController.cs b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/Samples/SampleController.cs deleted file mode 100644 index f599a36034..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/Samples/SampleController.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp; - -namespace Volo.CmsKit.Samples -{ - [RemoteService] - [Route("api/CmsKit/sample")] - public class SampleController : CmsKitController, ISampleAppService - { - private readonly ISampleAppService _sampleAppService; - - public SampleController(ISampleAppService sampleAppService) - { - _sampleAppService = sampleAppService; - } - - [HttpGet] - public async Task GetAsync() - { - return await _sampleAppService.GetAsync(); - } - - [HttpGet] - [Route("authorized")] - [Authorize] - public async Task GetAuthorizedAsync() - { - return await _sampleAppService.GetAsync(); - } - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/CmsKitPublicApplicationModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/CmsKitPublicApplicationModule.cs index 8892c85db5..45849fd825 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/CmsKitPublicApplicationModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/CmsKitPublicApplicationModule.cs @@ -14,6 +14,7 @@ namespace Volo.CmsKit public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddAutoMapperObjectMapper(); + Configure(options => { options.AddMaps(validate: true); diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicHttpApiModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicHttpApiModule.cs index fc281fa81f..00ab062a07 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicHttpApiModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicHttpApiModule.cs @@ -1,9 +1,5 @@ -using Localization.Resources.AbpUi; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.AspNetCore.Mvc; -using Volo.Abp.Localization; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Modularity; -using Volo.CmsKit.Localization; namespace Volo.CmsKit { @@ -19,15 +15,5 @@ namespace Volo.CmsKit mvcBuilder.AddApplicationPartIfNotExists(typeof(CmsKitPublicHttpApiModule).Assembly); }); } - - public override void ConfigureServices(ServiceConfigurationContext context) - { - Configure(options => - { - options.Resources - .Get() - .AddBaseTypes(typeof(AbpUiResource)); - }); - } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebAutoMapperProfile.cs deleted file mode 100644 index 49670d5859..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebAutoMapperProfile.cs +++ /dev/null @@ -1,14 +0,0 @@ -using AutoMapper; - -namespace Volo.CmsKit.Web -{ - public class CmsKitWebAutoMapperProfile : Profile - { - public CmsKitWebAutoMapperProfile() - { - /* You can configure your AutoMapper mapping configuration here. - * Alternatively, you can split your mapping configurations - * into multiple profile classes for a better organization. */ - } - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs index e1fe46f5f5..6ec041b690 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs @@ -1,63 +1,14 @@ -using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.Extensions.DependencyInjection; -using Volo.CmsKit.Localization; -using Volo.CmsKit.Web.Menus; -using Volo.Abp.AspNetCore.Mvc.Localization; -using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; -using Volo.Abp.AutoMapper; -using Volo.Abp.Modularity; -using Volo.Abp.UI.Navigation; -using Volo.Abp.VirtualFileSystem; +using Volo.Abp.Modularity; using Volo.CmsKit.Admin.Web; -using Volo.CmsKit.Permissions; namespace Volo.CmsKit.Web { [DependsOn( - typeof(CmsKitHttpApiModule), - typeof(AbpAspNetCoreMvcUiThemeSharedModule), - typeof(AbpAutoMapperModule), typeof(CmsKitPublicWebModule), - typeof(CmsKitAdminWebModule) + typeof(CmsKitAdminWebModule), + typeof(CmsKitHttpApiModule) )] public class CmsKitWebModule : AbpModule { - public override void PreConfigureServices(ServiceConfigurationContext context) - { - context.Services.PreConfigure(options => - { - options.AddAssemblyResource(typeof(CmsKitResource), typeof(CmsKitWebModule).Assembly); - }); - - PreConfigure(mvcBuilder => - { - mvcBuilder.AddApplicationPartIfNotExists(typeof(CmsKitWebModule).Assembly); - }); - } - - public override void ConfigureServices(ServiceConfigurationContext context) - { - Configure(options => - { - options.MenuContributors.Add(new CmsKitMenuContributor()); - }); - - Configure(options => - { - options.FileSets.AddEmbedded(); - }); - - context.Services.AddAutoMapperObjectMapper(); - - Configure(options => - { - options.AddMaps(validate: true); - }); - - Configure(options => - { - //Configure authorization. - }); - } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Menus/CmsKitMenuContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Web/Menus/CmsKitMenuContributor.cs deleted file mode 100644 index abf6c14aa5..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Web/Menus/CmsKitMenuContributor.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.UI.Navigation; - -namespace Volo.CmsKit.Web.Menus -{ - public class CmsKitMenuContributor : IMenuContributor - { - public async Task ConfigureMenuAsync(MenuConfigurationContext context) - { - if (context.Menu.Name == StandardMenus.Main) - { - await ConfigureMainMenu(context); - } - } - - private Task ConfigureMainMenu(MenuConfigurationContext context) - { - //Add main menu items. - - return Task.CompletedTask; - } - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Menus/CmsKitMenus.cs b/modules/cms-kit/src/Volo.CmsKit.Web/Menus/CmsKitMenus.cs deleted file mode 100644 index 57bf75dd99..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Web/Menus/CmsKitMenus.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Volo.CmsKit.Web.Menus -{ - public class CmsKitMenus - { - private const string Prefix = "CmsKit"; - - //Add your menu items here... - //public const string Home = Prefix + ".MyNewMenuItem"; - - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/Index.cshtml deleted file mode 100644 index ab43346f59..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/Index.cshtml +++ /dev/null @@ -1,9 +0,0 @@ -@page -@using Microsoft.Extensions.Localization -@using Volo.CmsKit.Localization -@model Volo.CmsKit.Web.Pages.CmsKit.IndexModel -@inject IStringLocalizer L -@{ -} -

CmsKit

-

@L["SamplePageMessage"]

diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/Index.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/Index.cshtml.cs deleted file mode 100644 index 944f9c3fb0..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/Index.cshtml.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Volo.CmsKit.Web.Pages.CmsKit -{ - public class IndexModel : CmsKitPageModel - { - public void OnGet() - { - } - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/_ViewImports.cshtml b/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/_ViewImports.cshtml deleted file mode 100644 index 6798eba494..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/_ViewImports.cshtml +++ /dev/null @@ -1,7 +0,0 @@ -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling -@addTagHelper *, Volo.CmsKit.Common.Web -@addTagHelper *, Volo.CmsKit.Public.Web -@addTagHelper *, Volo.CmsKit.Admin.Web diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKitPageModel.cs b/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKitPageModel.cs deleted file mode 100644 index 3706ebdcf5..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKitPageModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Volo.CmsKit.Localization; -using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; - -namespace Volo.CmsKit.Web.Pages -{ - /* Inherit your PageModel classes from this class. - */ - public abstract class CmsKitPageModel : AbpPageModel - { - protected CmsKitPageModel() - { - LocalizationResourceType = typeof(CmsKitResource); - ObjectMapperContext = typeof(CmsKitWebModule); - } - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj index ea9fab1337..84a31c94db 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj @@ -13,12 +13,7 @@ - - - - - @@ -27,11 +22,4 @@ - - - - - - - diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Samples/SampleAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Samples/SampleAppService_Tests.cs deleted file mode 100644 index f5adf32a0c..0000000000 --- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Samples/SampleAppService_Tests.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Threading.Tasks; -using Shouldly; -using Xunit; - -namespace Volo.CmsKit.Samples -{ - public class SampleAppService_Tests : CmsKitApplicationTestBase - { - private readonly ISampleAppService _sampleAppService; - - public SampleAppService_Tests() - { - _sampleAppService = GetRequiredService(); - } - - [Fact] - public async Task GetAsync() - { - var result = await _sampleAppService.GetAsync(); - result.Value.ShouldBe(42); - } - - [Fact] - public async Task GetAuthorizedAsync() - { - var result = await _sampleAppService.GetAuthorizedAsync(); - result.Value.ShouldBe(42); - } - } -} diff --git a/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs b/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs index fa35ffa83d..5342fb9dee 100644 --- a/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs +++ b/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs @@ -1,156 +1,20 @@ using System; -using System.Net.Http; using System.Threading.Tasks; -using IdentityModel.Client; -using Microsoft.Extensions.Configuration; -using Volo.CmsKit.Samples; using Volo.Abp.DependencyInjection; -using Volo.Abp.IdentityModel; namespace Volo.CmsKit { public class ClientDemoService : ITransientDependency { - private readonly ISampleAppService _sampleAppService; - private readonly IIdentityModelAuthenticationService _authenticationService; - private readonly IConfiguration _configuration; - - public ClientDemoService( - ISampleAppService sampleAppService, - IIdentityModelAuthenticationService authenticationService, - IConfiguration configuration) - { - _sampleAppService = sampleAppService; - _authenticationService = authenticationService; - _configuration = configuration; - } - public async Task RunAsync() { await TestWithDynamicProxiesAsync(); - await TestWithHttpClientAndIdentityModelAuthenticationServiceAsync(); - await TestAllManuallyAsync(); } - /* Shows how to perform an HTTP request to the API using ABP's dynamic c# proxy - * feature. It is just simple as calling a local service method. - * Authorization and HTTP request details are handled by the ABP framework. - */ private async Task TestWithDynamicProxiesAsync() { Console.WriteLine(); Console.WriteLine($"***** {nameof(TestWithDynamicProxiesAsync)} *****"); - - var result = await _sampleAppService.GetAsync(); - Console.WriteLine("Result: " + result.Value); - - result = await _sampleAppService.GetAuthorizedAsync(); - Console.WriteLine("Result (authorized): " + result.Value); - } - - /* Shows how to use HttpClient to perform a request to the HTTP API. - * It uses ABP's IIdentityModelAuthenticationService to simplify obtaining access tokens. - */ - private async Task TestWithHttpClientAndIdentityModelAuthenticationServiceAsync() - { - Console.WriteLine(); - Console.WriteLine($"***** {nameof(TestWithHttpClientAndIdentityModelAuthenticationServiceAsync)} *****"); - - //Get access token using ABP's IIdentityModelAuthenticationService - - var accessToken = await _authenticationService.GetAccessTokenAsync( - new IdentityClientConfiguration( - _configuration["IdentityClients:Default:Authority"], - _configuration["IdentityClients:Default:Scope"], - _configuration["IdentityClients:Default:ClientId"], - _configuration["IdentityClients:Default:ClientSecret"], - _configuration["IdentityClients:Default:GrantType"], - _configuration["IdentityClients:Default:UserName"], - _configuration["IdentityClients:Default:UserPassword"] - ) - ); - - //Perform the actual HTTP request - - using (var httpClient = new HttpClient()) - { - httpClient.SetBearerToken(accessToken); - - var url = _configuration["RemoteServices:CmsKit:BaseUrl"] + - "api/CmsKit/sample/authorized"; - - var responseMessage = await httpClient.GetAsync(url); - if (responseMessage.IsSuccessStatusCode) - { - var responseString = await responseMessage.Content.ReadAsStringAsync(); - Console.WriteLine("Result: " + responseString); - } - else - { - throw new Exception("Remote server returns error code: " + responseMessage.StatusCode); - } - } - } - - /* Shows how to use HttpClient to perform a request to the HTTP API. - * It obtains access token using IdentityServer's API. See its documentation: - * https://identityserver4.readthedocs.io/en/latest/quickstarts/2_resource_owner_passwords.html - */ - private async Task TestAllManuallyAsync() - { - Console.WriteLine(); - Console.WriteLine($"***** {nameof(TestAllManuallyAsync)} *****"); - - //Obtain access token from the IDS4 server - - // discover endpoints from metadata - var client = new HttpClient(); - var disco = await client.GetDiscoveryDocumentAsync(_configuration["IdentityClients:Default:Authority"]); - if (disco.IsError) - { - Console.WriteLine(disco.Error); - return; - } - - // request token - var tokenResponse = await client.RequestPasswordTokenAsync(new PasswordTokenRequest - { - Address = disco.TokenEndpoint, - ClientId = _configuration["IdentityClients:Default:ClientId"], - ClientSecret = _configuration["IdentityClients:Default:ClientSecret"], - UserName = _configuration["IdentityClients:Default:UserName"], - Password = _configuration["IdentityClients:Default:UserPassword"], - Scope = _configuration["IdentityClients:Default:Scope"] - }); - - if (tokenResponse.IsError) - { - Console.WriteLine(tokenResponse.Error); - return; - } - - Console.WriteLine(tokenResponse.Json); - - //Perform the actual HTTP request - - using (var httpClient = new HttpClient()) - { - httpClient.SetBearerToken(tokenResponse.AccessToken); - - var url = _configuration["RemoteServices:CmsKit:BaseUrl"] + - "api/CmsKit/sample/authorized"; - - var responseMessage = await httpClient.GetAsync(url); - if (responseMessage.IsSuccessStatusCode) - { - var responseString = await responseMessage.Content.ReadAsStringAsync(); - Console.WriteLine("Result: " + responseString); - } - else - { - throw new Exception("Remote server returns error code: " + responseMessage.StatusCode); - } - } } } -} \ No newline at end of file +} diff --git a/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs b/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs index 10dc774e10..5fa4389192 100644 --- a/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs +++ b/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs @@ -1,10 +1,10 @@ -using Microsoft.Extensions.Hosting; -using System.Threading; +using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Volo.Abp; -namespace Volo.CmsKit.HttpApi.Client.ConsoleTestApp +namespace Volo.CmsKit { public class ConsoleTestAppHostedService : IHostedService { diff --git a/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Program.cs b/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Program.cs index f19bc06260..b6d33db416 100644 --- a/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Program.cs +++ b/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Program.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -namespace Volo.CmsKit.HttpApi.Client.ConsoleTestApp +namespace Volo.CmsKit { class Program {