From 494a0cca2c4966639e9a590b840da37e53ce5e2e Mon Sep 17 00:00:00 2001 From: Stijn Goethals Date: Wed, 24 May 2023 11:01:17 +0200 Subject: [PATCH] Don't expose trust key when env enum is used --- .../VirenOptionsEnvironmentExtensions.cs | 26 +++++++++---------- src/Viren.Core/Viren.Core.csproj | 4 +-- ...tion.Extensions.DependencyInjection.csproj | 4 +-- .../VirenExtensions.cs | 4 +-- src/Viren.Execution/Viren.Execution.csproj | 4 +-- src/Viren.Execution/VirenHttpClientFactory.cs | 4 +-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Viren.Core/Helpers/VirenOptionsEnvironmentExtensions.cs b/src/Viren.Core/Helpers/VirenOptionsEnvironmentExtensions.cs index c5a2cc9..f30db86 100644 --- a/src/Viren.Core/Helpers/VirenOptionsEnvironmentExtensions.cs +++ b/src/Viren.Core/Helpers/VirenOptionsEnvironmentExtensions.cs @@ -5,24 +5,24 @@ namespace Viren.Core.Helpers { public static class VirenOptionsEnvironmentExtensions { - public static VirenExecutionOptions UseProduction(this VirenExecutionOptions options, string clientSecret, string trustKey = null) + public static VirenExecutionOptions UseProduction(this VirenExecutionOptions options, string clientSecret) { - return options.Use(clientSecret, "https://execution.viren.be", trustKey); + return options.Use(clientSecret, "https://execution.viren.be"); } - public static VirenExecutionOptions UseAcceptance(this VirenExecutionOptions options, string clientSecret, string trustKey = null) + public static VirenExecutionOptions UseAcceptance(this VirenExecutionOptions options, string clientSecret) { - return options.Use(clientSecret, "https://execution-acc.viren.be", trustKey); + return options.Use(clientSecret, "https://execution-acc.viren.be"); } - public static VirenExecutionOptions UseDevelopment(this VirenExecutionOptions options, string clientSecret, string trustKey = null) + public static VirenExecutionOptions UseDevelopment(this VirenExecutionOptions options, string clientSecret) { - return options.Use(clientSecret, "https://execution-dev.viren.be", trustKey); + return options.Use(clientSecret, "https://execution-dev.viren.be"); } - public static VirenExecutionOptions UseLocal(this VirenExecutionOptions options, string clientSecret, string trustKey = null) + public static VirenExecutionOptions UseLocal(this VirenExecutionOptions options, string clientSecret) { - return options.Use(clientSecret, "http://dev.calc-exec.be", trustKey); + return options.Use(clientSecret, "http://dev.calc-exec.be"); } public static VirenExecutionOptions Use(this VirenExecutionOptions options, string clientSecret, string baseUrl, string trustKey = null) @@ -34,18 +34,18 @@ public static VirenExecutionOptions Use(this VirenExecutionOptions options, stri } - public static VirenExecutionOptions UseEnvironment(this VirenExecutionOptions options, Environment environment, string clientSecret, string trustKey = null) + public static VirenExecutionOptions UseEnvironment(this VirenExecutionOptions options, Environment environment, string clientSecret) { switch (environment) { case Environment.Production: - return options.UseProduction(clientSecret, trustKey); + return options.UseProduction(clientSecret); case Environment.Acceptance: - return options.UseAcceptance(clientSecret, trustKey); + return options.UseAcceptance(clientSecret); case Environment.Develop: - return options.UseDevelopment(clientSecret, trustKey); + return options.UseDevelopment(clientSecret); case Environment.Local: - return options.UseLocal(clientSecret, trustKey); + return options.UseLocal(clientSecret); default: throw new Exception($"Environment '{environment}', does not exist."); } diff --git a/src/Viren.Core/Viren.Core.csproj b/src/Viren.Core/Viren.Core.csproj index c542fc2..73c086e 100644 --- a/src/Viren.Core/Viren.Core.csproj +++ b/src/Viren.Core/Viren.Core.csproj @@ -5,7 +5,7 @@ $(LibraryFrameworks) true false - 1.1.1 + 1.1.2 Teal Partners Teal Partners Viren .NET client core library @@ -21,7 +21,7 @@ Viren; API; Client LICENSE.md git - 1.1.1 + 1.1.2 Viren.Core .NET 4.6 diff --git a/src/Viren.Execution.Extensions.DependencyInjection/Viren.Execution.Extensions.DependencyInjection.csproj b/src/Viren.Execution.Extensions.DependencyInjection/Viren.Execution.Extensions.DependencyInjection.csproj index 36279b3..a938cea 100644 --- a/src/Viren.Execution.Extensions.DependencyInjection/Viren.Execution.Extensions.DependencyInjection.csproj +++ b/src/Viren.Execution.Extensions.DependencyInjection/Viren.Execution.Extensions.DependencyInjection.csproj @@ -2,7 +2,7 @@ true false - 1.1.1 + 1.1.2 Teal Partners Viren execution .NET client https://github.com/tealpartners/viren.net @@ -19,7 +19,7 @@ Viren.Execution.Extensions.DependencyInjection LICENSE.md git - 1.1.1 + 1.1.2 net6.0;netstandard2.0;netstandard2.1;net7.0 diff --git a/src/Viren.Execution.Extensions.DependencyInjection/VirenExtensions.cs b/src/Viren.Execution.Extensions.DependencyInjection/VirenExtensions.cs index e2b4f62..9544fb7 100644 --- a/src/Viren.Execution.Extensions.DependencyInjection/VirenExtensions.cs +++ b/src/Viren.Execution.Extensions.DependencyInjection/VirenExtensions.cs @@ -8,9 +8,9 @@ namespace Viren.Execution.Extensions.DependencyInjection { public static class VirenExtensions { - public static IServiceCollection AddVirenExecution(this IServiceCollection serviceCollection, Environment environment, string clientSecret, string trustKey = null) + public static IServiceCollection AddVirenExecution(this IServiceCollection serviceCollection, Environment environment, string clientSecret) { - return serviceCollection.AddVirenExecution(ops => ops.UseEnvironment(environment, clientSecret, trustKey)); + return serviceCollection.AddVirenExecution(ops => ops.UseEnvironment(environment, clientSecret)); } public static IServiceCollection AddVirenExecution(this IServiceCollection serviceCollection, Action configureOptions, diff --git a/src/Viren.Execution/Viren.Execution.csproj b/src/Viren.Execution/Viren.Execution.csproj index 5484953..a432d76 100644 --- a/src/Viren.Execution/Viren.Execution.csproj +++ b/src/Viren.Execution/Viren.Execution.csproj @@ -4,7 +4,7 @@ $(LibraryFrameworks) true false - 1.1.1 + 1.1.2 Teal Partners Viren execution .NET client https://github.com/tealpartners/viren.net @@ -21,7 +21,7 @@ Viren.Execution LICENSE.md git - 1.1.1 + 1.1.2 Viren.Core .NET 4.6 diff --git a/src/Viren.Execution/VirenHttpClientFactory.cs b/src/Viren.Execution/VirenHttpClientFactory.cs index 5b56c2a..3cb5224 100644 --- a/src/Viren.Execution/VirenHttpClientFactory.cs +++ b/src/Viren.Execution/VirenHttpClientFactory.cs @@ -16,10 +16,10 @@ public static HttpClient Create(string secretKey, string virenDomain, string tru return Create(new VirenExecutionOptions {ClientSecret = secretKey, BaseUrl = virenDomain, TrustKey = trustKey}); } - public static HttpClient Create(string secretKey, Viren.Core.Enums.Environment environment, string trustKey = null) + public static HttpClient Create(string secretKey, Viren.Core.Enums.Environment environment) { - return Create(new VirenExecutionOptions().UseEnvironment(environment, secretKey, trustKey)); + return Create(new VirenExecutionOptions().UseEnvironment(environment, secretKey)); }