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

refactoring

Browse Source
This commit is contained in:
pavelbannov 2023-01-10 17:38:14 +03:00
parent 506b1cf3ca
commit bba7d332f7
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,7 +511,7 @@ public class FileStorageService //: IFileStorageService
return room; return room;
} }
public async Task<Folder<T>> CreateThirdPartyRoomAsync<T>(string title, RoomType roomType, T parentId, bool @private, IEnumerable<FileShareParams> share, bool notify, string sharingMessage) public async Task<Folder<string>> CreateThirdPartyRoomAsync(string title, RoomType roomType, string parentId, bool @private, IEnumerable<FileShareParams> share, bool notify, string sharingMessage)
{ {
ArgumentNullException.ThrowIfNull(title, nameof(title)); ArgumentNullException.ThrowIfNull(title, nameof(title));
ArgumentNullException.ThrowIfNull(parentId, nameof(parentId)); ArgumentNullException.ThrowIfNull(parentId, nameof(parentId));
@ -521,8 +521,8 @@ public class FileStorageService //: IFileStorageService
throw new ArgumentNullException(nameof(share)); throw new ArgumentNullException(nameof(share));
} }
var folderDao = GetFolderDao<T>(); var folderDao = GetFolderDao<string>();
var providerDao = GetProviderDao<T>(); var providerDao = GetProviderDao();
var parent = await folderDao.GetFolderAsync(parentId); var parent = await folderDao.GetFolderAsync(parentId);
var providerInfo = await providerDao.GetProviderInfoAsync(parent.ProviderId); var providerInfo = await providerDao.GetProviderInfoAsync(parent.ProviderId);
@ -1623,9 +1623,9 @@ public class FileStorageService //: IFileStorageService
return _fileOperationsManager.MarkAsRead(_authContext.CurrentAccount.ID, _tenantManager.GetCurrentTenant(), foldersId, filesId, GetHttpHeaders()); return _fileOperationsManager.MarkAsRead(_authContext.CurrentAccount.ID, _tenantManager.GetCurrentTenant(), foldersId, filesId, GetHttpHeaders());
} }
public IAsyncEnumerable<ThirdPartyParams> GetThirdPartyAsync<T>() public IAsyncEnumerable<ThirdPartyParams> GetThirdPartyAsync()
{ {
var providerDao = GetProviderDao<T>(); var providerDao = GetProviderDao();
if (providerDao == null) if (providerDao == null)
{ {
return AsyncEnumerable.Empty<ThirdPartyParams>(); return AsyncEnumerable.Empty<ThirdPartyParams>();
@ -1648,25 +1648,25 @@ public class FileStorageService //: IFileStorageService
} }
} }
public async Task<Folder<T>> GetBackupThirdPartyAsync<T>() public async Task<Folder<string>> GetBackupThirdPartyAsync()
{ {
var providerDao = GetProviderDao<T>(); var providerDao = GetProviderDao();
if (providerDao == null) if (providerDao == null)
{ {
return null; return null;
} }
return await InternalBackupGetThirdPartyAsync<T>(providerDao); return await InternalBackupGetThirdPartyAsync(providerDao);
} }
private async Task<Folder<T>> InternalBackupGetThirdPartyAsync<T>(IProviderDao providerDao) private async Task<Folder<string>> InternalBackupGetThirdPartyAsync(IProviderDao providerDao)
{ {
var providerInfo = await providerDao.GetProvidersInfoAsync(FolderType.ThirdpartyBackup).SingleOrDefaultAsync(); var providerInfo = await providerDao.GetProvidersInfoAsync(FolderType.ThirdpartyBackup).SingleOrDefaultAsync();
if (providerInfo != null) if (providerInfo != null)
{ {
var folderDao = GetFolderDao<T>(); var folderDao = GetFolderDao<string>();
var folder = await folderDao.GetFolderAsync((T)Convert.ChangeType(providerInfo.RootFolderId, typeof(T))); var folder = await folderDao.GetFolderAsync(providerInfo.RootFolderId);
ErrorIf(!await _fileSecurity.CanReadAsync(folder), FilesCommonResource.ErrorMassage_SecurityException_ViewFolder); ErrorIf(!await _fileSecurity.CanReadAsync(folder), FilesCommonResource.ErrorMassage_SecurityException_ViewFolder);
return folder; return folder;
@ -1677,14 +1677,14 @@ public class FileStorageService //: IFileStorageService
} }
} }
public IAsyncEnumerable<FileEntry> GetThirdPartyFolderAsync<T>(int folderType = 0) public IAsyncEnumerable<FileEntry> GetThirdPartyFolderAsync(int folderType = 0)
{ {
if (!_filesSettingsHelper.EnableThirdParty) if (!_filesSettingsHelper.EnableThirdParty)
{ {
return AsyncEnumerable.Empty<FileEntry>(); return AsyncEnumerable.Empty<FileEntry>();
} }
var providerDao = GetProviderDao<T>(); var providerDao = GetProviderDao();
if (providerDao == null) if (providerDao == null)
{ {
return AsyncEnumerable.Empty<FileEntry>(); return AsyncEnumerable.Empty<FileEntry>();
@ -1704,22 +1704,22 @@ public class FileStorageService //: IFileStorageService
} }
} }
public Task<Folder<T>> SaveThirdPartyAsync<T>(ThirdPartyParams thirdPartyParams) public Task<Folder<string>> SaveThirdPartyAsync(ThirdPartyParams thirdPartyParams)
{ {
var providerDao = GetProviderDao<T>(); var providerDao = GetProviderDao();
if (providerDao == null) if (providerDao == null)
{ {
return Task.FromResult<Folder<T>>(null); return Task.FromResult<Folder<string>>(null);
} }
return InternalSaveThirdPartyAsync<T>(thirdPartyParams, providerDao); return InternalSaveThirdPartyAsync(thirdPartyParams, providerDao);
} }
private async Task<Folder<T>> InternalSaveThirdPartyAsync<T>(ThirdPartyParams thirdPartyParams, IProviderDao providerDao) private async Task<Folder<string>> InternalSaveThirdPartyAsync(ThirdPartyParams thirdPartyParams, IProviderDao providerDao)
{ {
var folderDaoInt = _daoFactory.GetFolderDao<int>(); var folderDaoInt = _daoFactory.GetFolderDao<int>();
var folderDao = GetFolderDao<T>(); var folderDao = GetFolderDao<string>();
ErrorIf(thirdPartyParams == null, FilesCommonResource.ErrorMassage_BadRequest); ErrorIf(thirdPartyParams == null, FilesCommonResource.ErrorMassage_BadRequest);
@ -1772,7 +1772,7 @@ public class FileStorageService //: IFileStorageService
lostFolderType = lostProvider.RootFolderType; lostFolderType = lostProvider.RootFolderType;
if (lostProvider.RootFolderType == FolderType.COMMON && !thirdPartyParams.Corporate) if (lostProvider.RootFolderType == FolderType.COMMON && !thirdPartyParams.Corporate)
{ {
var lostFolder = await folderDao.GetFolderAsync((T)Convert.ChangeType(lostProvider.RootFolderId, typeof(T))); var lostFolder = await folderDao.GetFolderAsync(lostProvider.RootFolderId);
await _fileMarker.RemoveMarkAsNewForAllAsync(lostFolder); await _fileMarker.RemoveMarkAsNewForAllAsync(lostFolder);
} }
@ -1783,11 +1783,11 @@ public class FileStorageService //: IFileStorageService
var provider = await providerDao.GetProviderInfoAsync(curProviderId); var provider = await providerDao.GetProviderInfoAsync(curProviderId);
await provider.InvalidateStorageAsync(); await provider.InvalidateStorageAsync();
var folderDao1 = GetFolderDao<T>(); var folderDao1 = GetFolderDao<string>();
var folder = await folderDao1.GetFolderAsync((T)Convert.ChangeType(provider.RootFolderId, typeof(T))); var folder = await folderDao1.GetFolderAsync(provider.RootFolderId);
ErrorIf(!await _fileSecurity.CanReadAsync(folder), FilesCommonResource.ErrorMassage_SecurityException_ViewFolder); ErrorIf(!await _fileSecurity.CanReadAsync(folder), FilesCommonResource.ErrorMassage_SecurityException_ViewFolder);
_filesMessageService.Send(parentFolder, GetHttpHeaders(), messageAction, folder.Id.ToString(), provider.ProviderKey); _filesMessageService.Send(parentFolder, GetHttpHeaders(), messageAction, folder.Id, provider.ProviderKey);
if (thirdPartyParams.Corporate && lostFolderType != FolderType.COMMON) if (thirdPartyParams.Corporate && lostFolderType != FolderType.COMMON)
{ {
@ -1797,19 +1797,19 @@ public class FileStorageService //: IFileStorageService
return folder; return folder;
} }
public Task<Folder<T>> SaveThirdPartyBackupAsync<T>(ThirdPartyParams thirdPartyParams) public Task<Folder<string>> SaveThirdPartyBackupAsync(ThirdPartyParams thirdPartyParams)
{ {
var providerDao = GetProviderDao<T>(); var providerDao = GetProviderDao();
if (providerDao == null) if (providerDao == null)
{ {
return Task.FromResult<Folder<T>>(null); return Task.FromResult<Folder<string>>(null);
} }
return InternalSaveThirdPartyBackupAsync<T>(thirdPartyParams, providerDao); return InternalSaveThirdPartyBackupAsync(thirdPartyParams, providerDao);
} }
private async Task<Folder<T>> InternalSaveThirdPartyBackupAsync<T>(ThirdPartyParams thirdPartyParams, IProviderDao providerDao) private async Task<Folder<string>> InternalSaveThirdPartyBackupAsync(ThirdPartyParams thirdPartyParams, IProviderDao providerDao)
{ {
ErrorIf(thirdPartyParams == null, FilesCommonResource.ErrorMassage_BadRequest); ErrorIf(thirdPartyParams == null, FilesCommonResource.ErrorMassage_BadRequest);
ErrorIf(!_filesSettingsHelper.EnableThirdParty, FilesCommonResource.ErrorMassage_SecurityException_Create); ErrorIf(!_filesSettingsHelper.EnableThirdParty, FilesCommonResource.ErrorMassage_SecurityException_Create);
@ -1820,7 +1820,7 @@ public class FileStorageService //: IFileStorageService
MessageAction messageAction; MessageAction messageAction;
var thirdparty = await GetBackupThirdPartyAsync<T>(); var thirdparty = await GetBackupThirdPartyAsync();
if (thirdparty == null) if (thirdparty == null)
{ {
ErrorIf(!_thirdpartyConfiguration.SupportInclusion(_daoFactory) ErrorIf(!_thirdpartyConfiguration.SupportInclusion(_daoFactory)
@ -1855,8 +1855,8 @@ public class FileStorageService //: IFileStorageService
var provider = await providerDao.GetProviderInfoAsync(curProviderId); var provider = await providerDao.GetProviderInfoAsync(curProviderId);
await provider.InvalidateStorageAsync(); await provider.InvalidateStorageAsync();
var folderDao1 = GetFolderDao<T>(); var folderDao1 = GetFolderDao<string>();
var folder = await folderDao1.GetFolderAsync((T)Convert.ChangeType(provider.RootFolderId, typeof(T))); var folder = await folderDao1.GetFolderAsync(provider.RootFolderId);
_filesMessageService.Send(GetHttpHeaders(), messageAction, folder.Id.ToString(), provider.ProviderKey); _filesMessageService.Send(GetHttpHeaders(), messageAction, folder.Id.ToString(), provider.ProviderKey);
@ -1865,7 +1865,7 @@ public class FileStorageService //: IFileStorageService
public Task<object> DeleteThirdPartyAsync(string providerId) public Task<object> DeleteThirdPartyAsync(string providerId)
{ {
var providerDao = GetProviderDao<string>(); var providerDao = GetProviderDao();
if (providerDao == null) if (providerDao == null)
{ {
return Task.FromResult<object>(null); return Task.FromResult<object>(null);
@ -2222,7 +2222,7 @@ public class FileStorageService //: IFileStorageService
ErrorIf(Equals(userTo, Constants.LostUser), FilesCommonResource.ErrorMassage_UserNotFound); ErrorIf(Equals(userTo, Constants.LostUser), FilesCommonResource.ErrorMassage_UserNotFound);
ErrorIf(_userManager.IsUser(userTo), FilesCommonResource.ErrorMassage_SecurityException); ErrorIf(_userManager.IsUser(userTo), FilesCommonResource.ErrorMassage_SecurityException);
var providerDao = GetProviderDao<T>(); var providerDao = GetProviderDao();
if (providerDao != null) if (providerDao != null)
{ {
//move common thirdparty storage userFrom //move common thirdparty storage userFrom
@ -2268,7 +2268,7 @@ public class FileStorageService //: IFileStorageService
//delete docuSign //delete docuSign
_docuSignToken.DeleteToken(userId); _docuSignToken.DeleteToken(userId);
var providerDao = GetProviderDao<T>(); var providerDao = GetProviderDao();
if (providerDao != null) if (providerDao != null)
{ {
//delete thirdparty storage //delete thirdparty storage
@ -3174,7 +3174,7 @@ public class FileStorageService //: IFileStorageService
return _globalStore.GetStoreTemplate(); return _globalStore.GetStoreTemplate();
} }
private IProviderDao GetProviderDao<T>() private IProviderDao GetProviderDao()
{ {
return _daoFactory.ProviderDao; return _daoFactory.ProviderDao;
} }

8
products/ASC.Files/Server/Api/ThirdpartyController.cs
View File

@ -187,7 +187,7 @@ public class ThirdpartyController : ApiControllerBase
[HttpGet("thirdparty")] [HttpGet("thirdparty")]
public IAsyncEnumerable<ThirdPartyParams> GetThirdPartyAccountsAsync() public IAsyncEnumerable<ThirdPartyParams> GetThirdPartyAccountsAsync()
{ {
return _fileStorageService.GetThirdPartyAsync<string>(); return _fileStorageService.GetThirdPartyAsync();
} }
/// <summary> /// <summary>
@ -199,7 +199,7 @@ public class ThirdpartyController : ApiControllerBase
[HttpGet("thirdparty/backup")] [HttpGet("thirdparty/backup")]
public async Task<FolderDto<string>> GetBackupThirdPartyAccountAsync() public async Task<FolderDto<string>> GetBackupThirdPartyAccountAsync()
{ {
var folder = await _fileStorageService.GetBackupThirdPartyAsync<string>(); var folder = await _fileStorageService.GetBackupThirdPartyAsync();
if (folder != null) if (folder != null)
{ {
@ -268,7 +268,7 @@ public class ThirdpartyController : ApiControllerBase
ProviderKey = inDto.ProviderKey, ProviderKey = inDto.ProviderKey,
}; };
var folder = await _fileStorageService.SaveThirdPartyAsync<string>(thirdPartyParams); var folder = await _fileStorageService.SaveThirdPartyAsync(thirdPartyParams);
return await _folderDtoHelper.GetAsync(folder); return await _folderDtoHelper.GetAsync(folder);
} }
@ -303,7 +303,7 @@ public class ThirdpartyController : ApiControllerBase
ProviderKey = inDto.ProviderKey, ProviderKey = inDto.ProviderKey,
}; };
var folder = await _fileStorageService.SaveThirdPartyBackupAsync<string>(thirdPartyParams); var folder = await _fileStorageService.SaveThirdPartyBackupAsync(thirdPartyParams);
return await _folderDtoHelper.GetAsync(folder); return await _folderDtoHelper.GetAsync(folder);
} }