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

Audit: resources. refactoring

Browse Source
This commit is contained in:
pavelbannov 2020-10-14 16:58:53 +03:00
parent aa28276de7
commit c1b046f954
5 changed files with 526 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
View File

@ -35,6 +35,21 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>AuditReportResource.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="AuditReportResource.ru.resx">
<DependentUpon>AuditReportResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="AuditReportResource.de.resx">
<DependentUpon>AuditReportResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="AuditReportResource.es.resx">
<DependentUpon>AuditReportResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="AuditReportResource.fr.resx">
<DependentUpon>AuditReportResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="AuditReportResource.it.resx">
<DependentUpon>AuditReportResource.resx</DependentUpon>
</EmbeddedResource>
</ItemGroup>
</Project>

977
common/services/ASC.AuditTrail/AuditReportResource.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

14
web/ASC.Web.Api/Controllers/SecurityController.cs
View File

@ -40,10 +40,10 @@ namespace ASC.Web.Api.Controllers
TenantExtra tenantExtra,
TenantManager tenantManager,
MessageService messageService,
LoginEventsRepository loginEventsRepository,
AuditEventsRepository auditEventsRepository,
LoginEventsRepository loginEventsRepository,
AuditEventsRepository auditEventsRepository,
AuditReportCreator auditReportCreator,
SettingsManager settingsManager)
SettingsManager settingsManager)
{
PermissionContext = permissionContext;
CoreBaseSettings = coreBaseSettings;
@ -57,25 +57,25 @@ namespace ASC.Web.Api.Controllers
}
[Read("audit/login/last")]
public IEnumerable<LoginEventWrapper> GetLastLoginEvents()
public IEnumerable<EventWrapper> GetLastLoginEvents()
{
PermissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
if (!SetupInfo.IsVisibleSettings(ManagementType.LoginHistory.ToString()) || CoreBaseSettings.Standalone && !TenantExtra.GetTenantQuota().Audit)
throw new BillingException(Resource.ErrorNotAllowedOption, "Audit");
return LoginEventsRepository.GetLast(TenantManager.GetCurrentTenant().TenantId, 20).Select(x => new LoginEventWrapper(x));
return LoginEventsRepository.GetLast(TenantManager.GetCurrentTenant().TenantId, 20).Select(x => new EventWrapper(x));
}
[Read("audit/events/last")]
public IEnumerable<AuditEventWrapper> GetLastAuditEvents()
public IEnumerable<EventWrapper> GetLastAuditEvents()
{
PermissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
if (!SetupInfo.IsVisibleSettings(ManagementType.LoginHistory.ToString()) || CoreBaseSettings.Standalone && !TenantExtra.GetTenantQuota().Audit)
throw new BillingException(Resource.ErrorNotAllowedOption, "Audit");
return AuditEventsRepository.GetLast(TenantManager.GetCurrentTenant().TenantId, 20).Select(x => new AuditEventWrapper(x));
return AuditEventsRepository.GetLast(TenantManager.GetCurrentTenant().TenantId, 20).Select(x => new EventWrapper(x));
}
[Create("audit/login/report")]

4
web/ASC.Web.Api/Models/AuditEventWrapper.cs → web/ASC.Web.Api/Models/EventWrapper.cs
View File

@ -31,9 +31,9 @@ using ASC.AuditTrail;
namespace ASC.Api.Security
{
public class AuditEventWrapper
public class EventWrapper
{
public AuditEventWrapper(AuditEvent auditEvent)
public EventWrapper(BaseEvent auditEvent)
{
Id = auditEvent.Id;
Date = new ApiDateTime(auditEvent.Date, TimeSpan.Zero);

52
web/ASC.Web.Api/Models/LoginEventWrapper.cs
View File

@ -1,52 +0,0 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL 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 more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
using System;
using ASC.Api.Core;
using ASC.AuditTrail;
namespace ASC.Api.Security
{
public class LoginEventWrapper
{
public LoginEventWrapper(LoginEvent loginEvent)
{
Id = loginEvent.Id;
Date = new ApiDateTime(loginEvent.Date, TimeSpan.Zero);
User = loginEvent.UserName;
Action = loginEvent.ActionText;
}
public int Id { get; private set; }
public ApiDateTime Date { get; private set; }
public string User { get; private set; }
public string Action { get; private set; }
}
}