From 6195d99fab12995ab63a608ac8cf2b06d4ba9183 Mon Sep 17 00:00:00 2001 From: TekH Date: Wed, 12 Nov 2025 16:55:06 +0100 Subject: [PATCH] refactor: remove usePdfBurner parameter from AddEnvelopeGeneratorServices --- .../DependencyInjection.cs | 48 +++++++++---------- .../DependencyInjection.cs | 2 +- EnvelopeGenerator.sln | 7 --- 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/EnvelopeGenerator.Application/DependencyInjection.cs b/EnvelopeGenerator.Application/DependencyInjection.cs index 158915f9..c7721125 100644 --- a/EnvelopeGenerator.Application/DependencyInjection.cs +++ b/EnvelopeGenerator.Application/DependencyInjection.cs @@ -25,10 +25,9 @@ public static class DependencyInjection /// /// /// - /// /// [Obsolete("Use MediatR")] - public static IServiceCollection AddEnvelopeGeneratorServices(this IServiceCollection services, IConfiguration config, bool usePdfBurner = false) + public static IServiceCollection AddEnvelopeGeneratorServices(this IServiceCollection services, IConfiguration config) { //Inject CRUD Service and repositoriesad services.TryAddScoped(); @@ -53,30 +52,29 @@ public static class DependencyInjection services.Configure(config.GetSection(nameof(AuthenticatorParams))); services.Configure(config.GetSection(nameof(TotpSmsParams))); - if (usePdfBurner) + #region PDF Burner + services.Configure(config.GetSection(nameof(PDFBurnerParams))); + services.AddOptions() + .Configure((GdPictureParams opt, IServiceProvider provider) => { - services.Configure(config.GetSection(nameof(PDFBurnerParams))); - services.AddOptions() - .Configure((GdPictureParams opt, IServiceProvider provider) => - { - opt.License = config["GdPictureLicenseKey"] - ?? provider.GetRequiredService().ReadThirdPartyModuleLicenseAsync("GDPICTURE").GetAwaiter().GetResult() - ?? throw new InvalidOperationException($"License record not found for key: {"GDPICTURE"}"); - }); - services.AddSingleton(provider => - { - var license = provider.GetRequiredService>().Value.License; - var licenseManager = new LicenseManager(); - licenseManager.RegisterKEY(license); - return licenseManager; - }); - services.AddTransient(provider => - { - // Ensure LicenseManager is resolved so that its constructor is called - _ = provider.GetRequiredService(); - return new AnnotationManager(); - }); - } + opt.License = config["GdPictureLicenseKey"] + ?? provider.GetRequiredService().ReadThirdPartyModuleLicenseAsync("GDPICTURE").GetAwaiter().GetResult() + ?? throw new InvalidOperationException($"License record not found for key: {"GDPICTURE"}"); + }); + services.AddSingleton(provider => + { + var license = provider.GetRequiredService>().Value.License; + var licenseManager = new LicenseManager(); + licenseManager.RegisterKEY(license); + return licenseManager; + }); + services.AddTransient(provider => + { + // Ensure LicenseManager is resolved so that its constructor is called + _ = provider.GetRequiredService(); + return new AnnotationManager(); + }); + #endregion PDF Burner services.AddHttpClientService(config.GetSection(nameof(GtxMessagingParams))); services.TryAddSingleton(); diff --git a/EnvelopeGenerator.DependencyInjection/DependencyInjection.cs b/EnvelopeGenerator.DependencyInjection/DependencyInjection.cs index d6188297..3eda3a11 100644 --- a/EnvelopeGenerator.DependencyInjection/DependencyInjection.cs +++ b/EnvelopeGenerator.DependencyInjection/DependencyInjection.cs @@ -73,7 +73,7 @@ public static class DependencyInjection public EGConfiguration AddServices(IConfiguration config, bool usePdfBurner = false) { #pragma warning disable CS0618 - _serviceRegs.Enqueue(s => s.AddEnvelopeGeneratorServices(config, usePdfBurner)); + _serviceRegs.Enqueue(s => s.AddEnvelopeGeneratorServices(config)); #pragma warning restore CS0618 _addingStatus[nameof(AddServices)] = true; return this; diff --git a/EnvelopeGenerator.sln b/EnvelopeGenerator.sln index de6117b4..5f7e6228 100644 --- a/EnvelopeGenerator.sln +++ b/EnvelopeGenerator.sln @@ -41,8 +41,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Dependenc EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Finalizer", "EnvelopeGenerator.Finalizer\EnvelopeGenerator.Finalizer.csproj", "{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Finalizer.Win", "EnvelopeGenerator.Finalizer.Win\EnvelopeGenerator.Finalizer.Win.csproj", "{F4844CA5-8747-F32F-E938-45859A2AA422}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -105,10 +103,6 @@ Global {C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}.Debug|Any CPU.Build.0 = Debug|Any CPU {C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}.Release|Any CPU.ActiveCfg = Release|Any CPU {C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}.Release|Any CPU.Build.0 = Release|Any CPU - {F4844CA5-8747-F32F-E938-45859A2AA422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4844CA5-8747-F32F-E938-45859A2AA422}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4844CA5-8747-F32F-E938-45859A2AA422}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4844CA5-8747-F32F-E938-45859A2AA422}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -131,7 +125,6 @@ Global {211619F5-AE25-4BA5-A552-BACAFE0632D3} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB} {B97DE7DD-3190-4A84-85E9-E57AD735BE61} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB} {C4970E6C-DB2E-48C5-B3C5-2AF589405ED9} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB} - {F4844CA5-8747-F32F-E938-45859A2AA422} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {73E60370-756D-45AD-A19A-C40A02DACCC7}