From 79ccfcaff56674c34af031b9eb14b4469e34737e Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 27 May 2019 17:25:08 +0300 Subject: [PATCH] Improve Web.Host for the service template. --- ...nyName.MyProjectName.IdentityServer.csproj | 1 + .../MyProjectNameIdentityServerModule.cs | 2 ++ .../Menus/MyProjectNameMenuContributor.cs | 34 ------------------- ...yCompanyName.MyProjectName.Web.Host.csproj | 1 + .../MyProjectNameWebModule.cs | 19 ++++------- .../Pages/Index.cshtml | 18 ++++------ .../Pages/Index.css | 3 -- .../Pages/Index.js | 3 -- 8 files changed, 17 insertions(+), 64 deletions(-) delete mode 100644 templates/service/host/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs delete mode 100644 templates/service/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.css delete mode 100644 templates/service/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.js diff --git a/templates/service/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj b/templates/service/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj index 49777f1e8f..b1d532024c 100644 --- a/templates/service/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj +++ b/templates/service/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj @@ -29,6 +29,7 @@ + diff --git a/templates/service/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/service/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index ad6c792d98..31c4ef1cd0 100644 --- a/templates/service/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/service/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -25,6 +25,7 @@ using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.PermissionManagement.HttpApi; +using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement.EntityFrameworkCore; @@ -45,6 +46,7 @@ namespace MyCompanyName.MyProjectName typeof(AbpIdentityApplicationModule), typeof(AbpIdentityHttpApiModule), typeof(AbpIdentityServerEntityFrameworkCoreModule), + typeof(AbpPermissionManagementDomainIdentityModule), typeof(AbpPermissionManagementEntityFrameworkCoreModule), typeof(AbpPermissionManagementApplicationModule), typeof(AbpPermissionManagementHttpApiModule), diff --git a/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs b/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs deleted file mode 100644 index 3c1f22206a..0000000000 --- a/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Localization; -using MyCompanyName.MyProjectName.Localization; -using MyCompanyName.MyProjectName.MultiTenancy; -using Volo.Abp.TenantManagement.Web.Navigation; -using Volo.Abp.UI.Navigation; - -namespace MyCompanyName.MyProjectName.Menus -{ - public class MyProjectNameMenuContributor : IMenuContributor - { - public async Task ConfigureMenuAsync(MenuConfigurationContext context) - { - if (context.Menu.Name == StandardMenus.Main) - { - await ConfigureMainMenuAsync(context); - } - } - - private async Task ConfigureMainMenuAsync(MenuConfigurationContext context) - { - if (!MultiTenancyConsts.IsEnabled) - { - var administration = context.Menu.GetAdministration(); - administration.TryRemoveMenuItem(TenantManagementMenuNames.GroupName); - } - - var l = context.ServiceProvider.GetRequiredService>(); - - context.Menu.Items.Insert(0, new ApplicationMenuItem("MyProjectName.Home", l["Menu:Home"], "/")); - } - } -} diff --git a/templates/service/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/service/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index d01677b254..a69d76e1ee 100644 --- a/templates/service/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/service/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -24,6 +24,7 @@ + diff --git a/templates/service/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/service/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index a96909dccd..121296cc1f 100644 --- a/templates/service/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/service/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using MyCompanyName.MyProjectName.Menus; using Swashbuckle.AspNetCore.Swagger; using System.IO; -using Microsoft.AspNetCore.Authentication.OAuth.Claims; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Configuration; using Microsoft.IdentityModel.Protocols.OpenIdConnect; @@ -27,7 +27,9 @@ using Volo.Abp.Identity; using Volo.Abp.Identity.Web; using Volo.Abp.Modularity; using Volo.Abp.MultiTenancy; +using Volo.Abp.PermissionManagement; using Volo.Abp.PermissionManagement.Web; +using Volo.Abp.Security.Claims; using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement.Web; using Volo.Abp.Ui.Navigation.Urls; @@ -48,7 +50,8 @@ namespace MyCompanyName.MyProjectName typeof(AbpIdentityWebModule), typeof(AbpIdentityHttpApiClientModule), typeof(AbpTenantManagementWebModule), - typeof(AbpTenantManagementHttpApiClientModule) + typeof(AbpTenantManagementHttpApiClientModule), + typeof(AbpPermissionManagementHttpApiClientModule) )] public class MyProjectNameWebModule : AbpModule { @@ -74,7 +77,6 @@ namespace MyCompanyName.MyProjectName ConfigureAuthentication(context, configuration); ConfigureAutoMapper(); ConfigureVirtualFileSystem(hostingEnvironment); - ConfigureNavigationServices(); ConfigureSwaggerServices(context.Services); ConfigureMultiTenancy(); ConfigureRedis(context, configuration, hostingEnvironment); @@ -125,7 +127,8 @@ namespace MyCompanyName.MyProjectName options.Scope.Add("phone"); options.Scope.Add("MyProjectName"); - options.ClaimActions.MapAbpClaimTypes(); + options.ClaimActions.MapJsonKey(AbpClaimTypes.UserName, "name"); + options.ClaimActions.DeleteClaim("name"); }); } @@ -163,14 +166,6 @@ namespace MyCompanyName.MyProjectName } } - private void ConfigureNavigationServices() - { - Configure(options => - { - options.MenuContributors.Add(new MyProjectNameMenuContributor()); - }); - } - private void ConfigureSwaggerServices(IServiceCollection services) { services.AddSwaggerGen( diff --git a/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml b/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml index c99ff43169..30248e8f44 100644 --- a/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml +++ b/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml @@ -2,26 +2,20 @@ @using MyCompanyName.MyProjectName.Pages @inherits MyProjectNamePageBase @model IndexModel -@section styles { - - - -} -@section scripts { - - - -} - @L["Welcome"] + Welcome -

@L["LongWelcomeMessage"]

@if (!CurrentUser.IsAuthenticated) {
} + else + { + Claims
+ @Html.Raw(CurrentUser.GetAllClaims().Select(c => $"{c.Type}={c.Value}").OrderBy(x => x).JoinAsString("
")) + }

abp.io

 diff --git a/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.css b/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.css deleted file mode 100644 index 3f73b78b9f..0000000000 --- a/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - -} diff --git a/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.js b/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.js deleted file mode 100644 index 46f089b9c7..0000000000 --- a/templates/service/host/MyCompanyName.MyProjectName.Web.Host/Pages/Index.js +++ /dev/null @@ -1,3 +0,0 @@ -$(function () { - abp.log.debug('Index.js initialized!'); -}); \ No newline at end of file