move to standard appsettings.json

src/Api/Startup.cs

@@ -27,8 +27,11 @@ namespace Bit.Api
     {
         public Startup(IHostingEnvironment env)
         {
-            var builder = new ConfigurationBuilder()
-                .AddSettingsConfiguration(env, "bitwarden-Api");
+            var builder = new ConfigurationBuilder();
+            if(env.IsDevelopment())
+            {
+                builder.AddUserSecrets("bitwarden-Api");
+            }
             Configuration = builder.Build();
             Environment = env;
         }

src/Billing/Startup.cs

@@ -18,8 +18,11 @@ namespace Bit.Billing
     {
         public Startup(IHostingEnvironment env)
         {
-            var builder = new ConfigurationBuilder()
-                .AddSettingsConfiguration(env, "bitwarden-Billing");
+            var builder = new ConfigurationBuilder();
+            if(env.IsDevelopment())
+            {
+                builder.AddUserSecrets("bitwarden-Billing");
+            }
             Configuration = builder.Build();
         }
 

src/Core/Utilities/ConfigurationBuilderExtensions.cs

@@ -1,25 +0,0 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-
-namespace Bit.Core.Utilities
-{
-    public static class ConfigurationBuilderExtensions
-    {
-        public static IConfigurationBuilder AddSettingsConfiguration(
-            this ConfigurationBuilder builder,
-            IHostingEnvironment env,
-            string userSecretsId)
-        {
-            builder.SetBasePath(env.ContentRootPath)
-                .AddJsonFile("settings.json")
-                .AddJsonFile($"settings.{env.EnvironmentName}.json", optional: true);
-
-            if(env.IsDevelopment() && !string.IsNullOrWhiteSpace(userSecretsId))
-            {
-                builder.AddUserSecrets(userSecretsId);
-            }
-
-            return builder;
-        }
-    }
-}

src/Identity/Startup.cs

@@ -15,8 +15,11 @@ namespace Bit.Identity
     {
         public Startup(IHostingEnvironment env)
         {
-            var builder = new ConfigurationBuilder()
-                .AddSettingsConfiguration(env, "bitwarden-Identity");
+            var builder = new ConfigurationBuilder();
+            if(env.IsDevelopment())
+            {
+                builder.AddUserSecrets("bitwarden-Identity");
+            }
             Configuration = builder.Build();
             Environment = env;
         }

src/Jobs/Startup.cs

@@ -15,8 +15,17 @@ namespace Bit.Jobs
         public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()
-                .AddSettingsConfiguration(env, "bitwarden-Jobs")
-                .AddEnvironmentVariables();
+                .SetBasePath(env.ContentRootPath)
+                .AddJsonFile("appsettings.json")
+                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);
+
+            if(env.IsDevelopment())
+            {
+                builder.AddUserSecrets("bitwarden-Jobs");
+            }
+
+            builder.AddEnvironmentVariables();
+
             Configuration = builder.Build();
             Environment = env;
         }