hotfix public shares

Author: LucHeart

API/Controller/Shares/Links/AddShocker.cs

@@ -24,7 +24,7 @@ public sealed partial class ShareLinksController
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status409Conflict, MediaTypeNames.Application.ProblemJson)] // ShockerAlreadyInPublicShare
     public async Task<IActionResult> AddShocker([FromRoute] Guid publicShareId, [FromRoute] Guid shockerId)
     {
-        var exists = await _db.PublicShares.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == publicShareId);
+        var exists = await _db.PublicShares.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == publicShareId && (x.ExpiresAt == null || x.ExpiresAt > DateTime.UtcNow));
         if (!exists) return Problem(PublicShareError.PublicShareNotFound);
 
         var ownShocker =

API/Controller/Shares/Links/CreatePublicShare.cs

@@ -1,6 +1,7 @@
 using System.Net.Mime;
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Requests;
+using OpenShock.Common.Errors;
 using OpenShock.Common.Models;
 using OpenShock.Common.OpenShockDb;
 
@@ -17,6 +18,12 @@ public sealed partial class ShareLinksController
     [ProducesResponseType<LegacyDataResponse<Guid>>(StatusCodes.Status200OK,  MediaTypeNames.Application.Json)]
     public async Task<IActionResult> CreatePublicShare([FromBody] PublicShareCreate body)
     {
+        // Expiry date in the past is not allowed, but null (no expiry) is allowed
+        if (body.ExpiresOn <= DateTime.UtcNow)
+        {
+            return Problem(PublicShareError.PublicShareExpiryDateInPast);
+        }
+        
         var entity = new PublicShare
         {
             Id = Guid.CreateVersion7(),

API/Controller/Shares/Links/DeletePublicShare.cs

@@ -22,7 +22,7 @@ public sealed partial class ShareLinksController
     public async Task<IActionResult> DeletePublicShare([FromRoute] Guid publicShareId)
     {
         var result = await _db.PublicShares
-            .Where(x => x.Id == publicShareId)
+            .Where(x => x.Id == publicShareId && (x.ExpiresAt == null || x.ExpiresAt > DateTime.UtcNow))
             .WhereIsUserOrPrivileged(x => x.Owner, CurrentUser)
             .ExecuteDeleteAsync();
 

API/Controller/Shares/Links/EditShocker.cs

@@ -24,7 +24,7 @@ public sealed partial class ShareLinksController
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // PublicShareNotFound, ShockerNotInPublicShare
     public async Task<IActionResult> EditShocker([FromRoute] Guid publicShareId, [FromRoute] Guid shockerId, [FromBody] PublicShareEditShocker body)
     {
-        var exists = await _db.PublicShares.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == publicShareId);
+        var exists = await _db.PublicShares.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == publicShareId && (x.ExpiresAt == null || x.ExpiresAt > DateTime.UtcNow));
         if (!exists) return Problem(PublicShareError.PublicShareNotFound);
 
         var shocker =

API/Controller/Shares/Links/List.cs

@@ -17,7 +17,7 @@ public sealed partial class ShareLinksController
     public IActionResult List()
     {
         var ownPublicShares = _db.PublicShares
-            .Where(x => x.OwnerId == CurrentUser.Id && x.ExpiresAt > DateTime.UtcNow)
+            .Where(x => x.OwnerId == CurrentUser.Id && (x.ExpiresAt == null || x.ExpiresAt > DateTime.UtcNow))
             .Select(x => OwnPublicShareResponse.GetFromEf(x))
             .AsAsyncEnumerable();
 

API/Controller/Shares/Links/PauseShocker.cs

@@ -26,7 +26,7 @@ public sealed partial class ShareLinksController
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // PublicShareNotFound, ShockerNotInPublicShare
     public async Task<IActionResult> PauseShocker([FromRoute] Guid publicShareId, [FromRoute] Guid shockerId, [FromBody] PauseRequest body)
     {
-        var exists = await _db.PublicShares.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == publicShareId);
+        var exists = await _db.PublicShares.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == publicShareId && (x.ExpiresAt == null || x.ExpiresAt > DateTime.UtcNow));
         if (!exists) return Problem(PublicShareError.PublicShareNotFound);
 
         var shocker =

API/Controller/Shares/Links/RemoveShocker.cs

@@ -24,7 +24,7 @@ public sealed partial class ShareLinksController
     public async Task<IActionResult> RemoveShocker([FromRoute] Guid publicShareId, [FromRoute] Guid shockerId)
     {
         var exists = await _db.PublicShares
-            .Where(x => x.Id == publicShareId)
+            .Where(x => x.Id == publicShareId && (x.ExpiresAt == null || x.ExpiresAt > DateTime.UtcNow))
             .WhereIsUserOrPrivileged(x => x.Owner, CurrentUser)
             .AnyAsync();
         if (!exists)

Common/Errors/PublicShareError.cs

@@ -12,4 +12,7 @@ public static class PublicShareError
 
     // Remove shocker errors
     public static OpenShockProblem ShockerNotInPublicShare => new("ShareLink.ShockerNotInShareLink", "Shocker does not exist in public share", HttpStatusCode.NotFound);
+    
+    // Create share errors
+    public static OpenShockProblem PublicShareExpiryDateInPast => new("ShareLink.ExpiryDateInPast", "Expiry date cannot be in the past", HttpStatusCode.BadRequest);
 }