removed unnecessary settings and multi tenancy code

Author: ismcagdas

src/AbpCompanyName.AbpProjectName.Core/Configuration/AppSettingProvider.cs

@@ -15,16 +15,7 @@ public override IEnumerable<SettingDefinition> GetSettingDefinitions(SettingDefi
             return new[]
                    {
                        //Host settings
-                        new SettingDefinition(AppSettings.General.WebSiteRootAddress, "http://localhost:62114/"),
-                        new SettingDefinition(AppSettings.TenantManagement.AllowSelfRegistration,ConfigurationManager.AppSettings[AppSettings.TenantManagement.UseCaptchaOnRegistration] ?? "true"),
-                        new SettingDefinition(AppSettings.TenantManagement.IsNewRegisteredTenantActiveByDefault,ConfigurationManager.AppSettings[AppSettings.TenantManagement.IsNewRegisteredTenantActiveByDefault] ??"false"),
-                        new SettingDefinition(AppSettings.TenantManagement.UseCaptchaOnRegistration,ConfigurationManager.AppSettings[AppSettings.TenantManagement.UseCaptchaOnRegistration] ?? "true"),
-                        new SettingDefinition(AppSettings.TenantManagement.DefaultEdition,ConfigurationManager.AppSettings[AppSettings.TenantManagement.DefaultEdition] ?? ""),
-
-                        //Tenant settings
-                        new SettingDefinition(AppSettings.UserManagement.AllowSelfRegistration, ConfigurationManager.AppSettings[AppSettings.UserManagement.UseCaptchaOnRegistration] ?? "true", scopes: SettingScopes.Tenant),
-                        new SettingDefinition(AppSettings.UserManagement.IsNewRegisteredUserActiveByDefault, ConfigurationManager.AppSettings[AppSettings.UserManagement.IsNewRegisteredUserActiveByDefault] ?? "false", scopes: SettingScopes.Tenant),
-                        new SettingDefinition(AppSettings.UserManagement.UseCaptchaOnRegistration, ConfigurationManager.AppSettings[AppSettings.UserManagement.UseCaptchaOnRegistration] ?? "true", scopes: SettingScopes.Tenant)
+                        new SettingDefinition(AppSettings.General.WebSiteRootAddress, "http://localhost:62114/")
                    };
         }
     }

src/AbpCompanyName.AbpProjectName.Core/Configuration/AppSettings.cs

@@ -10,25 +10,5 @@ public static class General
         {
             public const string WebSiteRootAddress = "App.General.WebSiteRootAddress";
         }
-
-        public static class TenantManagement
-        {
-            public const string AllowSelfRegistration = "App.TenantManagement.AllowSelfRegistration";
-            public const string IsNewRegisteredTenantActiveByDefault = "App.TenantManagement.IsNewRegisteredTenantActiveByDefault";
-            public const string UseCaptchaOnRegistration = "App.TenantManagement.UseCaptchaOnRegistration";
-            public const string DefaultEdition = "App.TenantManagement.DefaultEdition";
-        }
-
-        public static class UserManagement
-        {
-            public const string AllowSelfRegistration = "App.UserManagement.AllowSelfRegistration";
-            public const string IsNewRegisteredUserActiveByDefault = "App.UserManagement.IsNewRegisteredUserActiveByDefault";
-            public const string UseCaptchaOnRegistration = "App.UserManagement.UseCaptchaOnRegistration";
-        }
-
-        public static class Security
-        {
-            public const string PasswordComplexity = "App.Security.PasswordComplexity";
-        }
     }
 }

src/AbpCompanyName.AbpProjectName.Web/Controllers/AccountController.cs

@@ -17,7 +17,6 @@
 using AbpCompanyName.AbpProjectName.Authorization;
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
-using AbpCompanyName.AbpProjectName.Web.MultiTenancy;
 using AbpCompanyName.AbpProjectName.Users;
 using AbpCompanyName.AbpProjectName.Web.Authentication;
 using AbpCompanyName.AbpProjectName.Web.Models.Account;
@@ -31,7 +30,6 @@ public class AccountController : AbpProjectNameControllerBase
         private readonly TenantManager _tenantManager;
         private readonly IMultiTenancyConfig _multiTenancyConfig;
         private readonly IUnitOfWorkManager _unitOfWorkManager;
-        private readonly ITenancyNameFinder _tenancyNameFinder;
         private readonly AbpLoginResultTypeHelper _abpLoginResultTypeHelper;
 
         public AccountController(
@@ -40,15 +38,13 @@ public AccountController(
             RoleManager roleManager,
             TenantManager tenantManager,
             IUnitOfWorkManager unitOfWorkManager,
-            ITenancyNameFinder tenancyNameFinder,
             AbpLoginResultTypeHelper abpLoginResultTypeHelper)
         {
             _userManager = userManager;
             _multiTenancyConfig = multiTenancyConfig;
             _roleManager = roleManager;
             _tenantManager = tenantManager;
             _unitOfWorkManager = unitOfWorkManager;
-            _tenancyNameFinder = tenancyNameFinder;
             _abpLoginResultTypeHelper = abpLoginResultTypeHelper;
         }
 
@@ -283,7 +279,6 @@ public ActionResult ExternalLogin(string provider, string returnUrl)
                 new
                 {
                     ReturnUrl = returnUrl,
-                    tenancyName = _tenancyNameFinder.GetCurrentTenancyNameOrNull() ?? "",
                     authSchema = provider
                 });
 
@@ -317,7 +312,6 @@ public virtual async Task<ActionResult> ExternalLoginCallback(string returnUrl,
             //Try to find tenancy name
             if (tenancyName.IsNullOrEmpty())
             {
-                tenancyName = _tenancyNameFinder.GetCurrentTenancyNameOrNull();
                 if (tenancyName.IsNullOrEmpty())
                 {
                     var tenants = await FindPossibleTenantsOfUserAsync(userInfo.LoginInfo);

src/AbpCompanyName.AbpProjectName.Web/MultiTenancy/ITenancyNameFinder.cs

@@ -10,7 +10,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using AbpCompanyName.AbpProjectName.Web.Configuration;
-using AbpCompanyName.AbpProjectName.Web.MultiTenancy;
 using AbpCompanyName.AbpProjectName.Web.Startup.Owin;
 using Owin;
 
@@ -33,16 +32,6 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                 options.Filters.Add(new AutoValidateAntiforgeryTokenAttribute());
             });
 
-            //Swagger - Enable this line and the related lines in Configure method to enable swagger UI
-            //services.AddSwaggerGen();
-
-            ////Recaptcha
-            //services.AddRecaptcha(new RecaptchaOptions
-            //{
-            //    SiteKey = _appConfiguration["Recaptcha:SiteKey"],
-            //    SecretKey = _appConfiguration["Recaptcha:SecretKey"]
-            //});
-
             //Configure Abp and Dependency Injection
             return services.AddAbp<AbpProjectNameWebModule>(options =>
             {
@@ -71,8 +60,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 
             app.UseStaticFiles();
 
-            app.UseTenantIdAccessorInitialization();
-
             //Integrate to OWIN
             app.UseAppBuilder(ConfigureOwinServices);
 
@@ -86,11 +73,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
                     name: "default",
                     template: "{controller=Home}/{action=Index}/{id?}");
             });
-
-            // Enable middleware to serve generated Swagger as a JSON endpoint
-            //app.UseSwagger();
-            // Enable middleware to serve swagger-ui assets (HTML, JS, CSS etc.)
-            //app.UseSwaggerUi(); //URL: /swagger/ui
         }
 
         private static void ConfigureOwinServices(IAppBuilder app)
@@ -100,12 +82,6 @@ private static void ConfigureOwinServices(IAppBuilder app)
             app.UseAbp();
 
             app.MapSignalR();
-
-            //Enable it to use HangFire dashboard (uncomment only if it's enabled in AbpZeroTemplateWebModule)
-            //app.UseHangfireDashboard("/hangfire", new DashboardOptions
-            //{
-            //    Authorization = new[] { new AbpHangfireAuthorizationFilter(AppPermissions.Pages_Administration_HangfireDashboard) }
-            //});
         }
     }
 }