#14: implement tenant change on MVC project and update ABP

ismcagdas · ismcagdas · commit d6f5baed4f3e · 2017-03-13T11:40:13.000+03:00
diff --git a/angular/src/AppPreBootstrap.ts b/angular/src/AppPreBootstrap.ts
@@ -2,7 +2,6 @@
 import { AppConsts } from '@shared/AppConsts';
 import { UrlHelper } from './shared/helpers/UrlHelper';
 import * as _ from 'lodash';
-import { SubdomainTenancyNameFinder } from '@shared/helpers/SubdomainTenancyNameFinder';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { Type, CompilerOptions, NgModuleRef } from '@angular/core';
 import { UtilsService } from '@abp/utils/utils.service';
@@ -27,14 +26,8 @@ export class AppPreBootstrap {
                 'Abp.TenantId': abp.multiTenancy.getTenantIdCookie()
             }
         }).done(result => {
-            let subdomainTenancyNameFinder = new SubdomainTenancyNameFinder();
-            var tenancyName = subdomainTenancyNameFinder.getCurrentTenancyNameOrNull(result.appBaseUrl);
-
-            AppConsts.appBaseUrlFormat = result.appBaseUrl;
-            AppConsts.appBaseUrl = result.appBaseUrl.replace(AppConsts.tenancyNamePlaceHolderInUrl, tenancyName);
-            
-            AppConsts.remoteServiceBaseUrlFormat = result.remoteServiceBaseUrl;
-            AppConsts.remoteServiceBaseUrl = result.remoteServiceBaseUrl.replace(AppConsts.tenancyNamePlaceHolderInUrl, tenancyName);
+            AppConsts.appBaseUrl = result.appBaseUrl;
+            AppConsts.remoteServiceBaseUrl = result.remoteServiceBaseUrl;
             
             callback();
         });
diff --git a/angular/src/account/account.component.less b/angular/src/account/account.component.less
@@ -4,7 +4,6 @@
 
 .content.tenant-change-box {
     padding: 16px 16px 0px 16px;
-    text-align: center;
     margin: 120px auto 0px auto;
     max-width: 400px;
 
diff --git a/angular/src/shared/AppConsts.ts b/angular/src/shared/AppConsts.ts
@@ -1,9 +1,7 @@
 ﻿export class AppConsts {
 
     static remoteServiceBaseUrl: string;
-    static remoteServiceBaseUrlFormat: string;
     static appBaseUrl: string;
-    static appBaseUrlFormat: string;
 
     static readonly userManagement = {
         defaultAdminUserName: 'admin'
diff --git a/angular/src/shared/helpers/SubdomainTenancyNameFinder.ts b/angular/src/shared/helpers/SubdomainTenancyNameFinder.ts
diff --git a/aspnet-core/global.json b/aspnet-core/global.json
@@ -1,6 +1,6 @@
 ﻿{
   "projects": [ "src", "test" ],
   "sdk": {
-    "version": "1.0.0-preview2-003131"
+    "version": "1.0.0-preview2-1-003177"
   }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/project.json b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/project.json
@@ -11,9 +11,9 @@
     "Nito.AsyncEx": "3.0.1",
     "AutoMapper": "5.2.0",
     "System.Collections.Immutable": "1.3.1",
-    "Abp.AutoMapper": "1.4.1",
-    "Abp.EntityFramework": "1.4.1",
-    "Abp.Zero": "1.4.0"
+    "Abp.AutoMapper": "1.5.0",
+    "Abp.EntityFramework": "1.5.0",
+    "Abp.Zero": "1.5.0"
   },
 
   "frameworks": {
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName-tr.xml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName-tr.xml
@@ -54,5 +54,10 @@
     <text name="No" value="Hayır" />
     <text name="Optional" value="Opsiyonel" />
     <text name="LeaveEmptyToSwitchToHost">Üst kullanıcıya geçiş için boş değer girin.</text>
+
+    <text name="CurrentTenant">Geçerli müşteri</text>
+    <text name="NotSelected">Seçilmemiş</text>
+    <text name="Change">Değiştir</text>
+    <text name="ChangeTenant">Müşteri değiştir</text>
   </texts>
 </localizationDictionary>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
@@ -54,5 +54,10 @@
     <text name="No" value="No" />
     <text name="Optional" value="Optional" />
     <text name="LeaveEmptyToSwitchToHost">Leave empty to switch to the host</text>
+    
+    <text name="CurrentTenant">Current tenant</text>
+    <text name="NotSelected">Not selected</text>
+    <text name="Change">Change</text>
+    <text name="ChangeTenant">Change tenant</text>
   </texts>
 </localizationDictionary>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/project.json b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/project.json
@@ -2,10 +2,10 @@
   "version": "1.0.0.0-*",
 
   "dependencies": {
-    "Abp": "1.3.1",
-    "Abp.AutoMapper": "1.3.1",
-    "Abp.EntityFramework": "1.3.1",
-    "Abp.Zero": "1.3.1",
+    "Abp": "1.5.0",
+    "Abp.AutoMapper": "1.5.0",
+    "Abp.EntityFramework": "1.5.0",
+    "Abp.Zero": "1.5.0",
     "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
     "Microsoft.Extensions.Configuration.Json": "1.1.0",
     "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0"
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFramework/project.json b/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFramework/project.json
@@ -7,8 +7,8 @@
       "type": "build",
       "version": "1.0.8"
     },
-    "Abp.EntityFramework": "1.4.1",
-"Abp.Zero.EntityFramework": "1.4.0"
+    "Abp.EntityFramework": "1.5.0",
+"Abp.Zero.EntityFramework": "1.5.0"
   },
 
   "tools": {
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/project.json b/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/project.json
@@ -10,7 +10,7 @@
   },
 
   "dependencies": {
-    "Abp.Castle.Log4Net": "1.4.1",
+    "Abp.Castle.Log4Net": "1.5.0",
     "AbpCompanyName.AbpProjectName.EntityFramework": "1.0.0.0-*"
   },
 
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/project.json b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/project.json
@@ -1,19 +1,18 @@
-﻿{
+{
   "version": "1.0.0.0-*",
 
   "dependencies": {
     "AbpCompanyName.AbpProjectName.EntityFramework": "1.0.0.0-*",
     "AbpCompanyName.AbpProjectName.Application": "1.0.0.0-*",
-
     "Microsoft.AspNetCore.Authentication.JwtBearer": "1.1.0",
     "Microsoft.AspNetCore.Authentication.Facebook": "1.1.0",
     "Microsoft.AspNetCore.Authentication.Google": "1.1.0",
     "Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.1.0",
     "Microsoft.AspNetCore.Owin": "1.1.0",
-    "Abp.AspNetCore": "1.4.1",
-    "Abp.Owin": "1.4.1",
-    "Abp.Zero.AspNetCore": "1.4.0",
-    "Swashbuckle": "6.0.0-beta902"
+    "Swashbuckle": "6.0.0-beta902",
+    "Abp.AspNetCore": "1.5.0",
+    "Abp.Owin": "1.5.0",
+    "Abp.Zero.AspNetCore": "1.5.0"
   },
 
   "frameworks": {
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/project.json b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/project.json
@@ -1,4 +1,4 @@
-﻿{
+{
   "userSecretsId": "AbpCompanyName-AbpProjectName-56C2EF2F-ABD6-4EFC-AAF2-2E81C34E8FB1",
 
   "dependencies": {
@@ -21,8 +21,8 @@
     "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.1.0",
     "Microsoft.Owin.Cors": "3.0.1",
-    "Abp.Castle.Log4Net": "1.4.2",
-    "Microsoft.AspNetCore.Mvc": "1.1.1"
+    "Microsoft.AspNetCore.Mvc": "1.1.1",
+    "Abp.Castle.Log4Net": "1.5.0"
   },
   "tools": {
     "Microsoft.Extensions.SecretManager.Tools": "1.1.0-preview4-final",
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs
@@ -87,7 +87,7 @@ public ActionResult Login(string userNameOrEmailAddress = "", string returnUrl =
         [UnitOfWork]
         public virtual async Task<JsonResult> Login(LoginViewModel loginModel, string returnUrl = "", string returnUrlHash = "")
         {
-            var loginResult = await GetLoginResultAsync(loginModel.UsernameOrEmailAddress, loginModel.Password, loginModel.TenancyName);
+            var loginResult = await GetLoginResultAsync(loginModel.UsernameOrEmailAddress, loginModel.Password, GetTenancyNameOrNull());
 
             await SignInAsync(loginResult.User, loginResult.Identity, loginModel.RememberMe);
             await UnitOfWorkManager.Current.SaveChangesAsync();
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Models/Account/LoginViewModel.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Models/Account/LoginViewModel.cs
@@ -4,8 +4,6 @@ namespace AbpCompanyName.AbpProjectName.Web.Models.Account
 {
     public class LoginViewModel
     {
-        public string TenancyName { get; set; }
-
         [Required]
         public string UsernameOrEmailAddress { get; set; }
 
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/TenantChange/_ChangeModal.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/TenantChange/_ChangeModal.cshtml
@@ -10,8 +10,8 @@
 <div class="modal-body">
     <form name="TenantChangeForm" role="form" novalidate class="form-validation">
         <div class="form-group form-md-line-input form-md-floating-label">
-            <input class="form-control" type="text" name="TenancyName" maxlength="@AbpTenantBase.MaxTenancyNameLength" value="@Model.TenancyName">
             <label>@L("TenancyName")</label>
+            <input class="form-control" type="text" name="TenancyName" maxlength="@AbpTenantBase.MaxTenancyNameLength" value="@Model.TenancyName">
             <span class="help-block">@L("LeaveEmptyToSwitchToHost")</span>
         </div>
     </form>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Modals/_ModalFooterWithSaveAndCancel.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Modals/_ModalFooterWithSaveAndCancel.cshtml
@@ -1,4 +1,4 @@
 ﻿<div class="modal-footer">
-    <button type="button" class="btn default close-button" data-dismiss="modal">@L("Cancel")</button>
-    <button type="button" class="btn blue save-button"><i class="fa fa-save"></i> <span>@L("Save")</span></button>
+    <button type="button" class="btn btn-default close-button" data-dismiss="modal">@L("Cancel")</button>
+    <button type="button" class="btn btn-primary save-button"><i class="fa fa-save"></i> <span>@L("Save")</span></button>
 </div>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/project.json b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/project.json
@@ -32,13 +32,12 @@
     "Microsoft.Extensions.Logging": "1.1.0",
     "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.1.0",
-    
-    "Abp.Castle.Log4Net": "1.4.1",
-    "Abp.HangFire": "1.4.1",
-    "Abp.Owin": "1.4.1",
-    "Abp.RedisCache": "1.4.1",
-    "Abp.Web.SignalR": "1.4.1",
-    "Microsoft.AspNetCore.Mvc": "1.1.1"
+    "Microsoft.AspNetCore.Mvc": "1.1.1",
+    "Abp.HangFire": "1.5.0",
+    "Abp.Owin": "1.5.0",
+    "Abp.RedisCache": "1.5.0",
+    "Abp.Web.SignalR": "1.5.0",
+    "Abp.Castle.Log4Net": "1.5.0"
   },
 
   "tools": {
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/main.css b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/main.css
@@ -6,7 +6,6 @@
 }
 .content.tenant-change-box {
   padding: 16px 0px 0px 32px;
-  text-align: center;
   margin: 120px auto 0px auto;
   max-width: 400px;
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/main.less b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/main.less
@@ -8,7 +8,6 @@
 
 .content.tenant-change-box {
     padding: 16px 0px 0px 32px;
-    text-align: center;
     margin: 120px auto 0px auto;
     max-width: 400px;
 
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/main.min.css b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/main.min.css
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/project.json b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/project.json
@@ -13,7 +13,7 @@
     "xunit": "2.2.0-beta4-build3444",
     "xunit.extensibility.execution": "2.2.0-beta4-build3444",
     "xunit.runner.visualstudio": "2.2.0-beta4-build1194",
-    "Abp.TestBase": "1.4.1"
+    "Abp.TestBase": "1.5.0"
   },
 
   "frameworks": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"projects": [ "src", "test" ],`
`3`	`3`	`"sdk": {`
`4`		`- "version": "1.0.0-preview2-003131"`
	`4`	`+ "version": "1.0.0-preview2-1-003177"`
`5`	`5`	`}`
`6`	`6`	`}`