From 689b54f91419bca234f5b57d7e985d2cba52beee Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 16:00:34 +0300 Subject: [PATCH] PermissionOptions to AbpPermissionOptions --- .../Volo/Abp/Authorization/AbpAuthorizationModule.cs | 4 ++-- .../{PermissionOptions.cs => AbpPermissionOptions.cs} | 4 ++-- .../Authorization/Permissions/PermissionDefinitionManager.cs | 4 ++-- .../Permissions/PermissionValueProviderManager.cs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/{PermissionOptions.cs => AbpPermissionOptions.cs} (84%) diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs index 5a9c3fa4db..86b2b18d04 100644 --- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs +++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs @@ -29,7 +29,7 @@ namespace Volo.Abp.Authorization context.Services.AddSingleton(); - Configure(options => + Configure(options => { options.ValueProviders.Add(); options.ValueProviders.Add(); @@ -49,7 +49,7 @@ namespace Volo.Abp.Authorization } }); - services.Configure(options => + services.Configure(options => { options.DefinitionProviders.AddIfNotContains(definitionProviders); }); diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionOptions.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/AbpPermissionOptions.cs similarity index 84% rename from framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionOptions.cs rename to framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/AbpPermissionOptions.cs index 30c1170e49..ce9dc06798 100644 --- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionOptions.cs +++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/AbpPermissionOptions.cs @@ -2,13 +2,13 @@ namespace Volo.Abp.Authorization.Permissions { - public class PermissionOptions + public class AbpPermissionOptions { public ITypeList DefinitionProviders { get; } public ITypeList ValueProviders { get; } - public PermissionOptions() + public AbpPermissionOptions() { DefinitionProviders = new TypeList(); ValueProviders = new TypeList(); diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinitionManager.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinitionManager.cs index bb58089c82..7e193feda0 100644 --- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinitionManager.cs +++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinitionManager.cs @@ -16,12 +16,12 @@ namespace Volo.Abp.Authorization.Permissions protected IDictionary PermissionDefinitions => _lazyPermissionDefinitions.Value; private readonly Lazy> _lazyPermissionDefinitions; - protected PermissionOptions Options { get; } + protected AbpPermissionOptions Options { get; } private readonly IServiceProvider _serviceProvider; public PermissionDefinitionManager( - IOptions options, + IOptions options, IServiceProvider serviceProvider) { _serviceProvider = serviceProvider; diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionValueProviderManager.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionValueProviderManager.cs index 323ccb1c2e..d26297a258 100644 --- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionValueProviderManager.cs +++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionValueProviderManager.cs @@ -12,11 +12,11 @@ namespace Volo.Abp.Authorization.Permissions public IReadOnlyList ValueProviders => _lazyProviders.Value; private readonly Lazy> _lazyProviders; - protected PermissionOptions Options { get; } + protected AbpPermissionOptions Options { get; } public PermissionValueProviderManager( IServiceProvider serviceProvider, - IOptions options) + IOptions options) { Options = options.Value;