From 5ee0b4a9da3be65a5f3a54ac7146403e58dc7830 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 19 Oct 2017 00:08:09 -0400 Subject: [PATCH] simplify secrets in startup via csproj tools --- src/Api/Api.csproj | 5 +++++ src/Api/Startup.cs | 11 +++-------- src/Billing/Billing.csproj | 5 +++++ src/Billing/Startup.cs | 11 +++-------- src/Core/Utilities/ServiceCollectionExtensions.cs | 4 ++-- src/Icons/Icons.csproj | 2 ++ src/Identity/Identity.csproj | 5 +++++ src/Identity/Startup.cs | 11 +++-------- src/Jobs/Jobs.csproj | 4 ++++ util/Mail/Mail.csproj | 4 ++++ util/Server/Server.csproj | 4 ++++ 11 files changed, 40 insertions(+), 26 deletions(-) diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj index f6f35106a6..990df65c94 100644 --- a/src/Api/Api.csproj +++ b/src/Api/Api.csproj @@ -27,4 +27,9 @@ + + + + + diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs index 4051b31310..e312dee0c8 100644 --- a/src/Api/Startup.cs +++ b/src/Api/Startup.cs @@ -25,18 +25,13 @@ namespace Bit.Api { public class Startup { - public Startup(IHostingEnvironment env) + public Startup(IHostingEnvironment env, IConfiguration configuration) { - var builder = new ConfigurationBuilder(); - if(env.IsDevelopment()) - { - builder.AddUserSecrets("bitwarden-Api"); - } - Configuration = builder.Build(); + Configuration = configuration; Environment = env; } - public IConfigurationRoot Configuration { get; private set; } + public IConfiguration Configuration { get; private set; } public IHostingEnvironment Environment { get; set; } public void ConfigureServices(IServiceCollection services) diff --git a/src/Billing/Billing.csproj b/src/Billing/Billing.csproj index 81572d1a63..c9148b6b54 100644 --- a/src/Billing/Billing.csproj +++ b/src/Billing/Billing.csproj @@ -25,4 +25,9 @@ + + + + + diff --git a/src/Billing/Startup.cs b/src/Billing/Startup.cs index b41941a143..d61f14bc3c 100644 --- a/src/Billing/Startup.cs +++ b/src/Billing/Startup.cs @@ -16,17 +16,12 @@ namespace Bit.Billing { public class Startup { - public Startup(IHostingEnvironment env) + public Startup(IConfiguration configuration) { - var builder = new ConfigurationBuilder(); - if(env.IsDevelopment()) - { - builder.AddUserSecrets("bitwarden-Billing"); - } - Configuration = builder.Build(); + Configuration = configuration; } - public IConfigurationRoot Configuration { get; } + public IConfiguration Configuration { get; } public void ConfigureServices(IServiceCollection services) { diff --git a/src/Core/Utilities/ServiceCollectionExtensions.cs b/src/Core/Utilities/ServiceCollectionExtensions.cs index da61409e5f..e2cf4a7077 100644 --- a/src/Core/Utilities/ServiceCollectionExtensions.cs +++ b/src/Core/Utilities/ServiceCollectionExtensions.cs @@ -259,10 +259,10 @@ namespace Bit.Core.Utilities } public static GlobalSettings AddGlobalSettingsServices(this IServiceCollection services, - IConfigurationRoot root) + IConfiguration configuration) { var globalSettings = new GlobalSettings(); - ConfigurationBinder.Bind(root.GetSection("GlobalSettings"), globalSettings); + ConfigurationBinder.Bind(configuration.GetSection("GlobalSettings"), globalSettings); services.AddSingleton(s => globalSettings); return globalSettings; } diff --git a/src/Icons/Icons.csproj b/src/Icons/Icons.csproj index 171d8b6267..f5d1dd8f94 100644 --- a/src/Icons/Icons.csproj +++ b/src/Icons/Icons.csproj @@ -3,6 +3,7 @@ netcoreapp2.0 Bit.Icons + bitwarden-Icons @@ -15,6 +16,7 @@ + diff --git a/src/Identity/Identity.csproj b/src/Identity/Identity.csproj index d6db7fdf02..7c6cb4599f 100644 --- a/src/Identity/Identity.csproj +++ b/src/Identity/Identity.csproj @@ -18,4 +18,9 @@ + + + + + diff --git a/src/Identity/Startup.cs b/src/Identity/Startup.cs index 53cbc481bc..3bd5a4edee 100644 --- a/src/Identity/Startup.cs +++ b/src/Identity/Startup.cs @@ -13,18 +13,13 @@ namespace Bit.Identity { public class Startup { - public Startup(IHostingEnvironment env) + public Startup(IHostingEnvironment env, IConfiguration configuration) { - var builder = new ConfigurationBuilder(); - if(env.IsDevelopment()) - { - builder.AddUserSecrets("bitwarden-Identity"); - } - Configuration = builder.Build(); + Configuration = configuration; Environment = env; } - public IConfigurationRoot Configuration { get; private set; } + public IConfiguration Configuration { get; private set; } public IHostingEnvironment Environment { get; set; } public void ConfigureServices(IServiceCollection services) diff --git a/src/Jobs/Jobs.csproj b/src/Jobs/Jobs.csproj index 28c74d9a24..6181018a21 100644 --- a/src/Jobs/Jobs.csproj +++ b/src/Jobs/Jobs.csproj @@ -23,4 +23,8 @@ + + + + diff --git a/util/Mail/Mail.csproj b/util/Mail/Mail.csproj index b92e74d413..2b775cf0c7 100644 --- a/util/Mail/Mail.csproj +++ b/util/Mail/Mail.csproj @@ -16,4 +16,8 @@ + + + + diff --git a/util/Server/Server.csproj b/util/Server/Server.csproj index 3ce0808ca7..853999760e 100644 --- a/util/Server/Server.csproj +++ b/util/Server/Server.csproj @@ -10,4 +10,8 @@ + + + +