Fixed #2512: AccountAppService should check self registration setting

abpframework · Dec 30, 2019 · fb4fe90 · fb4fe90
1 parent 6312a18
commit fb4fe90
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/...count.Web/Settings/AccountSettingNames.cs → ...p/Account/Settings/AccountSettingNames.cs b/...count.Web/Settings/AccountSettingNames.cs → ...p/Account/Settings/AccountSettingNames.cs
@@ -1,4 +1,4 @@
-namespace Volo.Abp.Account.Web.Settings
+namespace Volo.Abp.Account.Settings
 {
     public class AccountSettingNames
     {

diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs
@@ -1,7 +1,9 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
+using Volo.Abp.Account.Settings;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Identity;
+using Volo.Abp.Settings;
 
 namespace Volo.Abp.Account
 {
@@ -17,11 +19,21 @@ public AccountAppService(
 
         public virtual async Task<IdentityUserDto> RegisterAsync(RegisterDto input)
         {
+            await CheckSelfRegistrationAsync().ConfigureAwait(false);
+
             var user = new IdentityUser(GuidGenerator.Create(), input.UserName, input.EmailAddress, CurrentTenant.Id);
 
             (await UserManager.CreateAsync(user, input.Password).ConfigureAwait(false)).CheckErrors();
 
             return ObjectMapper.Map<IdentityUser, IdentityUserDto>(user);
         }
+
+        protected virtual async Task CheckSelfRegistrationAsync()
+        {
+            if (!await SettingProvider.IsTrueAsync(AccountSettingNames.IsSelfRegistrationEnabled).ConfigureAwait(false))
+            {
+                throw new UserFriendlyException(L["SelfRegistrationDisabledMessage"]);
+            }
+        }
     }
 }
diff --git a/...tings/AccountSettingDefinitionProvider.cs → ...tings/AccountSettingDefinitionProvider.cs b/...tings/AccountSettingDefinitionProvider.cs → ...tings/AccountSettingDefinitionProvider.cs
@@ -2,7 +2,7 @@
 using Volo.Abp.Localization;
 using Volo.Abp.Settings;
 
-namespace Volo.Abp.Account.Web.Settings
+namespace Volo.Abp.Account.Settings
 {
     public class AccountSettingDefinitionProvider : SettingDefinitionProvider
     {

diff --git a/...rc/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs b/...rc/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
@@ -12,7 +12,7 @@
 using System.Security.Claims;
 using System.Security.Principal;
 using System.Threading.Tasks;
-using Volo.Abp.Account.Web.Settings;
+using Volo.Abp.Account.Settings;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Settings;

diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
@@ -1,5 +1,5 @@
 @page
-@using Volo.Abp.Account.Web.Settings
+@using Volo.Abp.Account.Settings
 @model Volo.Abp.Account.Web.Pages.Account.LoginModel
 @inherits Volo.Abp.Account.Web.Pages.Account.AccountPage
 @inject Volo.Abp.Settings.ISettingProvider SettingProvider

diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
@@ -10,7 +10,7 @@
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Volo.Abp.Account.Web.Settings;
+using Volo.Abp.Account.Settings;
 using Volo.Abp.Identity;
 using Volo.Abp.Security.Claims;
 using Volo.Abp.Settings;

diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.Account.Web.Settings;
+using Volo.Abp.Account.Settings;
 using Volo.Abp.Settings;
 using Volo.Abp.Uow;
 using IdentityUser = Volo.Abp.Identity.IdentityUser;