Merge pull request #499 from NielsPilgaard/feature/ad-expiration

Feature/ad expiration

Author: NielsPilgaard

TODO.md

@@ -0,0 +1 @@
+# Acceptance tests

src/shared/Jordnaer.Shared/Database/Partner.cs

@@ -125,6 +125,16 @@ public class Partner
 	/// </summary>
 	public bool CanHavePartnerCard { get; set; } = true;
 
+	/// <summary>
+	/// When ads/card should start showing. Null means no start restriction.
+	/// </summary>
+	public DateTime? DisplayStartUtc { get; set; }
+
+	/// <summary>
+	/// When ads/card should stop showing. Null means no end restriction.
+	/// </summary>
+	public DateTime? DisplayEndUtc { get; set; }
+
 	public DateTime CreatedUtc { get; set; }
 
 	public List<PartnerAnalytics> Analytics { get; set; } = [];
@@ -146,6 +156,14 @@ public class Partner
 	/// </summary>
 	public bool HasAdImage => CanHaveAd && !string.IsNullOrWhiteSpace(AdImageUrl);
 
+	/// <summary>
+	/// Returns whether the partner is within its display time window.
+	/// Null values mean "no restriction" for that bound.
+	/// </summary>
+	public bool IsWithinDisplayWindow(DateTime utcNow) =>
+		(DisplayStartUtc is null || utcNow >= DisplayStartUtc) &&
+		(DisplayEndUtc is null || utcNow <= DisplayEndUtc);
+
 	/// <summary>
 	/// Validates that the partner has at least one type of presence (partner card or ad image)
 	/// </summary>

src/shared/Jordnaer.Shared/Validation/HexColorAttribute.cs

@@ -24,9 +24,16 @@ public override bool IsValid(object? value)
 			return false;
 		}
 
-		return HexColorRegex().IsMatch(hexColor);
+		return IsValidHexColor(hexColor);
 	}
 
+	/// <summary>
+	/// Checks whether the given string is a valid hex color in #RGB or #RRGGBB format.
+	/// Returns <c>false</c> for null, empty, or whitespace-only strings.
+	/// </summary>
+	public static bool IsValidHexColor([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] string? color)
+		=> color is not null && HexColorRegex().IsMatch(color);
+
 	[GeneratedRegex(@"^#([0-9A-Fa-f]{3}|[0-9A-Fa-f]{6})$")]
 	private static partial Regex HexColorRegex();
 }

src/web/Jordnaer/Components/Account/IdentityRedirectManager.cs

@@ -19,7 +19,10 @@ internal sealed class IdentityRedirectManager(NavigationManager navigationManage
 	[DoesNotReturn]
 	public void RedirectTo(string? uri, bool forceLoad = false)
 	{
-		uri ??= "";
+		if (string.IsNullOrEmpty(uri))
+		{
+			uri = "/";
+		}
 
 		// Prevent open redirects (including scheme-relative URLs like "//evil.com")
 		if (!IsSafeRelativeUrl(uri))

src/web/Jordnaer/Components/Account/Pages/ConfirmEmail.razor

@@ -43,7 +43,7 @@
     {
         if (UserId is null || Code is null)
         {
-            RedirectManager.RedirectTo("");
+            RedirectManager.RedirectTo("/");
         }
 
         var user = await UserManager.FindByIdAsync(UserId);

src/web/Jordnaer/Components/Account/Pages/ExternalLogin.razor

@@ -1,6 +1,5 @@
 @page "/Account/ExternalLogin"
 @using System.Text
-@using System.Text.Encodings.Web
 @using Mediator
 @using Microsoft.AspNetCore.WebUtilities
 @using Jordnaer.Features.Profile
@@ -229,7 +228,7 @@
             NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
             new Dictionary<string, object?> { ["userId"] = user.Id, ["code"] = code });
 
-            await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
+            await EmailSender.SendConfirmationLinkAsync(user, Input.Email, callbackUrl);
 
             // If account confirmation is required, we need to show the link if we don't have a real email sender
             if (UserManager.Options.SignIn.RequireConfirmedAccount)

src/web/Jordnaer/Components/Account/Pages/Manage/Email.razor

@@ -1,6 +1,5 @@
 @page "/Account/Manage/Email"
 @using System.Text
-@using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.WebUtilities
 
 @inject UserManager<ApplicationUser> UserManager
@@ -90,7 +89,7 @@
             NavigationManager.ToAbsoluteUri("Account/ConfirmEmailChange").AbsoluteUri,
             new Dictionary<string, object?> { ["userId"] = userId, ["email"] = Input.NewEmail, ["code"] = code });
 
-        await EmailSender.SendConfirmationLinkAsync(_user, Input.NewEmail, HtmlEncoder.Default.Encode(callbackUrl));
+        await EmailSender.SendConfirmationLinkAsync(_user, Input.NewEmail, callbackUrl);
 
         _message = new AlertMessage("Bekræftelses email er sendt. Tjek venligst din email.");
     }
@@ -109,7 +108,7 @@
             NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
             new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code });
 
-        await EmailSender.SendConfirmationLinkAsync(_user, _email, HtmlEncoder.Default.Encode(callbackUrl));
+        await EmailSender.SendConfirmationLinkAsync(_user, _email, callbackUrl);
 
         _message = new AlertMessage("Bekræftelses email er sendt. Tjek venligst din email.");
     }

src/web/Jordnaer/Components/Account/Pages/Register.razor

@@ -1,6 +1,5 @@
 @page "/Account/Register"
 @using System.Text
-@using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.WebUtilities
 @using Microsoft.EntityFrameworkCore
 @using Jordnaer.Features.Membership
@@ -246,7 +245,7 @@
             NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
             callbackParams);
 
-        await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
+        await EmailSender.SendConfirmationLinkAsync(user, Input.Email, callbackUrl);
 
         if (UserManager.Options.SignIn.RequireConfirmedAccount)
         {

src/web/Jordnaer/Components/Account/Pages/ResendEmailConfirmation.razor

@@ -1,6 +1,5 @@
 @page "/Account/ResendEmailConfirmation"
 @using System.Text
-@using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.WebUtilities
 
 @inject UserManager<ApplicationUser> UserManager
@@ -50,7 +49,7 @@
         var callbackUrl = NavigationManager.GetUriWithQueryParameters(
             NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
             new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code });
-        await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
+        await EmailSender.SendConfirmationLinkAsync(user, Input.Email, callbackUrl);
 
         _message = new AlertMessage("Bekræftelses-emailen er afsendt. Tjek venligst din email.");
     }

src/web/Jordnaer/Consumers/GroupPostCreatedConsumer.cs

@@ -6,7 +6,6 @@
 using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
-using System.Net;
 using System.Text.RegularExpressions;
 
 namespace Jordnaer.Consumers;
@@ -69,7 +68,7 @@ public async Task Consume(ConsumeContext<GroupPostCreated> consumeContext)
 			var email = new SendEmail
 			{
 				Subject = $"Nyt opslag i {message.GroupName}",
-				HtmlContent = CreateNewPostEmailContent(message.AuthorDisplayName, postPreview, groupUrl),
+				HtmlContent = CreateNewPostEmailContent(baseUrl, message.AuthorDisplayName, postPreview, groupUrl),
 				Bcc = emails
 			};
 
@@ -96,31 +95,8 @@ private static string GetPostPreview(string text)
 			: plainText.Substring(0, 200) + "...";
 	}
 
-	private static string CreateNewPostEmailContent(string authorName, string postPreview, string groupUrl)
-	{
-		// HTML-encode to prevent XSS attacks
-		var encodedAuthorName = WebUtility.HtmlEncode(authorName);
-		var encodedPostPreview = WebUtility.HtmlEncode(postPreview);
-
-		// Convert newlines to <br/> tags for proper display after encoding
-		encodedPostPreview = encodedPostPreview.Replace("\r\n", "<br/>").Replace("\n", "<br/>");
-
-		var encodedGroupUrl = WebUtility.HtmlEncode(groupUrl);
-
-		return $"""
-			<h4>Nyt opslag i din gruppe</h4>
-
-			<p><b>{encodedAuthorName}</b> har oprettet et nyt opslag:</p>
-
-			<blockquote style="border-left: 3px solid #ccc; padding-left: 10px; color: #666;">
-				{encodedPostPreview}
-			</blockquote>
-
-			<p><a href="{encodedGroupUrl}">Klik her for at se opslaget</a></p>
-
-			{EmailConstants.Signature}
-			""";
-	}
+	private static string CreateNewPostEmailContent(string baseUrl, string authorName, string postPreview, string groupUrl) =>
+		EmailContentBuilder.GroupPostNotification(baseUrl, authorName, postPreview, groupUrl);
 
 	[GeneratedRegex("<.*?>")]
 	private static partial Regex HtmlTagsRegex();