Enabled multi-tenancy and modified login.

Author: hikalkan

src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameCoreModule.cs

@@ -7,6 +7,12 @@ namespace AbpCompanyName.AbpProjectName
     [DependsOn(typeof(AbpZeroCoreModule))]
     public class AbpProjectNameCoreModule : AbpModule
     {
+        public override void PreInitialize()
+        {
+            //Remove the following line to disable multi-tenancy.
+            Configuration.MultiTenancy.IsEnabled = true;
+        }
+
         public override void Initialize()
         {
             IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());

src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj

@@ -1169,6 +1169,7 @@
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
+    <Compile Include="Models\Account\LoginFormViewModel.cs" />
     <Compile Include="Models\Account\LoginViewModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Views\AbpProjectNameWebViewPageBase.cs" />

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

@@ -1,7 +1,9 @@
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
+using Abp.Auditing;
 using Abp.Authorization.Users;
+using Abp.Configuration.Startup;
 using Abp.UI;
 using Abp.Web.Mvc.Models;
 using AbpCompanyName.AbpProjectName.Users;
@@ -14,6 +16,7 @@ namespace AbpCompanyName.AbpProjectName.WebSpaAngular.Controllers
     public class AccountController : AbpProjectNameControllerBase
     {
         private readonly UserManager _userManager;
+        private readonly IMultiTenancyConfig _multiTenancyConfig;
 
         private IAuthenticationManager AuthenticationManager
         {
@@ -23,9 +26,10 @@ private IAuthenticationManager AuthenticationManager
             }
         }
 
-        public AccountController(UserManager userManager)
+        public AccountController(UserManager userManager, IMultiTenancyConfig multiTenancyConfig)
         {
             _userManager = userManager;
+            _multiTenancyConfig = multiTenancyConfig;
         }
 
         public ActionResult Login(string returnUrl = "")
@@ -35,12 +39,16 @@ public ActionResult Login(string returnUrl = "")
                 returnUrl = Request.ApplicationPath;
             }
 
-            ViewBag.ReturnUrl = returnUrl;
-
-            return View();
+            return View(
+                new LoginFormViewModel
+                {
+                    ReturnUrl = returnUrl,
+                    IsMultiTenancyEnabled = _multiTenancyConfig.IsEnabled
+                });
         }
 
         [HttpPost]
+        [DisableAuditing]
         public async Task<JsonResult> Login(LoginViewModel loginModel, string returnUrl = "")
         {
             if (!ModelState.IsValid)

src/AbpCompanyName.AbpProjectName.WebSpaAngular/Models/Account/LoginFormViewModel.cs

@@ -0,0 +1,9 @@
+namespace AbpCompanyName.AbpProjectName.WebSpaAngular.Models.Account
+{
+    public class LoginFormViewModel
+    {
+        public string ReturnUrl { get; set; }
+
+        public bool IsMultiTenancyEnabled { get; set; }
+    }
+}

src/AbpCompanyName.AbpProjectName.WebSpaAngular/Views/Account/Login.cshtml

@@ -1,4 +1,5 @@
-@section Styles
+@model AbpCompanyName.AbpProjectName.WebSpaAngular.Models.Account.LoginFormViewModel
+@section Styles
 {
     <link href="~/Views/Account/Login.css" rel="stylesheet" />
 }
@@ -10,14 +11,30 @@
     <div id="LoginArea" class="row">
         <div class="col-lg-12">
             <div class="well bs-component">
-                <form class="form-horizontal">
+                <form class="form-horizontal" action="@(Url.Action("Login","Account"))?returnUrl=@(Model.ReturnUrl)">
                     <fieldset>
                         <legend>Login</legend>
+
+                        @if (Model.IsMultiTenancyEnabled)
+                        {
+                            <div class="form-group">
+                                <div class="col-lg-12">
+                                    <input type="text" class="form-control" id="TenancyName" placeholder="Tenancy name">
+                                    <span class="text-muted">Can be empty to login as host.</span>
+                                </div>
+                            </div>
+                        }
+                        else
+                        {
+                            <input type="hidden" id="TenancyName" value="">
+                        }
+
                         <div class="form-group">
                             <div class="col-lg-12">
-                                <input type="text" class="form-control floating-label" id="EmailAddressInput" placeholder="User name or email">
+                                <input type="text" class="form-control " id="EmailAddressInput" placeholder="User name or email">
                             </div>
                         </div>
+
                         <div class="form-group">
                             <div class="col-lg-12">
                                 <input type="password" class="form-control" id="PasswordInput" placeholder="Password">
@@ -30,6 +47,7 @@
                                 </div>
                             </div>
                         </div>
+
                         <div class="form-group">
                             <div class="col-lg-12">
                                 <button id="LoginButton" class="btn btn-primary"><i class="fa fa-sign-out"></i> Login</button>

src/AbpCompanyName.AbpProjectName.WebSpaAngular/Views/Account/Login.js

@@ -9,6 +9,7 @@
                     url: abp.appPath + 'Account/Login',
                     type: 'POST',
                     data: JSON.stringify({
+                        tenancyName: $('#TenancyName').val(),
                         usernameOrEmailAddress: $('#EmailAddressInput').val(),
                         password: $('#PasswordInput').val(),
                         rememberMe: $('#RememberMeInput').is(':checked')

src/Tests/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj

@@ -160,6 +160,9 @@
       <Name>AbpCompanyName.AbpProjectName.EntityFramework</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">