From 5640909a2f833764ac35189c7cab607e21ade26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 20 Sep 2019 19:51:48 +0300
Subject: [PATCH] AccountController should not reset current tenant on openid
 connect login

---
 .../Pages/Account/IdentityServerSupportedLoginModel.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
index 666bcfadf0..b6902e86d8 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
@@ -52,15 +52,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
                 //TODO: Reference AspNetCore MultiTenancy module and use options to get the tenant key!
                 var tenant = context.Parameters[TenantResolverConsts.DefaultTenantKey];
-                if (string.IsNullOrEmpty(tenant))
-                {
-                    if (Request.Cookies.ContainsKey(TenantResolverConsts.DefaultTenantKey))
-                    {
-                        CurrentTenant.Change(null);
-                        Response.Cookies.Delete(TenantResolverConsts.DefaultTenantKey);
-                    }
-                }
-                else
+                if (!string.IsNullOrEmpty(tenant))
                 {
                     CurrentTenant.Change(Guid.Parse(tenant));
                     Response.Cookies.Append(TenantResolverConsts.DefaultTenantKey, tenant);