diff --git a/src/WireMock.Net.Minimal/Http/WebhookSender.cs b/src/WireMock.Net.Minimal/Http/WebhookSender.cs index 431d773fc..d6f367f88 100644 --- a/src/WireMock.Net.Minimal/Http/WebhookSender.cs +++ b/src/WireMock.Net.Minimal/Http/WebhookSender.cs @@ -11,24 +11,17 @@ using WireMock.Models; using WireMock.Settings; using WireMock.Transformers; -using WireMock.Transformers.Handlebars; -using WireMock.Transformers.Scriban; using WireMock.Types; using WireMock.Util; namespace WireMock.Http; -internal class WebhookSender +internal class WebhookSender(WireMockServerSettings settings) { private const string ClientIp = "::1"; private static readonly ThreadLocal Random = new(() => new Random(DateTime.UtcNow.Millisecond)); - private readonly WireMockServerSettings _settings; - - public WebhookSender(WireMockServerSettings settings) - { - _settings = Guard.NotNull(settings); - } + private readonly WireMockServerSettings _settings = Guard.NotNull(settings); public async Task SendAsync( HttpClient client, @@ -49,24 +42,7 @@ IResponseMessage originalResponseMessage string requestUrl; if (webhookRequest.UseTransformer == true) { - ITransformer transformer; - switch (webhookRequest.TransformerType) - { - case TransformerType.Handlebars: - var factoryHandlebars = new HandlebarsContextFactory(_settings); - transformer = new Transformer(_settings, factoryHandlebars); - break; - - case TransformerType.Scriban: - case TransformerType.ScribanDotLiquid: - var factoryDotLiquid = new ScribanContextFactory(_settings.FileSystemHandler, webhookRequest.TransformerType); - transformer = new Transformer(_settings, factoryDotLiquid); - break; - - default: - throw new NotImplementedException($"TransformerType '{webhookRequest.TransformerType}' is not supported."); - } - + var transformer = TransformerFactory.Create(webhookRequest.TransformerType, _settings); bodyData = transformer.TransformBody(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.BodyData, webhookRequest.TransformerReplaceNodeOptions); headers = transformer.TransformHeaders(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.Headers); requestUrl = transformer.TransformString(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.Url); diff --git a/src/WireMock.Net.Minimal/Proxy/ProxyHelper.cs b/src/WireMock.Net.Minimal/Proxy/ProxyHelper.cs index 51dcadc5c..23f165f57 100644 --- a/src/WireMock.Net.Minimal/Proxy/ProxyHelper.cs +++ b/src/WireMock.Net.Minimal/Proxy/ProxyHelper.cs @@ -13,16 +13,10 @@ namespace WireMock.Proxy; -internal class ProxyHelper +internal class ProxyHelper(WireMockServerSettings settings) { - private readonly WireMockServerSettings _settings; - private readonly ProxyMappingConverter _proxyMappingConverter; - - public ProxyHelper(WireMockServerSettings settings) - { - _settings = Guard.NotNull(settings); - _proxyMappingConverter = new ProxyMappingConverter(settings, new GuidUtils(), new DateTimeUtils()); - } + private readonly WireMockServerSettings _settings = Guard.NotNull(settings); + private readonly ProxyMappingConverter _proxyMappingConverter = new(settings, new GuidUtils(), new DateTimeUtils()); public async Task<(IResponseMessage Message, IMapping? Mapping)> SendAsync( IMapping? mapping, @@ -39,18 +33,7 @@ public ProxyHelper(WireMockServerSettings settings) var requiredUri = new Uri(url); // Create HttpRequestMessage - var replaceSettings = proxyAndRecordSettings.ReplaceSettings; - string proxyUrl; - if (replaceSettings is not null) - { - var stringComparison = replaceSettings.IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal; - proxyUrl = url.Replace(replaceSettings.OldValue, replaceSettings.NewValue, stringComparison); - } - else - { - proxyUrl = url; - } - + var proxyUrl = proxyAndRecordSettings.ReplaceSettings != null ? ProxyUrlTransformer.Transform(_settings, proxyAndRecordSettings.ReplaceSettings, url) : url; var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, proxyUrl); // Call the URL diff --git a/src/WireMock.Net.Minimal/Proxy/ProxyUrlTransformer.cs b/src/WireMock.Net.Minimal/Proxy/ProxyUrlTransformer.cs new file mode 100644 index 000000000..ba6952de4 --- /dev/null +++ b/src/WireMock.Net.Minimal/Proxy/ProxyUrlTransformer.cs @@ -0,0 +1,21 @@ +// Copyright © WireMock.Net + +using System; +using WireMock.Settings; +using WireMock.Transformers; + +namespace WireMock.Proxy; + +internal static class ProxyUrlTransformer +{ + internal static string Transform(WireMockServerSettings settings, ProxyUrlReplaceSettings replaceSettings, string url) + { + if (!replaceSettings.UseTransformer) + { + return url.Replace(replaceSettings.OldValue, replaceSettings.NewValue, replaceSettings.IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal); + } + + var transformer = TransformerFactory.Create(replaceSettings.TransformerType, settings); + return transformer.Transform(replaceSettings.TransformTemplate, url); + } +} \ No newline at end of file diff --git a/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs b/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs index bcf984917..13ba9afad 100644 --- a/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs +++ b/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs @@ -272,25 +272,8 @@ string RemoveFirstOccurrence(string source, string find) } } - ITransformer responseMessageTransformer; - switch (TransformerType) - { - case TransformerType.Handlebars: - var factoryHandlebars = new HandlebarsContextFactory(settings); - responseMessageTransformer = new Transformer(settings, factoryHandlebars); - break; - - case TransformerType.Scriban: - case TransformerType.ScribanDotLiquid: - var factoryDotLiquid = new ScribanContextFactory(settings.FileSystemHandler, TransformerType); - responseMessageTransformer = new Transformer(settings, factoryDotLiquid); - break; - - default: - throw new NotSupportedException($"TransformerType '{TransformerType}' is not supported."); - } - - return (responseMessageTransformer.Transform(mapping, requestMessage, responseMessage, UseTransformerForBodyAsFile, TransformerReplaceNodeOptions), null); + var transformer = TransformerFactory.Create(TransformerType, settings); + return (transformer.Transform(mapping, requestMessage, responseMessage, UseTransformerForBodyAsFile, TransformerReplaceNodeOptions), null); } if (!UseTransformer && ResponseMessage.BodyData?.BodyAsFileIsCached == true && responseMessage.BodyData?.BodyAsFile is not null) diff --git a/src/WireMock.Net.Minimal/Transformers/ITransformer.cs b/src/WireMock.Net.Minimal/Transformers/ITransformer.cs index 65c0d2483..1b16483af 100644 --- a/src/WireMock.Net.Minimal/Transformers/ITransformer.cs +++ b/src/WireMock.Net.Minimal/Transformers/ITransformer.cs @@ -6,7 +6,7 @@ namespace WireMock.Transformers; -interface ITransformer +internal interface ITransformer { ResponseMessage Transform(IMapping mapping, IRequestMessage requestMessage, IResponseMessage original, bool useTransformerForBodyAsFile, ReplaceNodeOptions options); @@ -15,4 +15,6 @@ interface ITransformer IDictionary> TransformHeaders(IMapping mapping, IRequestMessage originalRequestMessage, IResponseMessage originalResponseMessage, IDictionary>? headers); string TransformString(IMapping mapping, IRequestMessage originalRequestMessage, IResponseMessage originalResponseMessage, string? value); + + string Transform(string template, object? model); } \ No newline at end of file diff --git a/src/WireMock.Net.Minimal/Transformers/ITransformerContextFactory.cs b/src/WireMock.Net.Minimal/Transformers/ITransformerContextFactory.cs index 68c1772c9..8488f6bc6 100644 --- a/src/WireMock.Net.Minimal/Transformers/ITransformerContextFactory.cs +++ b/src/WireMock.Net.Minimal/Transformers/ITransformerContextFactory.cs @@ -1,9 +1,8 @@ // Copyright © WireMock.Net -namespace WireMock.Transformers +namespace WireMock.Transformers; + +internal interface ITransformerContextFactory { - interface ITransformerContextFactory - { - ITransformerContext Create(); - } + ITransformerContext Create(); } \ No newline at end of file diff --git a/src/WireMock.Net.Minimal/Transformers/Transformer.cs b/src/WireMock.Net.Minimal/Transformers/Transformer.cs index 000eeece3..d70a089a3 100644 --- a/src/WireMock.Net.Minimal/Transformers/Transformer.cs +++ b/src/WireMock.Net.Minimal/Transformers/Transformer.cs @@ -75,6 +75,11 @@ public string TransformString( return transformerContext.ParseAndRender(value, model); } + public string Transform(string template, object? model) + { + return model is null ? string.Empty : _factory.Create().ParseAndRender(template, model); + } + public ResponseMessage Transform(IMapping mapping, IRequestMessage requestMessage, IResponseMessage original, bool useTransformerForBodyAsFile, ReplaceNodeOptions options) { var responseMessage = new ResponseMessage(); diff --git a/src/WireMock.Net.Minimal/Transformers/TransformerFactory.cs b/src/WireMock.Net.Minimal/Transformers/TransformerFactory.cs new file mode 100644 index 000000000..9cb3ca0ad --- /dev/null +++ b/src/WireMock.Net.Minimal/Transformers/TransformerFactory.cs @@ -0,0 +1,30 @@ +// Copyright © WireMock.Net + +using System; +using WireMock.Settings; +using WireMock.Transformers.Handlebars; +using WireMock.Transformers.Scriban; +using WireMock.Types; + +namespace WireMock.Transformers; + +internal static class TransformerFactory +{ + internal static ITransformer Create(TransformerType transformerType, WireMockServerSettings settings) + { + switch (transformerType) + { + case TransformerType.Handlebars: + var factoryHandlebars = new HandlebarsContextFactory(settings); + return new Transformer(settings, factoryHandlebars); + + case TransformerType.Scriban: + case TransformerType.ScribanDotLiquid: + var factoryDotLiquid = new ScribanContextFactory(settings.FileSystemHandler, transformerType); + return new Transformer(settings, factoryDotLiquid); + + default: + throw new NotSupportedException($"{nameof(TransformerType)} '{transformerType}' is not supported."); + } + } +} \ No newline at end of file diff --git a/src/WireMock.Net.Shared/Settings/ProxyUrlReplaceSettings.cs b/src/WireMock.Net.Shared/Settings/ProxyUrlReplaceSettings.cs index bfffb64c6..716575466 100644 --- a/src/WireMock.Net.Shared/Settings/ProxyUrlReplaceSettings.cs +++ b/src/WireMock.Net.Shared/Settings/ProxyUrlReplaceSettings.cs @@ -1,5 +1,8 @@ // Copyright © WireMock.Net +using System.Diagnostics.CodeAnalysis; +using WireMock.Types; + namespace WireMock.Settings; /// @@ -8,17 +11,35 @@ namespace WireMock.Settings; public class ProxyUrlReplaceSettings { /// - /// The old path value to be replaced by the new path value + /// The old path value to be replaced by the new path value. /// - public string OldValue { get; set; } = null!; + public string? OldValue { get; set; } /// - /// The new path value to replace the old value with + /// The new path value to replace the old value with. /// - public string NewValue { get; set; } = null!; + public string? NewValue { get; set; } /// /// Defines if the case should be ignored when replacing. /// public bool IgnoreCase { get; set; } + + /// + /// Holds the transformation template used when is true. + /// + public string? TransformTemplate { get; set; } + + /// + /// Use Transformer. + /// + [MemberNotNullWhen(true, nameof(TransformTemplate))] + [MemberNotNullWhen(false, nameof(OldValue))] + [MemberNotNullWhen(false, nameof(NewValue))] + public bool UseTransformer => !string.IsNullOrEmpty(TransformTemplate); + + /// + /// The transformer type, in case is set to true. + /// + public TransformerType TransformerType { get; set; } = TransformerType.Handlebars; } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Proxy/ProxyUrlTransformerTests.cs b/test/WireMock.Net.Tests/Proxy/ProxyUrlTransformerTests.cs new file mode 100644 index 000000000..2921ee097 --- /dev/null +++ b/test/WireMock.Net.Tests/Proxy/ProxyUrlTransformerTests.cs @@ -0,0 +1,98 @@ +using System.Globalization; +using Moq; +using WireMock.Handlers; +using WireMock.Proxy; +using WireMock.Settings; +using WireMock.Types; +using Xunit; + +namespace WireMock.Net.Tests.Proxy; + +public class ProxyUrlTransformerTests +{ + private readonly Mock _fileSystemHandlerMock = new(); + + [Fact] + public void Transform_WithUseTransformerFalse_PerformsSimpleReplace_CaseSensitive() + { + // Arrange + var settings = new WireMockServerSettings + { + FileSystemHandler = _fileSystemHandlerMock.Object, + Culture = CultureInfo.InvariantCulture + }; + + var replaceSettings = new ProxyUrlReplaceSettings + { + TransformTemplate = null, + OldValue = "/old", + NewValue = "/new", + IgnoreCase = false + }; + + var url = "http://example.com/old/path"; + var expected = "http://example.com/new/path"; + + // Act + var actual = ProxyUrlTransformer.Transform(settings, replaceSettings, url); + + // Assert + Assert.Equal(expected, actual); + } + + [Fact] + public void Transform_WithUseTransformerFalse_PerformsSimpleReplace_IgnoreCase() + { + // Arrange + var settings = new WireMockServerSettings + { + FileSystemHandler = _fileSystemHandlerMock.Object, + Culture = CultureInfo.InvariantCulture + }; + + var replaceSettings = new ProxyUrlReplaceSettings + { + TransformTemplate = null, // UseTransformer == false + OldValue = "/OLD", + NewValue = "/new", + IgnoreCase = true + }; + + var url = "http://example.com/old/path"; // lowercase 'old' but OldValue is uppercase + var expected = "http://example.com/new/path"; + + // Act + var actual = ProxyUrlTransformer.Transform(settings, replaceSettings, url); + + // Assert + Assert.Equal(expected, actual); + } + + [Fact] + public void Transform_WithUseTransformerTrue_UsesTransformer_ToTransformUrl() + { + // Arrange + var settings = new WireMockServerSettings + { + FileSystemHandler = _fileSystemHandlerMock.Object, + Culture = CultureInfo.InvariantCulture + }; + + // Handlebars is the default TransformerType; the TransformTemplate uses the model directly. + var replaceSettings = new ProxyUrlReplaceSettings + { + TransformTemplate = "{{this}}-transformed", + // TransformerType defaults to Handlebars but set explicitly for clarity. + TransformerType = TransformerType.Handlebars + }; + + var url = "http://example.com/path"; + var expected = "http://example.com/path-transformed"; + + // Act + var actual = ProxyUrlTransformer.Transform(settings, replaceSettings, url); + + // Assert + Assert.Equal(expected, actual); + } +} \ No newline at end of file