IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TenantCookieSettings: lifetime is now 1440 by default. added "default" property

Browse Source
This commit is contained in:
pavelbannov 2023-06-30 19:07:18 +03:00
parent e1a3d1bc06
commit 0ff6e98473
5 changed files with 54 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/ASC.Core.Common/Tenants/TenantCookieSettings.cs
View File

@ -31,6 +31,7 @@ public class TenantCookieSettings : ISettings<TenantCookieSettings>
{
public int Index { get; set; }
public int LifeTime { get; set; }
public bool Enabled { get; set; }
public TenantCookieSettings GetDefault()
{
@ -41,12 +42,15 @@ public class TenantCookieSettings : ISettings<TenantCookieSettings>
{
var defaultSettings = GetInstance();
return LifeTime == defaultSettings.LifeTime;
return LifeTime == defaultSettings.LifeTime && Enabled == defaultSettings.Enabled;
}
public static TenantCookieSettings GetInstance()
{
return new TenantCookieSettings();
return new TenantCookieSettings()
{
LifeTime = 1440
};
}
[JsonIgnore]

12
web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
View File

@ -90,9 +90,15 @@ public class MessageSettingsController : BaseSettingsController
}
[HttpGet("cookiesettings")]
public int GetCookieSettings()
public CookieSettingsDto GetCookieSettings()
{
return _cookiesManager.GetLifeTime(_tenantManager.GetCurrentTenant().Id);
var result = _cookiesManager.GetLifeTime(_tenantManager.GetCurrentTenant().Id);
return new CookieSettingsDto
{
Enabled = result.Enabled,
LifeTime = result.LifeTime
};
}
[HttpPut("cookiesettings")]
@ -105,7 +111,7 @@ public class MessageSettingsController : BaseSettingsController
throw new BillingException(Resource.ErrorNotAllowedOption, "CookieSettings");
}
await _cookiesManager.SetLifeTime(model.LifeTime);
await _cookiesManager.SetLifeTime(model.LifeTime, model.Enabled);
_messageService.Send(MessageAction.CookieSettingsUpdated);

1
web/ASC.Web.Api/ApiModels/RequestsDto/CookieSettingsRequestsDto.cs
View File

@ -29,4 +29,5 @@ namespace ASC.Web.Api.Models;
public class CookieSettingsRequestsDto
{
public int LifeTime { get; set; }
public bool Enabled { get; set; }
}

33
web/ASC.Web.Api/ApiModels/ResponseDto/CookieSettingsDto.cs Normal file
View File

@ -0,0 +1,33 @@
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Web.Api.ApiModels.ResponseDto;
public class CookieSettingsDto
{
public int LifeTime { get; set; }
public bool Enabled { get; set; }
}

9
web/ASC.Web.Core/CookiesManager.cs
View File

@ -162,7 +162,7 @@ public class CookiesManager
return expires;
}
public async Task SetLifeTime(int lifeTime)
public async Task SetLifeTime(int lifeTime, bool enabled)
{
var tenant = _tenantManager.GetCurrentTenant();
if (!_userManager.IsUserInGroup(_securityContext.CurrentAccount.ID, Constants.GroupAdmin.ID))
@ -171,6 +171,7 @@ public class CookiesManager
}
var settings = _tenantCookieSettingsHelper.GetForTenant(tenant.Id);
settings.Enabled = enabled;
if (lifeTime > 0)
{
@ -184,7 +185,7 @@ public class CookiesManager
_tenantCookieSettingsHelper.SetForTenant(tenant.Id, settings);
if (lifeTime > 0)
if (enabled && lifeTime > 0)
{
await _dbLoginEventsManager.LogOutAllActiveConnectionsForTenant(tenant.Id);
}
@ -192,9 +193,9 @@ public class CookiesManager
AuthenticateMeAndSetCookies(tenant.Id, _securityContext.CurrentAccount.ID, MessageAction.LoginSuccess);
}
public int GetLifeTime(int tenantId)
public TenantCookieSettings GetLifeTime(int tenantId)
{
return _tenantCookieSettingsHelper.GetForTenant(tenantId).LifeTime;
return _tenantCookieSettingsHelper.GetForTenant(tenantId);
}
public async Task ResetUserCookie(Guid? userId = null)