diff --git a/common/ASC.Migration/Startup.cs b/common/ASC.Migration/Startup.cs index a6c364a5e4..e7a96ec86d 100644 --- a/common/ASC.Migration/Startup.cs +++ b/common/ASC.Migration/Startup.cs @@ -42,15 +42,4 @@ public class Startup : BaseStartup base.ConfigureServices(services); } - - public override void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - app.UseCors(builder => - builder - .AllowAnyOrigin() - .AllowAnyHeader() - .AllowAnyMethod()); - - base.Configure(app, env); - } } diff --git a/web/ASC.Web.Core/CookiesManager.cs b/web/ASC.Web.Core/CookiesManager.cs index bdd11c88b3..5f60eeaab2 100644 --- a/web/ASC.Web.Core/CookiesManager.cs +++ b/web/ASC.Web.Core/CookiesManager.cs @@ -52,7 +52,6 @@ public class CookiesManager private readonly CoreBaseSettings _coreBaseSettings; private readonly DbLoginEventsManager _dbLoginEventsManager; private readonly MessageService _messageService; - private readonly ILogger _logger; public CookiesManager( IHttpContextAccessor httpContextAccessor, @@ -62,8 +61,7 @@ public class CookiesManager TenantManager tenantManager, CoreBaseSettings coreBaseSettings, DbLoginEventsManager dbLoginEventsManager, - MessageService messageService, - ILogger logger) + MessageService messageService) { _httpContextAccessor = httpContextAccessor; _userManager = userManager; @@ -73,7 +71,6 @@ public class CookiesManager _coreBaseSettings = coreBaseSettings; _dbLoginEventsManager = dbLoginEventsManager; _messageService = messageService; - _logger = logger; } public void SetCookies(CookiesType type, string value, bool session = false) @@ -296,7 +293,9 @@ public class CookiesManager if (!string.IsNullOrEmpty(origin)) { var originUri = new Uri(origin); - result = $"{result}_{originUri.Host.Replace('.', '_')}"; + var host = originUri.Host; + var alias = host.Substring(0, host.Length - _coreBaseSettings.Basedomain.Length - 1); + result = $"{result}_{alias}"; } } @@ -309,23 +308,12 @@ public class CookiesManager var origin = _httpContextAccessor.HttpContext.Request.Headers[HeaderNames.Origin].FirstOrDefault(); var baseDomain = _coreBaseSettings.Basedomain; - foreach (var h in _httpContextAccessor.HttpContext.Request.Headers) - { - _logger.Debug($"{h.Key}:{h.Value.FirstOrDefault()}"); - } - try { - _logger.Debug($"baseDomain:{baseDomain}"); - _logger.Debug($"origin:{origin}"); - if (!string.IsNullOrEmpty(origin)) { var originUri = new Uri(origin); - _logger.Debug($"originHost:{originUri.Host}"); - _logger.Debug($"urlRewriter:{urlRewriter.Host}"); - if (!string.IsNullOrEmpty(baseDomain) && urlRewriter.Host != originUri.Host && originUri.Host.EndsWith(baseDomain)) diff --git a/web/ASC.Web.Studio/Startup.cs b/web/ASC.Web.Studio/Startup.cs index c61e5d0a2a..ebb59d2a9c 100644 --- a/web/ASC.Web.Studio/Startup.cs +++ b/web/ASC.Web.Studio/Startup.cs @@ -41,12 +41,6 @@ public class Startup : BaseStartup }); app.UseRouting(); - - app.UseCors(builder => - builder - .AllowAnyOrigin() - .AllowAnyHeader() - .AllowAnyMethod()); app.UseAuthentication(); @@ -71,9 +65,7 @@ public class Startup : BaseStartup } public override void ConfigureServices(IServiceCollection services) - { - services.AddCors(); - + { base.ConfigureServices(services); services.AddMemoryCache();