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

refactor

Browse Source
This commit is contained in:
Maksim Chegulov 2022-09-06 13:26:08 +03:00
parent bb35633387
commit 1d75a5adc3
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/ASC.Api.Core/Security/EmailValidationKeyModelHelper.cs
View File

@ -38,7 +38,7 @@ public class EmailValidationKeyModelHelper
private readonly AuthContext _authContext;
private readonly UserManager _userManager;
private readonly AuthManager _authentication;
private readonly RoomInvitationLinksService _roomLinksService;
private readonly DocSpaceLinksHelper _roomLinksService;
private readonly AuditEventsRepository _auditEventsRepository;
private readonly TenantUtil _tenantUtil;
private readonly MessageTarget _messageTarget;
@ -49,7 +49,7 @@ public class EmailValidationKeyModelHelper
AuthContext authContext,
UserManager userManager,
AuthManager authentication,
RoomInvitationLinksService roomLinksService,
DocSpaceLinksHelper roomLinksService,
AuditEventsRepository auditEventsRepository,
TenantUtil tenantUtil,
MessageTarget messageTarget)
@ -121,7 +121,7 @@ public class EmailValidationKeyModelHelper
{
checkKeyResult = _provider.ValidateEmailKey(email + type + ((int)emplType + (int)fileShare + roomId), key, _provider.ValidEmailKeyInterval);
if (checkKeyResult == ValidationResult.Ok &&
!_roomLinksService.VisitProcess(roomId, email, key, _provider.ValidVisitLinkInterval))
!_roomLinksService.ProcessLinkVisit(roomId, email, key, _provider.ValidVisitLinkInterval))
{
checkKeyResult = ValidationResult.Expired;
}

12
common/ASC.Api.Core/Security/RoomInvitationLinksService.cs
View File

@ -27,7 +27,7 @@
namespace ASC.Api.Core.Security;
[Scope]
public class RoomInvitationLinksService
public class DocSpaceLinksHelper
{
private readonly CommonLinkUtility _commonLinkUtility;
private readonly IHttpContextAccessor _httpContextAccessor;
@ -36,7 +36,7 @@ public class RoomInvitationLinksService
private readonly MessageService _messageService;
private readonly IDbContextFactory<MessagesContext> _dbContextFactory;
public RoomInvitationLinksService(
public DocSpaceLinksHelper(
CommonLinkUtility commonLinkUtility,
IHttpContextAccessor httpContextAccessor,
MessageTarget messageTarget,
@ -52,12 +52,12 @@ public class RoomInvitationLinksService
_dbContextFactory = dbContextFactory;
}
public string GenerateLink<T>(T id, int fileShare, EmployeeType employeeType, Guid guid)
public string GenerateInvitationRoomLink<T>(T id, int fileShare, EmployeeType employeeType, Guid guid)
{
return GenerateLink(id, string.Empty, fileShare, employeeType, guid);
return GenerateInvitationRoomLink(id, string.Empty, fileShare, employeeType, guid);
}
public string GenerateLink<T>(T id, string email, int fileShare, EmployeeType employeeType, Guid guid)
public string GenerateInvitationRoomLink<T>(T id, string email, int fileShare, EmployeeType employeeType, Guid guid)
{
var postifx = (int)employeeType + fileShare + id.ToString();
@ -67,7 +67,7 @@ public class RoomInvitationLinksService
return link;
}
public bool VisitProcess(string id, string email, string key, TimeSpan interval)
public bool ProcessLinkVisit(string id, string email, string key, TimeSpan interval)
{
if (!string.IsNullOrEmpty(email))
{

6
products/ASC.Files/Core/Core/FileStorageService.cs
View File

@ -82,7 +82,7 @@ public class FileStorageService<T> //: IFileStorageService
private readonly FileShareParamsHelper _fileShareParamsHelper;
private readonly EncryptionLoginProvider _encryptionLoginProvider;
private readonly StudioNotifyService _studioNotifyService;
private readonly RoomInvitationLinksService _roomLinksService;
private readonly DocSpaceLinksHelper _roomLinksService;
public FileStorageService(
Global global,
@ -136,7 +136,7 @@ public class FileStorageService<T> //: IFileStorageService
FileShareParamsHelper fileShareParamsHelper,
EncryptionLoginProvider encryptionLoginProvider,
StudioNotifyService studioNotifyService,
RoomInvitationLinksService roomLinksService)
DocSpaceLinksHelper roomLinksService)
{
_global = global;
_globalStore = globalStore;
@ -2509,7 +2509,7 @@ public class FileStorageService<T> //: IFileStorageService
if (!string.IsNullOrEmpty(ace.Email))
{
var link = _roomLinksService.GenerateLink(entry.Id, (int)ace.Share, EmployeeType.User, ace.SubjectId);
var link = _roomLinksService.GenerateInvitationRoomLink(entry.Id, (int)ace.Share, EmployeeType.User, ace.SubjectId);
_studioNotifyService.SendEmailRoomInvite(ace.Email, link);
}
}

12
products/ASC.Files/Server/Api/VirtualRoomsController.cs
View File

@ -38,7 +38,7 @@ public class VirtualRoomsInternalController : VirtualRoomsController<int>
SecurityControllerHelper<int> securityControllerHelper,
CoreBaseSettings coreBaseSettings,
AuthContext authContext,
RoomInvitationLinksService roomLinksService,
DocSpaceLinksHelper roomLinksService,
CustomTagsService<int> customTagsService,
RoomLogoManager roomLogoManager,
StudioNotifyService studioNotifyService,
@ -86,7 +86,7 @@ public class VirtualRoomsThirdPartyController : VirtualRoomsController<string>
SecurityControllerHelper<string> securityControllerHelper,
CoreBaseSettings coreBaseSettings,
AuthContext authContext,
RoomInvitationLinksService roomLinksService,
DocSpaceLinksHelper roomLinksService,
CustomTagsService<string> customTagsService,
RoomLogoManager roomLogoManager,
StudioNotifyService studioNotifyService,
@ -136,7 +136,7 @@ public abstract class VirtualRoomsController<T> : ApiControllerBase
private readonly SecurityControllerHelper<T> _securityControllerHelper;
private readonly CoreBaseSettings _coreBaseSettings;
private readonly AuthContext _authContext;
private readonly RoomInvitationLinksService _roomLinksService;
private readonly DocSpaceLinksHelper _roomLinksService;
private readonly CustomTagsService<T> _customTagsService;
private readonly RoomLogoManager _roomLogoManager;
private readonly StudioNotifyService _studioNotifyService;
@ -145,7 +145,7 @@ public abstract class VirtualRoomsController<T> : ApiControllerBase
private readonly FileSecurityCommon _fileSecurityCommon;
private readonly EmailValidationKeyProvider _emailValidationKeyProvider;
protected VirtualRoomsController(FoldersControllerHelper<T> foldersControllerHelper, GlobalFolderHelper globalFolderHelper, FileOperationDtoHelper fileOperationDtoHelper, SecurityControllerHelper<T> securityControllerHelper, CoreBaseSettings coreBaseSettings, AuthContext authContext, RoomInvitationLinksService roomLinksService, CustomTagsService<T> customTagsService, RoomLogoManager roomLogoManager, StudioNotifyService studioNotifyService, FileStorageService<T> fileStorageService, FileSecurity fileSecurity, FileSecurityCommon fileSecurityCommon, EmailValidationKeyProvider emailValidationKeyProvider,
protected VirtualRoomsController(FoldersControllerHelper<T> foldersControllerHelper, GlobalFolderHelper globalFolderHelper, FileOperationDtoHelper fileOperationDtoHelper, SecurityControllerHelper<T> securityControllerHelper, CoreBaseSettings coreBaseSettings, AuthContext authContext, DocSpaceLinksHelper roomLinksService, CustomTagsService<T> customTagsService, RoomLogoManager roomLogoManager, StudioNotifyService studioNotifyService, FileStorageService<T> fileStorageService, FileSecurity fileSecurity, FileSecurityCommon fileSecurityCommon, EmailValidationKeyProvider emailValidationKeyProvider,
FolderDtoHelper folderDtoHelper,
FileDtoHelper fileDtoHelper) : base(folderDtoHelper, fileDtoHelper)
{
@ -376,7 +376,7 @@ public abstract class VirtualRoomsController<T> : ApiControllerBase
await ErrorIfNotRights(id, access);
return _roomLinksService.GenerateLink(id, (int)access, EmployeeType.User, _authContext.CurrentAccount.ID);
return _roomLinksService.GenerateInvitationRoomLink(id, (int)access, EmployeeType.User, _authContext.CurrentAccount.ID);
}
/// <summary>
@ -412,7 +412,7 @@ public abstract class VirtualRoomsController<T> : ApiControllerBase
try
{
var link = _roomLinksService.GenerateLink(id, email, (int)inDto.Access, inDto.EmployeeType, _authContext.CurrentAccount.ID);
var link = _roomLinksService.GenerateInvitationRoomLink(id, email, (int)inDto.Access, inDto.EmployeeType, _authContext.CurrentAccount.ID);
_studioNotifyService.SendEmailRoomInvite(email, link);
result.Success = true;