Add RequestedClaims to AbpClaimsPrincipalOptions

framework/src/Volo.Abp.Security/Volo/Abp/Security/AbpSecurityModule.cs

@@ -61,7 +61,7 @@ namespace Volo.Abp.Security
                 }
             });
 
-            services.Configure<AbpClaimsPrincipalFactoryOptions>(options =>
+            services.Configure<AbpClaimsPrincipalOptions>(options =>
             {
                 options.Contributors.AddIfNotContains(contributorTypes);
             });

framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactory.cs

@@ -9,11 +9,11 @@ namespace Volo.Abp.Security.Claims
     public class AbpClaimsPrincipalFactory : IAbpClaimsPrincipalFactory, ITransientDependency
     {
         protected IServiceScopeFactory ServiceScopeFactory { get; }
-        protected AbpClaimsPrincipalFactoryOptions Options { get; }
+        protected AbpClaimsPrincipalOptions Options { get; }
 
         public AbpClaimsPrincipalFactory(
             IServiceScopeFactory serviceScopeFactory,
-            IOptions<AbpClaimsPrincipalFactoryOptions> abpClaimOptions)
+            IOptions<AbpClaimsPrincipalOptions> abpClaimOptions)
         {
             ServiceScopeFactory = serviceScopeFactory;
             Options = abpClaimOptions.Value;

framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactoryOptions.cs

@@ -1,14 +0,0 @@
-using Volo.Abp.Collections;
-
-namespace Volo.Abp.Security.Claims
-{
-    public class AbpClaimsPrincipalFactoryOptions
-    {
-        public ITypeList<IAbpClaimsPrincipalContributor> Contributors { get; }
-
-        public AbpClaimsPrincipalFactoryOptions()
-        {
-            Contributors = new TypeList<IAbpClaimsPrincipalContributor>();
-        }
-    }
-}

framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalOptions.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using Volo.Abp.Collections;
+
+namespace Volo.Abp.Security.Claims
+{
+    public class AbpClaimsPrincipalOptions
+    {
+        public ITypeList<IAbpClaimsPrincipalContributor> Contributors { get; }
+
+        public List<string> RequestedClaims { get; }
+
+        public AbpClaimsPrincipalOptions()
+        {
+            Contributors = new TypeList<IAbpClaimsPrincipalContributor>();
+            RequestedClaims = new List<string>();
+        }
+    }
+}

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsService.cs

@@ -4,12 +4,15 @@ using System.Security.Claims;
 using IdentityModel;
 using IdentityServer4.Services;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Volo.Abp.Security.Claims;
 
 namespace Volo.Abp.IdentityServer
 {
     public class AbpClaimsService : DefaultClaimsService
     {
+        protected readonly AbpClaimsPrincipalOptions Options;
+
         private static readonly string[] AdditionalOptionalClaimNames =
         {
             AbpClaimTypes.TenantId,
@@ -20,20 +23,21 @@ namespace Volo.Abp.IdentityServer
             JwtClaimTypes.FamilyName,
         };
 
-        public AbpClaimsService(IProfileService profile, ILogger<DefaultClaimsService> logger)
+        public AbpClaimsService(
+            IProfileService profile,
+            ILogger<DefaultClaimsService> logger,
+            IOptions<AbpClaimsPrincipalOptions> options)
             : base(profile, logger)
         {
+            Options = options.Value;
         }
 
         protected override IEnumerable<string> FilterRequestedClaimTypes(IEnumerable<string> claimTypes)
         {
             return base.FilterRequestedClaimTypes(claimTypes)
-                .Union(new []{
+                .Union(Options.RequestedClaims);
-                    AbpClaimTypes.TenantId, 
-                    AbpClaimTypes.EditionId
-                });
         }
-        
+
         protected override IEnumerable<Claim> GetOptionalClaims(ClaimsPrincipal subject)
         {
             return base.GetOptionalClaims(subject)
@@ -52,4 +56,4 @@ namespace Volo.Abp.IdentityServer
             }
         }
     }
-}
+}

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs

@@ -10,7 +10,6 @@ using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.Identity;
 using Volo.Abp.IdentityServer.ApiResources;
 using Volo.Abp.IdentityServer.AspNetIdentity;
-using Volo.Abp.IdentityServer.ApiScopes;
 using Volo.Abp.IdentityServer.Clients;
 using Volo.Abp.IdentityServer.Devices;
 using Volo.Abp.IdentityServer.IdentityResources;
@@ -19,6 +18,7 @@ using Volo.Abp.Modularity;
 using Volo.Abp.ObjectExtending;
 using Volo.Abp.ObjectExtending.Modularity;
 using Volo.Abp.Security;
+using Volo.Abp.Security.Claims;
 using Volo.Abp.Validation;
 using Volo.Abp.Threading;
 
@@ -54,6 +54,14 @@ namespace Volo.Abp.IdentityServer
                 options.EtoMappings.Add<IdentityResource, IdentityResourceEto>(typeof(AbpIdentityServerDomainModule));
             });
 
+            Configure<AbpClaimsPrincipalOptions>(options =>
+            {
+                options.RequestedClaims.AddRange(new []{
+                    AbpClaimTypes.TenantId,
+                    AbpClaimTypes.EditionId
+                });
+            });
+
             AddIdentityServer(context.Services);
         }
 

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpProfileService.cs

@@ -24,7 +24,7 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
         }
 
         [UnitOfWork]
-        public async override Task GetProfileDataAsync(ProfileDataRequestContext context)
+        public override async Task GetProfileDataAsync(ProfileDataRequestContext context)
         {
             using (CurrentTenant.Change(context.Subject.FindTenantId()))
             {
@@ -33,7 +33,7 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
         }
 
         [UnitOfWork]
-        public async override Task IsActiveAsync(IsActiveContext context)
+        public override async Task IsActiveAsync(IsActiveContext context)
         {
             using (CurrentTenant.Change(context.Subject.FindTenantId()))
             {