From 3ffe3cf9b79b44ceaa1546ed3c81a05687371404 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Thu, 24 Jan 2019 14:58:07 +0300 Subject: [PATCH] docs module fixed for permission changes --- .../app/Volo.DocsTestApp/DocsTestAppModule.cs | 31 ++++++++++++++----- .../Volo.DocsTestApp/Volo.DocsTestApp.csproj | 2 ++ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/modules/docs/app/Volo.DocsTestApp/DocsTestAppModule.cs b/modules/docs/app/Volo.DocsTestApp/DocsTestAppModule.cs index 0dadf4fc28..46835ccde9 100644 --- a/modules/docs/app/Volo.DocsTestApp/DocsTestAppModule.cs +++ b/modules/docs/app/Volo.DocsTestApp/DocsTestAppModule.cs @@ -16,12 +16,15 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AspNetCore.Mvc.UI.Theming; +using Volo.Abp.Authorization.Permissions; using Volo.Abp.Autofac; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Identity; using Volo.Abp.Identity.Web; using Volo.Abp.Modularity; +using Volo.Abp.PermissionManagement; +using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.Threading; using Volo.Abp.UI; using Volo.Abp.VirtualFileSystem; @@ -41,6 +44,8 @@ namespace Volo.DocsTestApp typeof(AbpAccountWebModule), typeof(AbpIdentityWebModule), typeof(AbpIdentityApplicationModule), + typeof(AbpPermissionManagementDomainIdentityModule), + typeof(AbpPermissionManagementApplicationModule), typeof(AbpAspNetCoreMvcUiBasicThemeModule) )] public class DocsTestAppModule : AbpModule @@ -127,15 +132,25 @@ namespace Volo.DocsTestApp template: "{controller=Home}/{action=Index}/{id?}"); }); - AsyncHelper.RunSync(async () => + using (var scope = context.ServiceProvider.CreateScope()) { - await context.ServiceProvider - .GetRequiredService() - .SeedAsync( - "1q2w3E*", - IdentityPermissions.GetAll().Union(DocsAdminPermissions.GetAll()) - ); - }); + AsyncHelper.RunSync(async () => + { + await context.ServiceProvider + .GetRequiredService() + .SeedAsync( + "1q2w3E*" + ); + + await scope.ServiceProvider + .GetRequiredService() + .SeedAsync( + RolePermissionValueProvider.ProviderName, + "admin", + IdentityPermissions.GetAll().Union(DocsAdminPermissions.GetAll()) + ); + }); + } } } } diff --git a/modules/docs/app/Volo.DocsTestApp/Volo.DocsTestApp.csproj b/modules/docs/app/Volo.DocsTestApp/Volo.DocsTestApp.csproj index 9a46ccbb8e..d1065535b9 100644 --- a/modules/docs/app/Volo.DocsTestApp/Volo.DocsTestApp.csproj +++ b/modules/docs/app/Volo.DocsTestApp/Volo.DocsTestApp.csproj @@ -26,6 +26,8 @@ + +