merge commit

Author: alirizaadiyahsi

src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj

@@ -35,37 +35,36 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.2.0.2\lib\net46\Abp.dll</HintPath>
+    <Reference Include="Abp, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.2.3.0\lib\net46\Abp.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.AutoMapper, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.AutoMapper.2.0.2\lib\net46\Abp.AutoMapper.dll</HintPath>
+    <Reference Include="Abp.AutoMapper, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.AutoMapper.2.3.0\lib\net46\Abp.AutoMapper.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.Zero.2.0.1\lib\net46\Abp.Zero.dll</HintPath>
+    <Reference Include="Abp.Zero, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.2.3.0\lib\net46\Abp.Zero.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero.Common, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.Zero.Common.2.0.1\lib\net46\Abp.Zero.Common.dll</HintPath>
+    <Reference Include="Abp.Zero.Common, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.Common.2.3.0\lib\net46\Abp.Zero.Common.dll</HintPath>
     </Reference>
-    <Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
     </Reference>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Castle.Facilities.Logging, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.LoggingFacility.3.4.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
+    <Reference Include="Castle.Facilities.Logging, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.LoggingFacility.4.0.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
+    <Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
       <Private>True</Private>
@@ -83,7 +82,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Nito.AsyncEx, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
@@ -105,8 +104,8 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Linq.Dynamic.Core.1.0.6.13\lib\net45\System.Linq.Dynamic.Core.dll</HintPath>
+    <Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.6\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Net" />
     <Reference Include="System.Runtime.Caching" />
@@ -120,24 +119,39 @@
   <ItemGroup>
     <Compile Include="AbpProjectNameApplicationModule.cs" />
     <Compile Include="AbpProjectNameAppServiceBase.cs" />
-    <Compile Include="MultiTenancy\Dto\CreateTenantInput.cs" />
+    <Compile Include="Authorization\Accounts\AccountAppService.cs" />
+    <Compile Include="Authorization\Accounts\Dto\IsTenantAvailable.cs" />
+    <Compile Include="Authorization\Accounts\Dto\IsTenantAvailableOutput.cs" />
+    <Compile Include="Authorization\Accounts\Dto\RegisterInput.cs" />
+    <Compile Include="Authorization\Accounts\Dto\RegisterOutput.cs" />
+    <Compile Include="Authorization\Accounts\Dto\TenantAvailabilityState.cs" />
+    <Compile Include="Authorization\Accounts\IAccountAppService.cs" />
+    <Compile Include="Configuration\ConfigurationAppService.cs" />
+    <Compile Include="Configuration\Dto\ChangeUiThemeInput.cs" />
+    <Compile Include="Configuration\IConfigurationAppService.cs" />
+    <Compile Include="Configuration\Ui\UiThemeInfo.cs" />
+    <Compile Include="Configuration\Ui\UiThemes.cs" />
+    <Compile Include="MultiTenancy\Dto\CreateTenantDto.cs" />
+    <Compile Include="MultiTenancy\Dto\EditTenantDto.cs" />
+    <Compile Include="MultiTenancy\Dto\TenantDto.cs" />
     <Compile Include="MultiTenancy\ITenantAppService.cs" />
-    <Compile Include="MultiTenancy\Dto\TenantListDto.cs" />
     <Compile Include="MultiTenancy\TenantAppService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Roles\Dto\CreateRoleDto.cs" />
+    <Compile Include="Roles\Dto\PermissionDto.cs" />
+    <Compile Include="Roles\Dto\RoleDto.cs" />
     <Compile Include="Roles\IRoleAppService.cs" />
-    <Compile Include="Roles\Dto\UpdateRolePermissionsInput.cs" />
-    <Compile Include="Users\Dto\CreateUserInput.cs" />
+    <Compile Include="Users\Dto\CreateUserDto.cs" />
+    <Compile Include="Users\Dto\UpdateUserDto.cs" />
+    <Compile Include="Users\Dto\UserDto.cs" />
     <Compile Include="Users\IUserAppService.cs" />
     <Compile Include="Roles\RoleAppService.cs" />
     <Compile Include="Sessions\Dto\GetCurrentLoginInformationsOutput.cs" />
     <Compile Include="Sessions\Dto\TenantLoginInfoDto.cs" />
     <Compile Include="Sessions\Dto\UserLoginInfoDto.cs" />
     <Compile Include="Sessions\ISessionAppService.cs" />
     <Compile Include="Sessions\SessionAppService.cs" />
-    <Compile Include="Users\Dto\ProhibitPermissionInput.cs" />
     <Compile Include="Users\UserAppService.cs" />
-    <Compile Include="Users\Dto\UserListDto.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameAppServiceBase.cs

@@ -3,6 +3,7 @@
 using Abp.Application.Services;
 using Abp.IdentityFramework;
 using Abp.Runtime.Session;
+using AbpCompanyName.AbpProjectName.Authorization.Users;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
 using AbpCompanyName.AbpProjectName.Users;
 using Microsoft.AspNet.Identity;

src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameApplicationModule.cs

@@ -1,6 +1,14 @@
 using System.Reflection;
+using Abp.Authorization;
+using Abp.Authorization.Roles;
+using Abp.Authorization.Users;
 using Abp.AutoMapper;
+using Abp.Domain.Repositories;
 using Abp.Modules;
+using AbpCompanyName.AbpProjectName.Authorization.Roles;
+using AbpCompanyName.AbpProjectName.Authorization.Users;
+using AbpCompanyName.AbpProjectName.Roles.Dto;
+using AbpCompanyName.AbpProjectName.Users.Dto;
 
 namespace AbpCompanyName.AbpProjectName
 {
@@ -9,16 +17,28 @@ public class AbpProjectNameApplicationModule : AbpModule
     {
         public override void PreInitialize()
         {
-            Configuration.Modules.AbpAutoMapper().Configurators.Add(mapper =>
-            {
-                //Add your custom AutoMapper mappings here...
-                //mapper.CreateMap<,>()
-            });
         }
 
         public override void Initialize()
         {
             IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+
+            // TODO: Is there somewhere else to store these, with the dto classes
+            Configuration.Modules.AbpAutoMapper().Configurators.Add(cfg =>
+            {
+                // Role and permission
+                cfg.CreateMap<Permission, string>().ConvertUsing(r => r.Name);
+                cfg.CreateMap<RolePermissionSetting, string>().ConvertUsing(r => r.Name);
+
+                cfg.CreateMap<CreateRoleDto, Role>().ForMember(x => x.Permissions, opt => opt.Ignore());
+                cfg.CreateMap<RoleDto, Role>().ForMember(x => x.Permissions, opt => opt.Ignore());
+                
+                cfg.CreateMap<UserDto, User>();
+                cfg.CreateMap<UserDto, User>().ForMember(x => x.Roles, opt => opt.Ignore());
+
+                cfg.CreateMap<CreateUserDto, User>();
+                cfg.CreateMap<CreateUserDto, User>().ForMember(x => x.Roles, opt => opt.Ignore());
+            });
         }
     }
 }

src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/AccountAppService.cs

@@ -0,0 +1,55 @@
+using System.Threading.Tasks;
+using Abp.Zero.Configuration;
+using AbpCompanyName.AbpProjectName.Authorization.Accounts.Dto;
+using AbpCompanyName.AbpProjectName.Authorization.Users;
+using Abp.Configuration;
+
+
+namespace AbpCompanyName.AbpProjectName.Authorization.Accounts
+{
+    public class AccountAppService : AbpProjectNameAppServiceBase, IAccountAppService
+    {
+        private readonly UserRegistrationManager _userRegistrationManager;
+
+        public AccountAppService(
+            UserRegistrationManager userRegistrationManager)
+        {
+            _userRegistrationManager = userRegistrationManager;
+        }
+
+        public async Task<IsTenantAvailableOutput> IsTenantAvailable(IsTenantAvailableInput input)
+        {
+            var tenant = await TenantManager.FindByTenancyNameAsync(input.TenancyName);
+            if (tenant == null)
+            {
+                return new IsTenantAvailableOutput(TenantAvailabilityState.NotFound);
+            }
+
+            if (!tenant.IsActive)
+            {
+                return new IsTenantAvailableOutput(TenantAvailabilityState.InActive);
+            }
+
+            return new IsTenantAvailableOutput(TenantAvailabilityState.Available, tenant.Id);
+        }
+
+        public async Task<RegisterOutput> Register(RegisterInput input)
+        {
+            var user = await _userRegistrationManager.RegisterAsync(
+                input.Name,
+                input.Surname,
+                input.EmailAddress,
+                input.UserName,
+                input.Password,
+                false
+            );
+
+            var isEmailConfirmationRequiredForLogin = await SettingManager.GetSettingValueAsync<bool>(AbpZeroSettingNames.UserManagement.IsEmailConfirmationRequiredForLogin);
+
+            return new RegisterOutput
+            {
+                CanLogin = user.IsActive && (user.IsEmailConfirmed || !isEmailConfirmationRequiredForLogin)
+            };
+        }
+    }
+}

src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/Dto/IsTenantAvailable.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+using Abp.MultiTenancy;
+
+namespace AbpCompanyName.AbpProjectName.Authorization.Accounts.Dto
+{
+    public class IsTenantAvailableInput
+    {
+        [Required]
+        [MaxLength(AbpTenantBase.MaxTenancyNameLength)]
+        public string TenancyName { get; set; }
+    }
+}

src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/Dto/IsTenantAvailableOutput.cs

@@ -0,0 +1,20 @@
+namespace AbpCompanyName.AbpProjectName.Authorization.Accounts.Dto
+{
+    public class IsTenantAvailableOutput
+    {
+        public TenantAvailabilityState State { get; set; }
+
+        public int? TenantId { get; set; }
+
+        public IsTenantAvailableOutput()
+        {
+
+        }
+
+        public IsTenantAvailableOutput(TenantAvailabilityState state, int? tenantId = null)
+        {
+            State = state;
+            TenantId = tenantId;
+        }
+    }
+}

src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/Dto/RegisterInput.cs

@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Abp.Auditing;
+using Abp.Authorization.Users;
+using AbpCompanyName.AbpProjectName.Users;
+using AbpCompanyName.AbpProjectName.Validation;
+using Abp.Extensions;
+using AbpCompanyName.AbpProjectName.Authorization.Users;
+
+namespace AbpCompanyName.AbpProjectName.Authorization.Accounts.Dto
+{
+    public class RegisterInput : IValidatableObject
+    {
+        [Required]
+        [StringLength(User.MaxNameLength)]
+        public string Name { get; set; }
+
+        [Required]
+        [StringLength(User.MaxSurnameLength)]
+        public string Surname { get; set; }
+
+        [Required]
+        [StringLength(AbpUserBase.MaxUserNameLength)]
+        public string UserName { get; set; }
+
+        [Required]
+        [EmailAddress]
+        [StringLength(AbpUserBase.MaxEmailAddressLength)]
+        public string EmailAddress { get; set; }
+
+        [Required]
+        [StringLength(User.MaxPlainPasswordLength)]
+        [DisableAuditing]
+        public string Password { get; set; }
+
+        [DisableAuditing]
+        public string CaptchaResponse { get; set; }
+
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+        {
+            if (!UserName.IsNullOrEmpty())
+            {
+                if (!UserName.Equals(EmailAddress) && ValidationHelper.IsEmail(UserName))
+                {
+                    yield return new ValidationResult("Username cannot be an email address unless it's same with your email address !");
+                }
+            }
+        }
+    }
+}

src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/Dto/RegisterOutput.cs

@@ -0,0 +1,7 @@
+namespace AbpCompanyName.AbpProjectName.Authorization.Accounts.Dto
+{
+    public class RegisterOutput
+    {
+        public bool CanLogin { get; set; }
+    }
+}

src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/Dto/TenantAvailabilityState.cs

@@ -0,0 +1,9 @@
+namespace AbpCompanyName.AbpProjectName.Authorization.Accounts.Dto
+{
+    public enum TenantAvailabilityState
+    {
+        Available = 1,
+        InActive,
+        NotFound
+    }
+}

src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/IAccountAppService.cs

@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+using Abp.Application.Services;
+using AbpCompanyName.AbpProjectName.Authorization.Accounts.Dto;
+
+namespace AbpCompanyName.AbpProjectName.Authorization.Accounts
+{
+    public interface IAccountAppService : IApplicationService
+    {
+        Task<IsTenantAvailableOutput> IsTenantAvailable(IsTenantAvailableInput input);
+
+        Task<RegisterOutput> Register(RegisterInput input);
+    }
+}