fixed expiration date setting for primary file link

ONLYOFFICE · Nov 14, 2024 · e5c6597 · e5c6597
1 parent c626c15
commit e5c6597
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/products/ASC.Files/Core/Core/FileStorageService.cs b/products/ASC.Files/Core/Core/FileStorageService.cs
@@ -3139,7 +3139,8 @@ public async Task<AceWrapper> GetPrimaryExternalLinkAsync<T>(
         DateTime expirationDate = default,
         bool denyDownload = false,
         bool requiredAuth = false,
-        string password = null)
+        string password = null,
+        bool allowUnlimitedDate = false)
     {
         var fileDao = daoFactory.GetFileDao<T>();
         var folderDao = daoFactory.GetFolderDao<T>();
@@ -3188,7 +3189,7 @@ public async Task<AceWrapper> GetPrimaryExternalLinkAsync<T>(
                 primary: true,
                 expirationDate: expirationDate != default 
                     ? expirationDate 
-                    : entry.RootFolderType == FolderType.USER ? DateTime.UtcNow.Add(filesLinkUtility.DefaultLinkLifeTime) : default,
+                    : entry.RootFolderType == FolderType.USER && !allowUnlimitedDate ? DateTime.UtcNow.Add(filesLinkUtility.DefaultLinkLifeTime) : default,
                 denyDownload: denyDownload,
                 requiredAuth: requiredAuth,
                 password: password);

diff --git a/products/ASC.Files/Server/Api/FilesController.cs b/products/ASC.Files/Server/Api/FilesController.cs
@@ -428,7 +428,7 @@ public async Task<FileDto<T>> UpdateFileStreamFromFormAsync(FileStreamRequestDto
     [HttpPost("file/{id}/link")]
     public async Task<FileShareDto> CreatePrimaryExternalLinkAsync(FileLinkRequestDto<T> inDto)
     {
-        var linkAce = await fileStorageService.GetPrimaryExternalLinkAsync(inDto.Id, FileEntryType.File, inDto.File.Access, expirationDate: inDto.File.ExpirationDate, requiredAuth: inDto.File.Internal);
+        var linkAce = await fileStorageService.GetPrimaryExternalLinkAsync(inDto.Id, FileEntryType.File, inDto.File.Access, expirationDate: inDto.File.ExpirationDate, requiredAuth: inDto.File.Internal, allowUnlimitedDate: true);
         return await fileShareDtoHelper.Get(linkAce);
     }