Merge pull request #29 from volosoft/admin-app-layer

Admin application and http layers

.gitignore

@@ -363,4 +363,5 @@ src/EventHub.IdentityServer/Logs/*
 src/EventHub.HttpApi.Host/Logs/*
 src/EventHub.HttpApi.HostWithIds/Logs/*
 src/EventHub.DbMigrator/Logs/*
-.tye/
+.tye/
+tempkey.jwk

EventHub.sln

@@ -57,6 +57,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{BBD743
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "www", "www", "{6A874270-A81C-4D32-B841-40DE0CB3D135}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventHub.Admin.Application.Contracts", "src\EventHub.Admin.Application.Contracts\EventHub.Admin.Application.Contracts.csproj", "{354AB806-7A90-4646-8263-FF34B812D9EE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventHub.Admin.Application", "src\EventHub.Admin.Application\EventHub.Admin.Application.csproj", "{130FF3E8-CC58-4258-8056-79B289B1C5AD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventHub.Admin.HttpApi", "src\EventHub.Admin.HttpApi\EventHub.Admin.HttpApi.csproj", "{72F85686-311E-4411-8A71-103F4A226DDD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventHub.Admin.HttpApi.Client", "src\EventHub.Admin.HttpApi.Client\EventHub.Admin.HttpApi.Client.csproj", "{C6E4194E-229D-49C9-BDC0-A3E79FD0F50E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -135,6 +143,22 @@ Global
 		{7A16923F-06FA-40B4-8A54-69E7828B1D69}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A16923F-06FA-40B4-8A54-69E7828B1D69}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7A16923F-06FA-40B4-8A54-69E7828B1D69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{354AB806-7A90-4646-8263-FF34B812D9EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{354AB806-7A90-4646-8263-FF34B812D9EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{354AB806-7A90-4646-8263-FF34B812D9EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{354AB806-7A90-4646-8263-FF34B812D9EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{130FF3E8-CC58-4258-8056-79B289B1C5AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{130FF3E8-CC58-4258-8056-79B289B1C5AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{130FF3E8-CC58-4258-8056-79B289B1C5AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{130FF3E8-CC58-4258-8056-79B289B1C5AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72F85686-311E-4411-8A71-103F4A226DDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72F85686-311E-4411-8A71-103F4A226DDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72F85686-311E-4411-8A71-103F4A226DDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72F85686-311E-4411-8A71-103F4A226DDD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6E4194E-229D-49C9-BDC0-A3E79FD0F50E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6E4194E-229D-49C9-BDC0-A3E79FD0F50E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6E4194E-229D-49C9-BDC0-A3E79FD0F50E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6E4194E-229D-49C9-BDC0-A3E79FD0F50E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -150,8 +174,6 @@ Global
 		{C956DD76-69C8-4A9C-83EA-D17DF83340FD} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB}
 		{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB}
 		{7341ED49-ACA0-40BD-8AD9-2DF63DE06677} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
-		{4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {7341ED49-ACA0-40BD-8AD9-2DF63DE06677}
-		{3B5A0094-670D-4BB1-BFDD-61B88A8773DC} = {7341ED49-ACA0-40BD-8AD9-2DF63DE06677}
 		{E6D5BF0E-DE92-4D82-A352-EF04B37CB11C} = {7341ED49-ACA0-40BD-8AD9-2DF63DE06677}
 		{BAA6ED88-6783-48EF-8691-46F4BED14023} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 		{073C361E-B8F4-49F5-93CC-72A3FF49C026} = {BAA6ED88-6783-48EF-8691-46F4BED14023}
@@ -165,6 +187,12 @@ Global
 		{91853F21-9CD9-4132-BC29-A7D5D84FFFE7} = {BBD74390-60B3-4AE4-80B4-956565C3E612}
 		{6A874270-A81C-4D32-B841-40DE0CB3D135} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
 		{50B2631D-129C-47B3-A587-029CCD6099BC} = {6A874270-A81C-4D32-B841-40DE0CB3D135}
+		{354AB806-7A90-4646-8263-FF34B812D9EE} = {7016C0D2-D0D5-498B-9FA7-8ABA8F5C39EF}
+		{130FF3E8-CC58-4258-8056-79B289B1C5AD} = {7016C0D2-D0D5-498B-9FA7-8ABA8F5C39EF}
+		{3B5A0094-670D-4BB1-BFDD-61B88A8773DC} = {F8CF0FE2-9F75-4940-92EC-3D021416DEBF}
+		{4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {F8CF0FE2-9F75-4940-92EC-3D021416DEBF}
+		{72F85686-311E-4411-8A71-103F4A226DDD} = {7016C0D2-D0D5-498B-9FA7-8ABA8F5C39EF}
+		{C6E4194E-229D-49C9-BDC0-A3E79FD0F50E} = {7016C0D2-D0D5-498B-9FA7-8ABA8F5C39EF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6AAFA1C6-603E-13FA-45E5-7910AA9F661D}

src/EventHub.Admin.Application.Contracts/EventHub.Admin.Application.Contracts.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <RootNamespace>EventHub.Admin</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\EventHub.Domain.Shared\EventHub.Domain.Shared.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.2.1" />
+        <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="4.2.1" />
+        <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="4.2.1" />
+    </ItemGroup>
+
+</Project>

src/EventHub.Admin.Application.Contracts/EventHubAdminApplicationContractsModule.cs

@@ -0,0 +1,21 @@
+using Volo.Abp.Account;
+using Volo.Abp.Identity;
+using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement;
+
+namespace EventHub.Admin
+{
+    [DependsOn(
+        typeof(EventHubDomainSharedModule),
+        typeof(AbpAccountApplicationContractsModule),
+        typeof(AbpIdentityApplicationContractsModule),
+        typeof(AbpPermissionManagementApplicationContractsModule)
+    )]
+    public class EventHubAdminApplicationContractsModule : AbpModule
+    {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            EventHubDtoExtensions.Configure();
+        }
+    }
+}

src/EventHub.Application.Contracts/EventHubDtoExtensions.cs → src/EventHub.Admin.Application.Contracts/EventHubDtoExtensions.cs

@@ -1,8 +1,6 @@
-using Volo.Abp.Identity;
-using Volo.Abp.ObjectExtending;
-using Volo.Abp.Threading;
+using Volo.Abp.Threading;
 
-namespace EventHub
+namespace EventHub.Admin
 {
     public static class EventHubDtoExtensions
     {

src/EventHub.Application.Contracts/Permissions/EventHubPermissionDefinitionProvider.cs → src/EventHub.Admin.Application.Contracts/Permissions/EventHubPermissionDefinitionProvider.cs

@@ -2,7 +2,7 @@
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Localization;
 
-namespace EventHub.Permissions
+namespace EventHub.Admin.Permissions
 {
     public class EventHubPermissionDefinitionProvider : PermissionDefinitionProvider
     {

src/EventHub.Application.Contracts/Permissions/EventHubPermissions.cs → src/EventHub.Admin.Application.Contracts/Permissions/EventHubPermissions.cs

@@ -1,4 +1,4 @@
-namespace EventHub.Permissions
+namespace EventHub.Admin.Permissions
 {
     public static class EventHubPermissions
     {

src/EventHub.Admin.Application/EventHub.Admin.Application.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <RootNamespace>EventHub.Admin</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\EventHub.Domain\EventHub.Domain.csproj" />
+        <ProjectReference Include="..\EventHub.Admin.Application.Contracts\EventHub.Admin.Application.Contracts.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Volo.Abp.Account.Application" Version="4.2.1" />
+        <PackageReference Include="Volo.Abp.Identity.Application" Version="4.2.1" />
+        <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="4.2.1" />
+    </ItemGroup>
+
+</Project>

src/EventHub.Admin.Application/EventHubAdminApplicationModule.cs

@@ -0,0 +1,18 @@
+using Volo.Abp.Account;
+using Volo.Abp.Identity;
+using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement;
+
+namespace EventHub.Admin
+{
+    [DependsOn(
+        typeof(EventHubDomainModule),
+        typeof(AbpAccountApplicationModule),
+        typeof(EventHubAdminApplicationContractsModule),
+        typeof(AbpIdentityApplicationModule),
+        typeof(AbpPermissionManagementApplicationModule)
+    )]
+    public class EventHubAdminApplicationModule : AbpModule
+    {
+    }
+}

src/EventHub.Admin.HttpApi.Client/EventHub.Admin.HttpApi.Client.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <RootNamespace>EventHub.Admin</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\EventHub.Admin.Application.Contracts\EventHub.Admin.Application.Contracts.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="4.2.1" />
+        <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="4.2.1" />
+        <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="4.2.1" />
+    </ItemGroup>
+
+</Project>

src/EventHub.Admin.HttpApi.Client/EventHubAdminHttpApiClientModule.cs

@@ -0,0 +1,27 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Account;
+using Volo.Abp.Identity;
+using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement;
+
+namespace EventHub.Admin
+{
+    [DependsOn(
+        typeof(EventHubAdminApplicationContractsModule),
+        typeof(AbpAccountHttpApiClientModule),
+        typeof(AbpIdentityHttpApiClientModule),
+        typeof(AbpPermissionManagementHttpApiClientModule)
+        )]
+    public class EventHubAdminHttpApiClientModule : AbpModule
+    {
+        public const string RemoteServiceName = "Default";
+
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddHttpClientProxies(
+                typeof(EventHubAdminApplicationContractsModule).Assembly,
+                RemoteServiceName
+            );
+        }
+    }
+}

src/EventHub.Admin.HttpApi/EventHub.Admin.HttpApi.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <RootNamespace>EventHub.Admin</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\EventHub.Admin.Application.Contracts\EventHub.Admin.Application.Contracts.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Volo.Abp.Account.HttpApi" Version="4.2.1" />
+        <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="4.2.1" />
+        <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="4.2.1" />
+    </ItemGroup>
+
+</Project>

src/EventHub.Admin.HttpApi/EventHubAdminHttpApiModule.cs

@@ -0,0 +1,17 @@
+using Volo.Abp.Account;
+using Volo.Abp.Identity;
+using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement.HttpApi;
+
+namespace EventHub.Admin
+{
+    [DependsOn(
+        typeof(EventHubAdminApplicationContractsModule),
+        typeof(AbpAccountHttpApiModule),
+        typeof(AbpIdentityHttpApiModule),
+        typeof(AbpPermissionManagementHttpApiModule)
+    )]
+    public class EventHubAdminHttpApiModule : AbpModule
+    {
+    }
+}

src/EventHub.Admin.Web/EventHub.Admin.Web.csproj

@@ -6,6 +6,10 @@
     <BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\EventHub.Admin.HttpApi.Client\EventHub.Admin.HttpApi.Client.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3-preview6" />
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3-preview6" />
@@ -16,14 +20,7 @@
   <ItemGroup>
     <PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="4.2.1" />
     <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme" Version="4.2.1" />
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="Volo.Abp.Identity.Blazor" Version="4.2.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\EventHub.HttpApi.Client\EventHub.HttpApi.Client.csproj" />
-  </ItemGroup>
-
 </Project>

src/EventHub.Admin.Web/EventHubBlazorModule.cs

@@ -20,7 +20,7 @@ namespace EventHub.Admin.Web
 {
     [DependsOn(
         typeof(AbpAutofacWebAssemblyModule),
-        typeof(EventHubHttpApiClientModule),
+        typeof(EventHubAdminHttpApiClientModule),
         typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule),
         typeof(AbpIdentityBlazorModule)
     )]

src/EventHub.Application.Contracts/EventHub.Application.Contracts.csproj

@@ -12,10 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.ObjectExtending" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.2.1" />
   </ItemGroup>
 
 </Project>

src/EventHub.Application.Contracts/EventHubApplicationContractsModule.cs

@@ -1,23 +1,14 @@
-using Volo.Abp.Account;
-using Volo.Abp.Identity;
+using Volo.Abp.Application;
 using Volo.Abp.Modularity;
-using Volo.Abp.ObjectExtending;
-using Volo.Abp.PermissionManagement;
 
 namespace EventHub
 {
     [DependsOn(
         typeof(EventHubDomainSharedModule),
-        typeof(AbpAccountApplicationContractsModule),
-        typeof(AbpIdentityApplicationContractsModule),
-        typeof(AbpPermissionManagementApplicationContractsModule),
-        typeof(AbpObjectExtendingModule)
+        typeof(AbpDddApplicationContractsModule)
     )]
     public class EventHubApplicationContractsModule : AbpModule
     {
-        public override void PreConfigureServices(ServiceConfigurationContext context)
-        {
-            EventHubDtoExtensions.Configure();
-        }
+
     }
 }

src/EventHub.Application/EventHub.Application.csproj

@@ -13,9 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.Application" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.Application" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="4.2.1" />
   </ItemGroup>
 
 </Project>

src/EventHub.Application/EventHubApplicationModule.cs

@@ -1,17 +1,13 @@
-using Volo.Abp.Account;
+using Volo.Abp.Application;
 using Volo.Abp.AutoMapper;
-using Volo.Abp.Identity;
 using Volo.Abp.Modularity;
-using Volo.Abp.PermissionManagement;
 
 namespace EventHub
 {
     [DependsOn(
         typeof(EventHubDomainModule),
-        typeof(AbpAccountApplicationModule),
         typeof(EventHubApplicationContractsModule),
-        typeof(AbpIdentityApplicationModule),
-        typeof(AbpPermissionManagementApplicationModule)
+        typeof(AbpDddApplicationModule)
     )]
     public class EventHubApplicationModule : AbpModule
     {

src/EventHub.HttpApi.Client/EventHub.HttpApi.Client.csproj

@@ -12,11 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.Http.Client" Version="4.2.1" />
   </ItemGroup>
 
 </Project>

src/EventHub.HttpApi.Client/EventHubHttpApiClientModule.cs

@@ -1,16 +1,12 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Account;
-using Volo.Abp.Identity;
+using Volo.Abp.Http.Client;
 using Volo.Abp.Modularity;
-using Volo.Abp.PermissionManagement;
 
 namespace EventHub
 {
     [DependsOn(
         typeof(EventHubApplicationContractsModule),
-        typeof(AbpAccountHttpApiClientModule),
-        typeof(AbpIdentityHttpApiClientModule),
-        typeof(AbpPermissionManagementHttpApiClientModule)
+        typeof(AbpHttpClientModule)
     )]
     public class EventHubHttpApiClientModule : AbpModule
     {

src/EventHub.HttpApi.Host/EventHub.HttpApi.Host.csproj

@@ -24,8 +24,10 @@
 
   <ItemGroup>
     <ProjectReference Include="..\EventHub.Application\EventHub.Application.csproj" />
-    <ProjectReference Include="..\EventHub.EntityFrameworkCore.DbMigrations\EventHub.EntityFrameworkCore.DbMigrations.csproj" />
     <ProjectReference Include="..\EventHub.HttpApi\EventHub.HttpApi.csproj" />
+    <ProjectReference Include="..\EventHub.Admin.Application\EventHub.Admin.Application.csproj" />
+    <ProjectReference Include="..\EventHub.Admin.HttpApi\EventHub.Admin.HttpApi.csproj" />
+    <ProjectReference Include="..\EventHub.EntityFrameworkCore.DbMigrations\EventHub.EntityFrameworkCore.DbMigrations.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using EventHub.Admin;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Cors;
@@ -30,11 +31,13 @@ using Volo.Abp.VirtualFileSystem;
 namespace EventHub
 {
     [DependsOn(
+        typeof(EventHubApplicationModule),
         typeof(EventHubHttpApiModule),
+        typeof(EventHubAdminApplicationModule),
+        typeof(EventHubAdminHttpApiModule),
+        typeof(EventHubEntityFrameworkCoreDbMigrationsModule),
         typeof(AbpAutofacModule),
         typeof(AbpCachingStackExchangeRedisModule),
-        typeof(EventHubApplicationModule),
-        typeof(EventHubEntityFrameworkCoreDbMigrationsModule),
         typeof(AbpAspNetCoreSerilogModule),
         typeof(AbpSwashbuckleModule),
         typeof(AbpAspNetCoreMvcUiBasicThemeModule)
@@ -127,6 +130,7 @@ namespace EventHub
                 {
                     options.SwaggerDoc("v1", new OpenApiInfo {Title = "EventHub API", Version = "v1"});
                     options.DocInclusionPredicate((docName, description) => true);
+                    options.CustomSchemaIds(type => type.FullName);
                 });
         }
 

src/EventHub.HttpApi/EventHub.HttpApi.csproj

@@ -12,9 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.HttpApi" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.2.1" />
   </ItemGroup>
 
 </Project>

src/EventHub.HttpApi/EventHubHttpApiModule.cs

@@ -1,18 +1,14 @@
 using Localization.Resources.AbpUi;
 using EventHub.Localization;
-using Volo.Abp.Account;
-using Volo.Abp.Identity;
+using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
-using Volo.Abp.PermissionManagement.HttpApi;
 
 namespace EventHub
 {
     [DependsOn(
         typeof(EventHubApplicationContractsModule),
-        typeof(AbpAccountHttpApiModule),
-        typeof(AbpIdentityHttpApiModule),
-        typeof(AbpPermissionManagementHttpApiModule)
+        typeof(AbpAspNetCoreMvcModule)
         )]
     public class EventHubHttpApiModule : AbpModule
     {

src/EventHub.Web/EventHub.Web.csproj

@@ -13,6 +13,11 @@
     <PreserveCompilationReferences>true</PreserveCompilationReferences>
     <UserSecretsId>EventHub-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
   </PropertyGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\EventHub.HttpApi\EventHub.HttpApi.csproj" />
+    <ProjectReference Include="..\EventHub.HttpApi.Client\EventHub.HttpApi.Client.csproj" />
+  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
@@ -21,6 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.2.1" />
     <PackageReference Include="Volo.Abp.Autofac" Version="4.2.1" />
     <PackageReference Include="Volo.Abp.AutoMapper" Version="4.2.1" />
     <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.2.1" />
@@ -31,8 +37,6 @@
     <PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="4.2.1" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.2.1" />
     <PackageReference Include="Volo.Abp.Swashbuckle" Version="4.2.1" />
-    <ProjectReference Include="..\EventHub.HttpApi\EventHub.HttpApi.csproj" />
-    <ProjectReference Include="..\EventHub.HttpApi.Client\EventHub.HttpApi.Client.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/EventHub.Web/EventHubWebModule.cs

@@ -12,6 +12,7 @@ using EventHub.Web.Menus;
 using StackExchange.Redis;
 using Microsoft.OpenApi.Models;
 using Volo.Abp;
+using Volo.Abp.Account;
 using Volo.Abp.AspNetCore.Authentication.OpenIdConnect;
 using Volo.Abp.AspNetCore.Mvc.Client;
 using Volo.Abp.AspNetCore.Mvc.Localization;
@@ -45,7 +46,8 @@ namespace EventHub.Web
         typeof(AbpCachingStackExchangeRedisModule),
         typeof(AbpHttpClientIdentityModelWebModule),
         typeof(AbpAspNetCoreSerilogModule),
-        typeof(AbpSwashbuckleModule)
+        typeof(AbpSwashbuckleModule),
+        typeof(AbpAccountApplicationContractsModule)
         )]
     public class EventHubWebModule : AbpModule
     {

tye.yaml

@@ -11,7 +11,7 @@ services:
     - protocol: https
       port: 44313
   env:
-    - Kestrel__Certificates__Default__Path=../../dev-cert/localhost.pfx
+    - Kestrel__Certificates__Default__Path=../../etc/dev-cert/localhost.pfx
     - Kestrel__Certificates__Default__Password=e8202f07-66e5-4619-be07-72ba76fde97f
 - name: api
   project: src/EventHub.HttpApi.Host/EventHub.HttpApi.Host.csproj
@@ -19,7 +19,7 @@ services:
     - protocol: https
       port: 44362
   env:
-    - Kestrel__Certificates__Default__Path=../../dev-cert/localhost.pfx
+    - Kestrel__Certificates__Default__Path=../../etc/dev-cert/localhost.pfx
     - Kestrel__Certificates__Default__Password=e8202f07-66e5-4619-be07-72ba76fde97f  
 - name: web
   project: src/EventHub.Web/EventHub.Web.csproj
@@ -27,7 +27,7 @@ services:
     - protocol: https
       port: 44308
   env:
-    - Kestrel__Certificates__Default__Path=../../dev-cert/localhost.pfx
+    - Kestrel__Certificates__Default__Path=../../etc/dev-cert/localhost.pfx
     - Kestrel__Certificates__Default__Password=e8202f07-66e5-4619-be07-72ba76fde97f  
 - name: web-admin
   project: src/EventHub.Admin.Web/EventHub.Admin.Web.csproj
@@ -35,7 +35,7 @@ services:
     - protocol: https
       port: 44307
   env:
-    - Kestrel__Certificates__Default__Path=../../dev-cert/localhost.pfx
+    - Kestrel__Certificates__Default__Path=../../etc/dev-cert/localhost.pfx
     - Kestrel__Certificates__Default__Password=e8202f07-66e5-4619-be07-72ba76fde97f  
 - name: background-services
   project: src/EventHub.BackgroundServices/EventHub.BackgroundServices.csproj