Make MVC application running again for new user and tenant service.

Author: hikalkan

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Users/Dto/CreateUserDto.cs

@@ -2,7 +2,6 @@
 using Abp.Auditing;
 using Abp.Authorization.Users;
 using Abp.AutoMapper;
-
 using AbpCompanyName.AbpProjectName.Authorization.Users;
 
 namespace AbpCompanyName.AbpProjectName.Users.Dto
@@ -35,10 +34,5 @@ public class CreateUserDto
         [StringLength(AbpUserBase.MaxPlainPasswordLength)]
         [DisableAuditing]
         public string Password { get; set; }
-
-        [Required]
-        [StringLength(AbpUserBase.MaxPlainPasswordLength)]
-        [DisableAuditing]
-        public string ConfirmPassword { get; set; }
     }
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Users/Dto/UserDto.cs

@@ -1,10 +1,8 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-
 using Abp.Application.Services.Dto;
 using Abp.Authorization.Users;
 using Abp.AutoMapper;
-
 using AbpCompanyName.AbpProjectName.Authorization.Users;
 
 namespace AbpCompanyName.AbpProjectName.Users.Dto
@@ -17,11 +15,11 @@ public class UserDto : EntityDto<long>
         public string UserName { get; set; }
 
         [Required]
-        [StringLength(User.MaxNameLength)]
+        [StringLength(AbpUserBase.MaxNameLength)]
         public string Name { get; set; }
 
         [Required]
-        [StringLength(User.MaxSurnameLength)]
+        [StringLength(AbpUserBase.MaxSurnameLength)]
         public string Surname { get; set; }
 
         [Required]
@@ -30,8 +28,11 @@ public class UserDto : EntityDto<long>
         public string EmailAddress { get; set; }
 
         public bool IsActive { get; set; }
+
         public string FullName { get; set; }
+
         public DateTime? LastLoginTime { get; set; }
+
         public DateTime CreationTime { get; set; }
 
         public string[] Roles { get; set; }

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs

@@ -8,6 +8,7 @@
 using AbpCompanyName.AbpProjectName.Users.Dto;
 using Microsoft.AspNetCore.Identity;
 using System.Linq;
+using Abp.Collections.Extensions;
 using Microsoft.EntityFrameworkCore;
 using Abp.IdentityFramework;
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
@@ -47,7 +48,11 @@ public override async Task<UserDto> Create(CreateUserDto input)
             user.IsEmailConfirmed = true;
 
             CheckErrors(await _userManager.CreateAsync(user));
-            CheckErrors(await _userManager.SetRoles(user, input.Roles));
+
+            if (input.Roles != null)
+            {
+                CheckErrors(await _userManager.SetRoles(user, input.Roles));
+            }
 
             CurrentUnitOfWork.SaveChanges();
 
@@ -63,8 +68,12 @@ public override async Task<UserDto> Update(UserDto input)
             MapToEntity(input, user);
 
             CheckErrors(await _userManager.UpdateAsync(user));
-            CheckErrors(await _userManager.SetRoles(user, input.Roles));
-            
+
+            if (input.Roles != null)
+            {
+                CheckErrors(await _userManager.SetRoles(user, input.Roles));
+            }
+
             return await Get(input);
         }
 

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/TenantsController.cs

@@ -1,4 +1,5 @@
-using Abp.Application.Services.Dto;
+using System.Threading.Tasks;
+using Abp.Application.Services.Dto;
 using Abp.AspNetCore.Mvc.Authorization;
 using AbpCompanyName.AbpProjectName.Authorization;
 using AbpCompanyName.AbpProjectName.Controllers;
@@ -17,9 +18,9 @@ public TenantsController(ITenantAppService tenantAppService)
             _tenantAppService = tenantAppService;
         }
 
-        public ActionResult Index()
+        public async Task<ActionResult> Index()
         {
-            var output = _tenantAppService.GetAll(new PagedResultRequestDto());
+            var output = await _tenantAppService.GetAll(new PagedResultRequestDto { MaxResultCount = int.MaxValue }); //Paging not implemented yet
             return View(output);
         }
     }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/UsersController.cs

@@ -20,7 +20,7 @@ public UsersController(IUserAppService userAppService)
 
         public async Task<ActionResult> Index()
         {
-            var output = await _userAppService.GetAll(new PagedResultRequestDto());
+            var output = await _userAppService.GetAll(new PagedResultRequestDto { MaxResultCount = int.MaxValue }); //Paging not implemented yet
             return View(output);
         }
     }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Tenants/Index.cshtml

@@ -2,7 +2,7 @@
 @using Abp.MultiTenancy
 @using AbpCompanyName.AbpProjectName.MultiTenancy
 @using AbpCompanyName.AbpProjectName.Web.Startup
-@model Abp.Application.Services.Dto.ListResultDto<AbpCompanyName.AbpProjectName.MultiTenancy.Dto.TenantDto>
+@model Abp.Application.Services.Dto.PagedResultDto<AbpCompanyName.AbpProjectName.MultiTenancy.Dto.TenantDto>
 @{
     ViewBag.CurrentPageName = PageNames.Tenants; //The menu item will be active for this page.
 }
@@ -96,6 +96,10 @@
                             <label class="form-label">@L("AdminEmailAddress")</label>
                         </div>
                     </div>
+                    <div class="checkbox">
+                        <input type="checkbox" name="IsActive" value="true" id="CreateTenantIsActive" class="filled-in" checked />
+                        <label for="CreateTenantIsActive">@L("IsActive")</label>
+                    </div>
                     <p>@L("DefaultPasswordIs", AbpCompanyName.AbpProjectName.Authorization.Users.User.DefaultPassword)</p>
                 </div>
                 <div class="modal-footer">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Users/Index.cshtml

@@ -1,6 +1,6 @@
 @using Abp.Authorization.Users
 @using AbpCompanyName.AbpProjectName.Web.Startup
-@model Abp.Application.Services.Dto.ListResultDto<AbpCompanyName.AbpProjectName.Users.Dto.UserDto>
+@model Abp.Application.Services.Dto.PagedResultDto<AbpCompanyName.AbpProjectName.Users.Dto.UserDto>
 @{
     ViewBag.CurrentPageName = PageNames.Users; //The menu item will be active for this page.
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Tenants/Index.js

@@ -17,7 +17,7 @@
             var tenant = _$form.serializeFormToObject(); //serializeFormToObject is defined in main.js
 
             abp.ui.setBusy(_$modal);
-            _tenantService.createTenant(tenant).done(function () {
+            _tenantService.create(tenant).done(function () {
                 _$modal.modal('hide');
                 location.reload(true); //reload page to see new tenant!
             }).always(function() {

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Tenants/Index.min.js

@@ -17,7 +17,7 @@
             var user = _$form.serializeFormToObject(); //serializeFormToObject is defined in main.js
 
             abp.ui.setBusy(_$modal);
-            _userService.createUser(user).done(function () {
+            _userService.create(user).done(function () {
                 _$modal.modal('hide');
                 location.reload(true); //reload page to see new user!
             }).always(function () {