diff --git a/src/Altinn.Notifications/Mappers/OrderMapper.cs b/src/Altinn.Notifications/Mappers/OrderMapper.cs index 055b53cf..050163ab 100644 --- a/src/Altinn.Notifications/Mappers/OrderMapper.cs +++ b/src/Altinn.Notifications/Mappers/OrderMapper.cs @@ -18,7 +18,7 @@ public static class OrderMapper /// public static NotificationOrderRequest MapToOrderRequest(this EmailNotificationOrderRequestExt extRequest, string creator) { - var emailTemplate = new EmailTemplate(extRequest.FromAddress, extRequest.Subject, extRequest.Body, extRequest.ContentType); + var emailTemplate = new EmailTemplate(null, extRequest.Subject, extRequest.Body, extRequest.ContentType); var recipients = new List(); diff --git a/src/Altinn.Notifications/Models/EmailNotificationOrderRequestExt.cs b/src/Altinn.Notifications/Models/EmailNotificationOrderRequestExt.cs index 51ebe5e2..5a0a51c6 100644 --- a/src/Altinn.Notifications/Models/EmailNotificationOrderRequestExt.cs +++ b/src/Altinn.Notifications/Models/EmailNotificationOrderRequestExt.cs @@ -13,12 +13,6 @@ namespace Altinn.Notifications.Models; /// public class EmailNotificationOrderRequestExt { - /// - /// Gets or sets the from address to use as sender of the email - /// - [JsonPropertyName("fromAddress")] - public string? FromAddress { get; set; } - /// /// Gets or sets the subject of the email /// diff --git a/test/Altinn.Notifications.IntegrationTests/Notifications/EmailNotificationsOrderController/EmailNotificationOrdersControllerTests.cs b/test/Altinn.Notifications.IntegrationTests/Notifications/EmailNotificationsOrderController/EmailNotificationOrdersControllerTests.cs index d60958ac..7dda8d21 100644 --- a/test/Altinn.Notifications.IntegrationTests/Notifications/EmailNotificationsOrderController/EmailNotificationOrdersControllerTests.cs +++ b/test/Altinn.Notifications.IntegrationTests/Notifications/EmailNotificationsOrderController/EmailNotificationOrdersControllerTests.cs @@ -55,7 +55,6 @@ public EmailNotificationOrdersControllerTests(IntegrationTestWebApplicationFacto { Body = "email-body", ContentType = EmailContentType.Html, - FromAddress = "sender@domain.com", Recipients = new List() { new RecipientExt() { EmailAddress = "recipient1@domain.com" }, new RecipientExt() { EmailAddress = "recipient2@domain.com" } }, SendersReference = "senders-reference", RequestedSendTime = DateTime.UtcNow, @@ -181,8 +180,6 @@ public async Task Post_ServiceReturnsError_ServerError() public async Task Post_ServiceReturnsOrder_Accepted() { // Arrange - string expectedFromAddress = "sender@domain.com"; - Mock serviceMock = new(); serviceMock.Setup(s => s.RegisterEmailNotificationOrder(It.IsAny())) .Callback(orderRequest => @@ -192,7 +189,7 @@ public async Task Post_ServiceReturnsOrder_Accepted() .FirstOrDefault(); Assert.NotNull(emailTemplate); - Assert.Equal(expectedFromAddress, emailTemplate.FromAddress); + Assert.Equal(string.Empty, emailTemplate.FromAddress); }) .ReturnsAsync((_order, null)); diff --git a/test/Altinn.Notifications.IntegrationTests/Notifications/EmailNotificationsOrderController/PostTests.cs b/test/Altinn.Notifications.IntegrationTests/Notifications/EmailNotificationsOrderController/PostTests.cs index 9eb836e7..685ab806 100644 --- a/test/Altinn.Notifications.IntegrationTests/Notifications/EmailNotificationsOrderController/PostTests.cs +++ b/test/Altinn.Notifications.IntegrationTests/Notifications/EmailNotificationsOrderController/PostTests.cs @@ -39,7 +39,6 @@ public PostTests(IntegrationTestWebApplicationFactory() { new RecipientExt diff --git a/test/Altinn.Notifications.Tests/Notifications/TestingMappers/OrderMapperTests.cs b/test/Altinn.Notifications.Tests/Notifications/TestingMappers/OrderMapperTests.cs index 3e56ed3f..5259c61b 100644 --- a/test/Altinn.Notifications.Tests/Notifications/TestingMappers/OrderMapperTests.cs +++ b/test/Altinn.Notifications.Tests/Notifications/TestingMappers/OrderMapperTests.cs @@ -128,7 +128,6 @@ public void MapToOrderRequest_RecipientsProvided_AreEquivalent() { Body = "email-body", ContentType = EmailContentType.Html, - FromAddress = "sender@domain.com", Recipients = new List() { new RecipientExt() { EmailAddress = "recipient1@domain.com" }, new RecipientExt() { EmailAddress = "recipient2@domain.com" } }, SendersReference = "senders-reference", RequestedSendTime = sendTime, @@ -142,7 +141,7 @@ public void MapToOrderRequest_RecipientsProvided_AreEquivalent() Templates = new List() { new EmailTemplate( - "sender@domain.com", + string.Empty, "email-subject", "email-body", EmailContentType.Html) diff --git a/test/Altinn.Notifications.Tests/Notifications/TestingValidators/EmailNotificationOrderRequestValidatorTests.cs b/test/Altinn.Notifications.Tests/Notifications/TestingValidators/EmailNotificationOrderRequestValidatorTests.cs index e1e8186c..af953bf6 100644 --- a/test/Altinn.Notifications.Tests/Notifications/TestingValidators/EmailNotificationOrderRequestValidatorTests.cs +++ b/test/Altinn.Notifications.Tests/Notifications/TestingValidators/EmailNotificationOrderRequestValidatorTests.cs @@ -27,7 +27,6 @@ public void Validate_RecipientProvided_ReturnsTrue() var order = new EmailNotificationOrderRequestExt() { Subject = "This is an email subject", - FromAddress = "sender@domain.com", Recipients = new List() { new RecipientExt() { Id = "16069412345", EmailAddress = "recipient2@domain.com" } }, Body = "This is an email body" }; @@ -42,7 +41,6 @@ public void Validate_EmailNotDefinedForRecipient_ReturnFalse() var order = new EmailNotificationOrderRequestExt() { Subject = "This is an email subject", - FromAddress = "sender@domain.com", Recipients = new List() { new RecipientExt() { Id = "16069412345" } }, Body = "This is an email body" }; @@ -59,7 +57,6 @@ public void Validate_SendTimePassed_ReturnsFalse() var order = new EmailNotificationOrderRequestExt() { Subject = "This is an email subject", - FromAddress = "sender@domain.com", Recipients = new List() { new RecipientExt() { Id = "16069412345", EmailAddress = "recipient2@domain.com" } }, Body = "This is an email body", RequestedSendTime = DateTime.UtcNow.AddDays(-1) @@ -76,7 +73,6 @@ public void Validate_SubjectMissing_ReturnsFalse() { var order = new EmailNotificationOrderRequestExt() { - FromAddress = "sender@domain.com", Recipients = new List() { new RecipientExt() { Id = "16069412345", EmailAddress = "recipient2@domain.com" } }, Body = "This is an email body" }; @@ -92,7 +88,6 @@ public void Validate_BodyMissing_ReturnsFalse() var order = new EmailNotificationOrderRequestExt() { Subject = "This is an email subject", - FromAddress = "sender@domain.com", Recipients = new List() { new RecipientExt() { Id = "16069412345", EmailAddress = "recipient2@domain.com" } }, };