Merge pull request #135 from ONLYOFFICE/bugfix/65709

Bugfix/65709
ONLYOFFICE · Jan 11, 2024 · 93eb325 · 93eb325
2 parents 6ccc639 + da0a56c
commit 93eb325
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/common/ASC.Api.Core/Core/ApiDateTime.cs b/common/ASC.Api.Core/Core/ApiDateTime.cs
@@ -385,7 +385,7 @@ public override ApiDateTime Read(ref Utf8JsonReader reader, Type typeToConvert,
         }
 
         if (DateTime.TryParseExact(reader.GetString(), ApiDateTime.Formats,
-                CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var dateTime))
+                CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out var dateTime))
         {
             return new ApiDateTime(dateTime, TimeSpan.Zero);
         }

diff --git a/products/ASC.Files/Core/ApiModels/RequestDto/LinkRequestDto.cs b/products/ASC.Files/Core/ApiModels/RequestDto/LinkRequestDto.cs
@@ -43,8 +43,8 @@ public class LinkRequestDto
     public FileShare Access { get; set; }
 
     /// <summary>Link expiration date</summary>
-    /// <type>System.DateTime, System</type>
-    public DateTime? ExpirationDate { get; set; }
+    /// <type>ASC.Api.Core.ApiDateTime, ASC.Api.Core</type>
+    public ApiDateTime ExpirationDate { get; set; }
 
     /// <summary>Link type</summary>
     /// <type>ASC.Files.Core.ApiModels.ResponseDto.LinkType, ASC.Files.Core</type>

diff --git a/products/ASC.Files/Server/Api/VirtualRoomsController.cs b/products/ASC.Files/Server/Api/VirtualRoomsController.cs
@@ -359,7 +359,7 @@ public async Task<FileShareDto> SetLinkAsync(T id, LinkRequestDto inDto)
         {
             LinkType.Invitation => await _fileStorageService.SetInvitationLinkAsync(id, inDto.LinkId, inDto.Title, inDto.Access),
             LinkType.External => await _fileStorageService.SetExternalLinkAsync(id, FileEntryType.Folder, inDto.LinkId, inDto.Title, 
-                inDto.Access is not (FileShare.Read or FileShare.None) ? FileShare.Read : inDto.Access , inDto.ExpirationDate ?? default, inDto.Password, inDto.DenyDownload),
+                inDto.Access is not (FileShare.Read or FileShare.None) ? FileShare.Read : inDto.Access , inDto.ExpirationDate, inDto.Password, inDto.DenyDownload),
             _ => throw new InvalidOperationException()
         };