Simplify "AddHttpClientToCurl" configuration

Author: AmirhosseinEnayati

examples/HttpClientToCurl.Sample.InGlobal/Program.cs

@@ -1,22 +1,15 @@
+using HttpClientToCurl.Config.Others;
 using static HttpClientToCurl.Extensions.ServiceCollectionExtensions;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddControllers();
 builder.Services.AddHttpClientToCurl(config =>
 {
-    config.TurnOnAll = true;
-    config.ShowOnConsole = consoleConfig =>
-    {
-        consoleConfig.TurnOn = true;
-        consoleConfig.EnableCodeBeautification = true;
-    };
-    config.SaveToFile = fileConfig =>
-    {
-        fileConfig.TurnOn = true;
-        fileConfig.Filename = "curl_commands.txt";
-        fileConfig.Path = "C:\\logs";
-        fileConfig.NeedAddDefaultHeaders = true;
-    };
+    config.ShowMode = ShowMode.Console | ShowMode.File;
+    config.NeedAddDefaultHeaders = true;
+    config.ConsoleEnableCodeBeautification = true;
+    config.FileConfigPath = "C:\\Users\\Public";
+    config.FileConfigFileName = "curl_commands";
 });
 builder.Services.AddHttpClient();
 

src/HttpClientToCurl/Config/GlobalConfig.cs

@@ -1,21 +1,27 @@
-namespace HttpClientToCurl.Config;
+using HttpClientToCurl.Config.Others;
+
+namespace HttpClientToCurl.Config;
 
 public sealed class GlobalConfig
 {
-    /// <summary>
-    /// Set true to create curl output; false to disable it.  <c>Default is true</c>. 
-    /// </summary>
-    public bool TurnOnAll { get; set; } = true;
-
-    /// <summary>
-    /// Set true to show curl on the console; false to disable it. <c>Default is true</c>.
-    /// <para>If TurnOnAll is set to false, it will be ignored.</para>
-    /// </summary>
-    public Action<ConsoleConfig> ShowOnConsole { get; set; }
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0032:Use auto property", Justification = "<Pending>")]
+    private ShowMode _showMode;
 
-    /// <summary>
-    /// Set true to save the curl file; false to disable it. <c>Default is true</c>.
-    /// <para>If TurnOnAll is set to false, it will be ignored.</para>
-    /// </summary>
-    public Action<FileConfig> SaveToFile { get; set; }
+    public ShowMode ShowMode
+    {
+        get => _showMode;
+        set
+        {
+            if (value is not ShowMode.None && value.HasFlag(ShowMode.None))
+            {
+                throw new ArgumentException("ShowMode.None cannot be combined with other flags.");
+            }
+            _showMode = value;
+        }
+    }
+    public bool NeedAddDefaultHeaders { get; set; } = true;
+    public bool ConsoleEnableCodeBeautification { get; set; } = false;
+    public bool ConsoleEnableCompression { get; set; } = false;
+    public string FileConfigFileName { get; set; }
+    public string FileConfigPath { get; set; }
 }

src/HttpClientToCurl/Config/Others/ShowMode.cs

@@ -0,0 +1,9 @@
+namespace HttpClientToCurl.Config.Others;
+
+[Flags]
+public enum ShowMode
+{
+    None = 1,
+    Console = 2,
+    File = 4
+}

src/HttpClientToCurl/Extensions/ServiceCollectionExtensions.cs

@@ -1,4 +1,5 @@
 using HttpClientToCurl.Config;
+using HttpClientToCurl.Config.Others;
 using HttpClientToCurl.HttpMessageHandlers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Http;
@@ -12,15 +13,23 @@ public static class ServiceCollectionExtensions
     /// <para> By default, show it in the IDE console. </para>
     /// </summary>
     /// <param name="configAction">Optional</param>
+    /// <param name="isGlobal">Apply for all http requests in the application or not. Default is true.</param>
     public static void AddHttpClientToCurl(
-        this IServiceCollection services,
-        Action<GlobalConfig> configAction = null)
+    this IServiceCollection services,
+    Action<GlobalConfig> configAction = null,
+    bool isGlobal = true)
     {
+        configAction ??= config => config.ShowMode = ShowMode.Console;
+
         var config = new GlobalConfig();
         configAction?.Invoke(config);
 
         services.AddSingleton(config);
         services.AddTransient<CurlGeneratorHttpMessageHandler>();
-        services.Add(ServiceDescriptor.Transient<IHttpMessageHandlerBuilderFilter, HttpMessageHandlerAppender>());
+
+        if (isGlobal)
+        {
+            services.Add(ServiceDescriptor.Transient<IHttpMessageHandlerBuilderFilter, HttpMessageHandlerAppender>());
+        }
     }
 }

src/HttpClientToCurl/HttpMessageHandlers/CurlGeneratorHttpMessageHandler.cs

@@ -1,32 +1,38 @@
 using HttpClientToCurl.Config;
+using HttpClientToCurl.Config.Others;
 using HttpClientToCurl.Extensions;
 
 namespace HttpClientToCurl.HttpMessageHandlers;
 
 public class CurlGeneratorHttpMessageHandler(GlobalConfig config) : DelegatingHandler
 {
     protected override Task<HttpResponseMessage> SendAsync(
-        HttpRequestMessage request,
+        HttpRequestMessage httpRequestMessage,
         CancellationToken cancellationToken)
     {
-        if (config.TurnOnAll)
+        if (config.ShowMode.HasFlag(ShowMode.Console))
         {
-            var consoleConfig = new ConsoleConfig();
-            config.ShowOnConsole?.Invoke(consoleConfig);
-            if (consoleConfig.TurnOn)
+            httpRequestMessage.GenerateCurlInConsole(httpRequestMessage.RequestUri, consoleConfig =>
             {
-                HttpRequestMessageExtensions.GenerateCurlInConsole(request, null);
-            }
+                consoleConfig.TurnOn = true;
+                consoleConfig.EnableCodeBeautification = config.ConsoleEnableCodeBeautification;
+                consoleConfig.EnableCompression = config.ConsoleEnableCompression;
+                consoleConfig.NeedAddDefaultHeaders = config.NeedAddDefaultHeaders;
+            });
+        }
 
-            var fileConfig = new FileConfig();
-            config.SaveToFile?.Invoke(fileConfig);
-            if (fileConfig.TurnOn)
+        if (config.ShowMode.HasFlag(ShowMode.File))
+        {
+            httpRequestMessage.GenerateCurlInFile(httpRequestMessage.RequestUri, fileConfig =>
             {
-                HttpRequestMessageExtensions.GenerateCurlInFile(request, null, config.SaveToFile);
-            }
+                fileConfig.TurnOn = true;
+                fileConfig.Filename = config.FileConfigFileName;
+                fileConfig.Path = config.FileConfigPath;
+                fileConfig.NeedAddDefaultHeaders = config.NeedAddDefaultHeaders;
+            });
         }
 
-        var response = base.SendAsync(request, cancellationToken);
+        var response = base.SendAsync(httpRequestMessage, cancellationToken);
         return response;
     }
 }