centralize ConfigurationBuilder

src/Api/Api.csproj

@@ -25,7 +25,6 @@
     <PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.1.1" />
     <PackageReference Include="AspNetCoreRateLimit" Version="1.0.5" />

src/Api/Startup.cs

@@ -29,17 +29,7 @@ namespace Bit.Api
         public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()
-                .SetBasePath(env.ContentRootPath)
+                .AddSettingsConfiguration<Startup>(env);
-                .AddJsonFile("settings.json")
-                .AddJsonFile($"settings.{env.EnvironmentName}.json", optional: true);
-
-            if(env.IsDevelopment())
-            {
-                builder.AddUserSecrets<Startup>();
-            }
-
-            builder.AddEnvironmentVariables();
-
             Configuration = builder.Build();
             Environment = env;
         }

src/Billing/Billing.csproj

@@ -25,7 +25,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.1" />
   </ItemGroup>
   
   <ItemGroup>

src/Billing/Startup.cs

@@ -16,17 +16,7 @@ namespace Bit.Billing
         public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()
-                .SetBasePath(env.ContentRootPath)
+                .AddSettingsConfiguration<Startup>(env);
-                .AddJsonFile("settings.json", optional: false, reloadOnChange: true)
-                .AddJsonFile($"settings.{env.EnvironmentName}.json", optional: true);
-
-            if(env.IsDevelopment())
-            {
-                builder.AddUserSecrets<Startup>();
-            }
-
-            builder.AddEnvironmentVariables();
-
             Configuration = builder.Build();
         }
 

src/Core/Core.csproj

@@ -20,6 +20,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="1.1.2" />
     <PackageReference Include="Dapper" Version="1.50.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
     <PackageReference Include="Sendgrid" Version="9.1.1" />
     <PackageReference Include="PushSharp" Version="4.0.10" />

src/Core/Utilities/ConfigurationBuilderExtensions.cs

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

src/Identity/Identity.csproj

@@ -9,7 +9,6 @@
   
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
   </ItemGroup>
   

src/Identity/Startup.cs

@@ -1,7 +1,6 @@
 using System;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Configuration;
@@ -16,17 +15,7 @@ namespace Bit.Identity
         public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()
-                .SetBasePath(env.ContentRootPath)
+                .AddSettingsConfiguration<Startup>(env);
-                .AddJsonFile("settings.json")
-                .AddJsonFile($"settings.{env.EnvironmentName}.json", optional: true);
-
-            if(env.IsDevelopment())
-            {
-                builder.AddUserSecrets<Startup>();
-            }
-
-            builder.AddEnvironmentVariables();
-
             Configuration = builder.Build();
             Environment = env;
         }
@@ -74,18 +63,8 @@ namespace Bit.Identity
                 .AddConsole()
                 .AddDebug();
 
-            if(env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
             // Add IdentityServer to the request pipeline.
             app.UseIdentityServer();
-
-            app.Run(async (context) =>
-            {
-                await context.Response.WriteAsync("Hello World!");
-            });
         }
     }
 }