Merge pull request #8693 from abpframework/auto-merge/rel-4-3/323

Merge branch dev with rel-4.3

docs/en/Authorization.md

@@ -393,6 +393,35 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
 This is already done for the startup template integration tests.
 
+### Claims Principal Factory
+
+Claims are important elements of authentication and authorization. ABP uses the `IAbpClaimsPrincipalFactory` service to create claims on authentication. This service was designed as extensible. If you need to add your custom claims to the authentication ticket, you can implement the `IAbpClaimsPrincipalContributor` in your application.
+
+**Example: Add a `SocialSecurityNumber` claim:**
+
+```csharp
+public class SocialSecurityNumberClaimsPrincipalContributor : IAbpClaimsPrincipalContributor, ITransientDependency
+{
+    public async Task ContributeAsync(AbpClaimsPrincipalContributorContext context)
+    {
+        var identity = context.ClaimsPrincipal.Identities.FirstOrDefault();
+        if (identity != null)
+        {
+            var currentUser = context.ServiceProvider.GetRequiredService<ICurrentUser>();
+            if (currentUser.Id.HasValue)
+            {
+                var userService = context.ServiceProvider.GetRequiredService<IUserService>(); //Your custom service
+                var socialSecurityNumber = await userService.GetSocialSecurityNumberAsync(currentUser.Id.Value);
+                if (userService != null)
+                {
+                    identity.AddOrReplace(new Claim("SocialSecurityNumber", userService));
+                }
+            }
+        }
+    }
+}
+```
+
 ## See Also
 
 * [Permission Management Module](Modules/Permission-Management.md)

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs

@@ -77,17 +77,25 @@ namespace Volo.Abp.Cli.Bundling
                     BundleName = bundleConfig.Name.IsNullOrEmpty() ? "global" : bundleConfig.Name,
                     Minify = bundleConfig.Mode == BundlingMode.BundleAndMinify
                 };
-
+                
+                Logger.LogInformation("Generating style bundle...");
                 styleDefinitions = StyleBundler.Bundle(options, styleContext);
+                Logger.LogInformation($"Style bundle has been generated successfully.");
+                
+                Logger.LogInformation("Generating script bundle...");
                 scriptDefinitions = ScriptBundler.Bundle(options, scriptContext);
+                Logger.LogInformation($"Script bundle has been generated successfully.");
             }
             else
             {
+                Logger.LogInformation("Generating style references...");
                 styleDefinitions = GenerateStyleDefinitions(styleContext);
+                Logger.LogInformation("Generating script references...");
                 scriptDefinitions = GenerateScriptDefinitions(scriptContext);
             }
-
+            
             await UpdateDependenciesInHtmlFileAsync(directory, styleDefinitions, scriptDefinitions);
+            Logger.LogInformation("Script and style references in the index.html file have been updated.");
         }
 
         private BundleContext GetScriptContext(List<BundleTypeDefinition> bundleDefinitions,

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/IAbpCommonDbContextRegistrationOptionsBuilder.cs

@@ -9,43 +9,42 @@ namespace Volo.Abp.DependencyInjection
         IServiceCollection Services { get; }
 
         /// <summary>
-        /// Registers default repositories for this DbContext.
+        /// Registers default repositories for all the entities in this DbContext.
         /// </summary>
         /// <param name="includeAllEntities">
         /// Registers repositories only for aggregate root entities by default.
-        /// set <paramref name="includeAllEntities"/> to true to include all entities.
+        /// Set <paramref name="includeAllEntities"/> to true to include all entities.
         /// </param>
         IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false);
 
         /// <summary>
-        /// Registers default repositories for this DbContext.
+        /// Registers default repositories for all the entities in this DbContext.
         /// Default repositories will use given <see cref="TDefaultRepositoryDbContext"/>.
         /// </summary>
         /// <typeparam name="TDefaultRepositoryDbContext">DbContext type that will be used by default repositories</typeparam>
         /// <param name="includeAllEntities">
         /// Registers repositories only for aggregate root entities by default.
-        /// set <see cref="includeAllEntities"/> to true to include all entities.
+        /// Set <see cref="includeAllEntities"/> to true to include all entities.
         /// </param>
         IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories<TDefaultRepositoryDbContext>(bool includeAllEntities = false);
 
         /// <summary>
-        /// Registers default repositories for this DbContext.
+        /// Registers default repositories for all the entities in this DbContext.
         /// Default repositories will use given <see cref="defaultRepositoryDbContextType"/>.
         /// </summary>
         /// <param name="defaultRepositoryDbContextType">DbContext type that will be used by default repositories</param>
         /// <param name="includeAllEntities">
         /// Registers repositories only for aggregate root entities by default.
-        /// set <see cref="includeAllEntities"/> to true to include all entities.
+        /// Set <see cref="includeAllEntities"/> to true to include all entities.
         /// </param>
         IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(Type defaultRepositoryDbContextType, bool includeAllEntities = false);
 
         /// <summary>
-        /// Registers custom repository for a specific entity.
+        /// Registers default repository for a specific entity.
         /// </summary>
         /// <typeparam name="TEntity">Entity type</typeparam>
         IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepository<TEntity>();
 
-
         /// <summary>
         /// Registers default repository for a specific entity.
         /// </summary>

framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureDefinitionExtensions.cs

@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System;
+using JetBrains.Annotations;
 using Volo.Abp.Authorization.Permissions;
 
 namespace Volo.Abp.GlobalFeatures
@@ -6,12 +7,12 @@ namespace Volo.Abp.GlobalFeatures
     public static class GlobalFeatureDefinitionExtensions
     {
         public static PermissionDefinition RequireGlobalFeatures(
-            this PermissionDefinition permissionDefinition, 
+            this PermissionDefinition permissionDefinition,
             params string[] globalFeatures)
         {
             return permissionDefinition.RequireGlobalFeatures(true, globalFeatures);
         }
-        
+
         public static PermissionDefinition RequireGlobalFeatures(
             [NotNull] this PermissionDefinition permissionDefinition,
             bool requiresAll,
@@ -25,5 +26,25 @@ namespace Volo.Abp.GlobalFeatures
             );
         }
 
+        public static PermissionDefinition RequireGlobalFeatures(
+            this PermissionDefinition permissionDefinition,
+            params Type[] globalFeatures)
+        {
+            return permissionDefinition.RequireGlobalFeatures(true, globalFeatures);
+        }
+
+        public static PermissionDefinition RequireGlobalFeatures(
+            [NotNull] this PermissionDefinition permissionDefinition,
+            bool requiresAll,
+            params Type[] globalFeatures)
+        {
+            Check.NotNull(permissionDefinition, nameof(permissionDefinition));
+            Check.NotNullOrEmpty(globalFeatures, nameof(globalFeatures));
+
+            return permissionDefinition.AddStateProviders(
+                new RequireGlobalFeaturesPermissionStateProvider(requiresAll, globalFeatures)
+            );
+        }
+
     }
 }

framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/RequireGlobalFeaturesPermissionStateProvider.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.Authorization.Permissions;
 
@@ -13,7 +14,7 @@ namespace Volo.Abp.GlobalFeatures
             : this(true, globalFeatureNames)
         {
         }
-        
+
         public RequireGlobalFeaturesPermissionStateProvider(bool requiresAll, params string[] globalFeatureNames)
         {
             Check.NotNullOrEmpty(globalFeatureNames, nameof(globalFeatureNames));
@@ -22,12 +23,20 @@ namespace Volo.Abp.GlobalFeatures
             _globalFeatureNames = globalFeatureNames;
         }
 
+        public RequireGlobalFeaturesPermissionStateProvider(bool requiresAll, params Type[] globalFeatureNames)
+        {
+            Check.NotNullOrEmpty(globalFeatureNames, nameof(globalFeatureNames));
+
+            _requiresAll = requiresAll;
+            _globalFeatureNames = globalFeatureNames.Select(GlobalFeatureNameAttribute.GetName).ToArray();
+        }
+
         public Task<bool> IsEnabledAsync(PermissionStateContext context)
         {
             bool isEnabled = _requiresAll
                 ? _globalFeatureNames.All(x => GlobalFeatureManager.Instance.IsEnabled(x))
                 : _globalFeatureNames.Any(x => GlobalFeatureManager.Instance.IsEnabled(x));
-            
+
             return Task.FromResult(isEnabled);
         }
     }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs

@@ -13,41 +13,48 @@ namespace Volo.CmsKit.Permissions
         {
             var cmsGroup = context.GetGroupOrNull(CmsKitAdminPermissions.GroupName) ?? context.AddGroup(CmsKitAdminPermissions.GroupName, L("Permission:CmsKit"));
 
-            if (GlobalFeatureManager.Instance.IsEnabled<CommentsFeature>())
-            {
-                var contentGroup = cmsGroup.AddPermission(CmsKitAdminPermissions.Comments.Default, L("Permission:Comments"));
-                contentGroup.AddChild(CmsKitAdminPermissions.Comments.Delete, L("Permission:Comments.Delete"));
-            }
-            
-            if (GlobalFeatureManager.Instance.IsEnabled<TagsFeature>())
-            {
-                var tagGroup = cmsGroup.AddPermission(CmsKitAdminPermissions.Tags.Default, L("Permission:TagManagement"));
-                tagGroup.AddChild(CmsKitAdminPermissions.Tags.Create, L("Permission:TagManagement.Create"));
-                tagGroup.AddChild(CmsKitAdminPermissions.Tags.Update, L("Permission:TagManagement.Update"));
-                tagGroup.AddChild(CmsKitAdminPermissions.Tags.Delete, L("Permission:TagManagement.Delete"));
-            }
+            var contentGroup = cmsGroup.AddPermission(CmsKitAdminPermissions.Comments.Default, L("Permission:Comments"))
+                .RequireGlobalFeatures(typeof(CommentsFeature));
+            contentGroup.AddChild(CmsKitAdminPermissions.Comments.Delete, L("Permission:Comments.Delete"))
+                .RequireGlobalFeatures(typeof(CommentsFeature));
 
-            if (GlobalFeatureManager.Instance.IsEnabled<PagesFeature>())
-            {
-                var pageManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.Pages.Default, L("Permission:PageManagement"));
-                pageManagement.AddChild(CmsKitAdminPermissions.Pages.Create, L("Permission:PageManagement:Create"));
-                pageManagement.AddChild(CmsKitAdminPermissions.Pages.Update, L("Permission:PageManagement:Update"));
-                pageManagement.AddChild(CmsKitAdminPermissions.Pages.Delete, L("Permission:PageManagement:Delete"));
-            }
+            var tagGroup = cmsGroup.AddPermission(CmsKitAdminPermissions.Tags.Default, L("Permission:TagManagement"))
+                .RequireGlobalFeatures(typeof(TagsFeature));
+            tagGroup.AddChild(CmsKitAdminPermissions.Tags.Create, L("Permission:TagManagement.Create"))
+                .RequireGlobalFeatures(typeof(TagsFeature));
+            tagGroup.AddChild(CmsKitAdminPermissions.Tags.Update, L("Permission:TagManagement.Update"))
+                .RequireGlobalFeatures(typeof(TagsFeature));
+            tagGroup.AddChild(CmsKitAdminPermissions.Tags.Delete, L("Permission:TagManagement.Delete"))
+                .RequireGlobalFeatures(typeof(TagsFeature));
 
-            if (GlobalFeatureManager.Instance.IsEnabled<BlogsFeature>())
-            {
-                var blogManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.Blogs.Default, L("Permission:BlogManagement"));
-                blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Create, L("Permission:BlogManagement.Create"));
-                blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Update, L("Permission:BlogManagement.Update"));
-                blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Delete, L("Permission:BlogManagement.Delete"));
-                blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Features, L("Permission:BlogManagement.Features"));
+            var pageManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.Pages.Default, L("Permission:PageManagement"))
+                .RequireGlobalFeatures(typeof(PagesFeature));
+            pageManagement.AddChild(CmsKitAdminPermissions.Pages.Create, L("Permission:PageManagement:Create"))
+                .RequireGlobalFeatures(typeof(PagesFeature));
+            pageManagement.AddChild(CmsKitAdminPermissions.Pages.Update, L("Permission:PageManagement:Update"))
+                .RequireGlobalFeatures(typeof(PagesFeature));
+            pageManagement.AddChild(CmsKitAdminPermissions.Pages.Delete, L("Permission:PageManagement:Delete"))
+                .RequireGlobalFeatures(typeof(PagesFeature));
 
-                var blogPostManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.BlogPosts.Default, L("Permission:BlogPostManagement"));
-                blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Create, L("Permission:BlogPostManagement.Create"));
-                blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Update, L("Permission:BlogPostManagement.Update"));
-                blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Delete, L("Permission:BlogPostManagement.Delete"));
-            }
+            var blogManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.Blogs.Default, L("Permission:BlogManagement"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+            blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Create, L("Permission:BlogManagement.Create"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+            blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Update, L("Permission:BlogManagement.Update"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+            blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Delete, L("Permission:BlogManagement.Delete"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+            blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Features, L("Permission:BlogManagement.Features"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+
+            var blogPostManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.BlogPosts.Default, L("Permission:BlogPostManagement"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+            blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Create, L("Permission:BlogPostManagement.Create"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+            blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Update, L("Permission:BlogPostManagement.Update"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+            blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Delete, L("Permission:BlogPostManagement.Delete"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
         }
 
         private static LocalizableString L(string name)

npm/ng-packs/packages/core/src/lib/tokens/app-config.token.ts

@@ -0,0 +1,7 @@
+import { InjectionToken } from '@angular/core';
+
+export type AppInitErrorFn = (error: any) => void;
+
+export const APP_INIT_ERROR_HANDLERS = new InjectionToken<AppInitErrorFn[]>(
+  'APP_INIT_ERROR_HANDLERS',
+);

npm/ng-packs/packages/core/src/lib/tokens/index.ts

@@ -2,3 +2,4 @@ export * from './list.token';
 export * from './lodaer-delay.token';
 export * from './manage-profile.token';
 export * from './options.token';
+export * from './app-config.token';

npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts

@@ -1,7 +1,8 @@
 import { registerLocaleData } from '@angular/common';
 import { Injector } from '@angular/core';
 import { OAuthService } from 'angular-oauth2-oidc';
-import { tap } from 'rxjs/operators';
+import { tap, catchError } from 'rxjs/operators';
+import { throwError } from 'rxjs';
 import { ABP } from '../models/common';
 import { Environment } from '../models/environment';
 import { AbpApplicationConfigurationService } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service';
@@ -12,6 +13,7 @@ import { EnvironmentService } from '../services/environment.service';
 import { SessionStateService } from '../services/session-state.service';
 import { clearOAuthStorage } from '../strategies/auth-flow.strategy';
 import { CORE_OPTIONS } from '../tokens/options.token';
+import { APP_INIT_ERROR_HANDLERS } from '../tokens/app-config.token';
 import { getRemoteEnv } from './environment-utils';
 import { parseTenantFromUrl } from './multi-tenancy-utils';
 
@@ -38,6 +40,14 @@ export function getInitialData(injector: Injector) {
           const currentTenant = configState.getOne('currentTenant') as CurrentTenantDto;
           injector.get(SessionStateService).setTenant(currentTenant);
         }),
+        catchError(error => {
+          const appInitErrorHandlers = injector.get(APP_INIT_ERROR_HANDLERS);
+          if (appInitErrorHandlers && appInitErrorHandlers.length) {
+            appInitErrorHandlers.forEach(fn => fn(error));
+          }
+
+          return throwError(error);
+        }),
       )
       .toPromise();
   };