Merge pull request #2753 from abpframework/Default-roles-on-registration

Default roles on registration

modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using Volo.Abp.Account.Settings;
 using Volo.Abp.Application.Services;
@@ -9,11 +10,14 @@ namespace Volo.Abp.Account
 {
     public class AccountAppService : ApplicationService, IAccountAppService
     {
+        private readonly IIdentityRoleRepository _roleRepository;
         protected IdentityUserManager UserManager { get; }
 
         public AccountAppService(
-            IdentityUserManager userManager)
+            IdentityUserManager userManager,
+            IIdentityRoleRepository roleRepository)
         {
+            _roleRepository = roleRepository;
             UserManager = userManager;
         }
 
@@ -25,9 +29,20 @@ namespace Volo.Abp.Account
 
             (await UserManager.CreateAsync(user, input.Password).ConfigureAwait(false)).CheckErrors();
 
+            await UserManager.SetEmailAsync(user,input.EmailAddress).ConfigureAwait(false);
+
+            await SetDefaultRolesAsync(user);
+
             return ObjectMapper.Map<IdentityUser, IdentityUserDto>(user);
         }
 
+        protected virtual async Task SetDefaultRolesAsync(IdentityUser user)
+        {
+            var defaultRoles = await _roleRepository.GetDefaultOnesAsync().ConfigureAwait(false);
+
+            await UserManager.SetRolesAsync(user, defaultRoles.Select(r => r.Name)).ConfigureAwait(false);
+        }
+
         protected virtual async Task CheckSelfRegistrationAsync()
         {
             if (!await SettingProvider.IsTrueAsync(AccountSettingNames.IsSelfRegistrationEnabled).ConfigureAwait(false))

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs

@@ -1,8 +1,10 @@
 using System.ComponentModel.DataAnnotations;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.Account.Settings;
+using Volo.Abp.Application.Dtos;
 using Volo.Abp.Identity;
 using Volo.Abp.Settings;
 using Volo.Abp.Uow;
@@ -12,6 +14,8 @@ namespace Volo.Abp.Account.Web.Pages.Account
 {
     public class RegisterModel : AccountPageModel
     {
+        private readonly IAccountAppService _accountAppService;
+
         [BindProperty(SupportsGet = true)]
         public string ReturnUrl { get; set; }
 
@@ -21,7 +25,12 @@ namespace Volo.Abp.Account.Web.Pages.Account
         [BindProperty]
         public PostInput Input { get; set; }
 
-        public virtual async Task OnGet()
+        public RegisterModel(IAccountAppService accountAppService)
+        {
+            _accountAppService = accountAppService;
+        }
+
+        public virtual async Task OnGetAsync()
         {
             await CheckSelfRegistrationAsync().ConfigureAwait(false);
         }
@@ -33,11 +42,16 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             await CheckSelfRegistrationAsync().ConfigureAwait(false);
 
-            var user = new IdentityUser(GuidGenerator.Create(), Input.UserName, Input.EmailAddress, CurrentTenant.Id);
+            var registerDto = new RegisterDto
+            {
+                AppName = "MVC",
+                EmailAddress = Input.EmailAddress,
+                Password = Input.Password,
+                UserName = Input.UserName
+            };
 
-            (await UserManager.CreateAsync(user, Input.Password).ConfigureAwait(false)).CheckErrors();
-
-            await UserManager.SetEmailAsync(user, Input.EmailAddress).ConfigureAwait(false);
+            var userDto = await _accountAppService.RegisterAsync(registerDto);
+            var user = await UserManager.GetByIdAsync(userDto.Id);
 
             await SignInManager.SignInAsync(user, isPersistent: false).ConfigureAwait(false);
 

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs

@@ -21,5 +21,10 @@ namespace Volo.Abp.Identity
             bool includeDetails = false,
             CancellationToken cancellationToken = default
         );
+
+        Task<List<IdentityRole>> GetDefaultOnesAsync(
+            bool includeDetails = false,
+            CancellationToken cancellationToken = default
+        );
     }
 }

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityRoleRepository.cs

@@ -42,6 +42,12 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 .ToListAsync(GetCancellationToken(cancellationToken)).ConfigureAwait(false);
         }
 
+        public virtual async Task<List<IdentityRole>> GetDefaultOnesAsync(
+            bool includeDetails = false, CancellationToken cancellationToken = default)
+        {
+            return await DbSet.IncludeDetails(includeDetails).Where(r => r.IsDefault).ToListAsync(GetCancellationToken(cancellationToken));
+        }
+
         public override IQueryable<IdentityRole> WithDetails()
         {
             return GetQueryable().IncludeDetails();

modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs

@@ -43,5 +43,11 @@ namespace Volo.Abp.Identity.MongoDB
                 .PageBy<IdentityRole, IMongoQueryable<IdentityRole>>(skipCount, maxResultCount)
                 .ToListAsync(GetCancellationToken(cancellationToken)).ConfigureAwait(false);
         }
+
+        public virtual async Task<List<IdentityRole>> GetDefaultOnesAsync(
+            bool includeDetails = false, CancellationToken cancellationToken = default)
+        {
+            return await GetMongoQueryable().Where(r => r.IsDefault).ToListAsync(cancellationToken: GetCancellationToken(cancellationToken));
+        }
     }
 }

modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityRoleRepository_Tests.cs

@@ -36,6 +36,17 @@ namespace Volo.Abp.Identity
             roles.ShouldContain(r => r.Name == "supporter");
         }
 
+        [Fact]
+        public async Task GetDefaultOnesAsync()
+        {
+            var roles = await RoleRepository.GetDefaultOnesAsync().ConfigureAwait(false);
+
+            foreach (var role in roles)
+            {
+                role.IsDefault.ShouldBe(true);
+            }
+        }
+
         [Fact]
         public async Task GetCountAsync()
         {