centralize a lot of service registration

src/Api/Api.csproj

@@ -22,23 +22,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="1.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Cors" Version="1.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
     <PackageReference Include="AspNetCoreRateLimit" Version="1.0.5" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="1.4.0" />
-    <PackageReference Include="Serilog.Sinks.AzureDocumentDb" Version="3.6.1" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.1.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.1" />
   </ItemGroup>

src/Api/Startup.cs

@@ -3,7 +3,6 @@ using System.Security.Claims;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -11,26 +10,17 @@ using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using Bit.Api.Utilities;
 using Bit.Core;
-using Bit.Core.Models.Table;
 using Bit.Core.Identity;
-using System.Text;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json.Serialization;
 using AspNetCoreRateLimit;
 using Bit.Api.Middleware;
-using IdentityServer4.Validation;
-using IdentityServer4.Services;
-using IdentityServer4.Stores;
-using Bit.Core.Utilities;
-using Serilog;
 using Serilog.Events;
 using Bit.Core.IdentityServer;
-using Bit.Core.Enums;
-using Microsoft.AspNetCore.DataProtection;
-using Microsoft.WindowsAzure.Storage;
 using Stripe;
+using Bit.Core.Utilities;
 
 namespace Bit.Api
 {
@@ -65,21 +55,12 @@ namespace Bit.Api
             services.AddOptions();
 
             // Settings
-            var globalSettings = new GlobalSettings();
+            var globalSettings = services.AddGlobalSettingsServices(Configuration);
-            ConfigurationBinder.Bind(Configuration.GetSection("GlobalSettings"), globalSettings);
-            services.AddSingleton(s => globalSettings);
             services.Configure<IpRateLimitOptions>(Configuration.GetSection("IpRateLimitOptions"));
             services.Configure<IpRateLimitPolicies>(Configuration.GetSection("IpRateLimitPolicies"));
 
             // Data Protection
-            if(Environment.IsProduction())
+            services.AddCustomDataProtectionServices(Environment, globalSettings);
-            {
-                var dataProtectionCert = CoreHelpers.GetCertificate(globalSettings.DataProtection.CertificateThumbprint);
-                var storageAccount = CloudStorageAccount.Parse(globalSettings.Storage.ConnectionString);
-                services.AddDataProtection()
-                    .PersistKeysToAzureBlobStorage(storageAccount, "aspnet-dataprotection/keys.xml")
-                    .ProtectKeysWithCertificate(dataProtectionCert);
-            }
 
             // Stripe Billing
             StripeConfiguration.SetApiKey(globalSettings.StripeApiKey);
@@ -98,69 +79,10 @@ namespace Bit.Api
             services.AddSingleton<IRateLimitCounterStore, MemoryCacheRateLimitCounterStore>();
 
             // IdentityServer
-            var identityServerBuilder = services.AddIdentityServer(options =>
+            services.AddCustomIdentityServerServices(Environment, globalSettings);
-            {
-                options.Endpoints.EnableAuthorizeEndpoint = false;
-                options.Endpoints.EnableIntrospectionEndpoint = false;
-                options.Endpoints.EnableEndSessionEndpoint = false;
-                options.Endpoints.EnableUserInfoEndpoint = false;
-                options.Endpoints.EnableCheckSessionEndpoint = false;
-                options.Endpoints.EnableTokenRevocationEndpoint = false;
-            })
-                .AddInMemoryApiResources(ApiResources.GetApiResources())
-                .AddInMemoryClients(Clients.GetClients());
-            services.AddTransient<ICorsPolicyService, AllowAllCorsPolicyService>();
-
-            if(Environment.IsProduction())
-            {
-                var identityServerCert = CoreHelpers.GetCertificate(globalSettings.IdentityServer.CertificateThumbprint);
-                identityServerBuilder.AddSigningCredential(identityServerCert);
-            }
-            else
-            {
-                identityServerBuilder.AddTemporarySigningCredential();
-            }
-
-            services.AddScoped<IResourceOwnerPasswordValidator, ResourceOwnerPasswordValidator>();
-            services.AddScoped<IProfileService, ProfileService>();
-            services.AddSingleton<IPersistedGrantStore, PersistedGrantStore>();
 
             // Identity
-            services.AddTransient<ILookupNormalizer, LowerInvariantLookupNormalizer>();
+            services.AddCustomIdentityServices(globalSettings);
-            services.AddJwtBearerIdentity(options =>
-            {
-                options.User = new UserOptions
-                {
-                    RequireUniqueEmail = true,
-                    AllowedUserNameCharacters = null // all
-                };
-                options.Password = new PasswordOptions
-                {
-                    RequireDigit = false,
-                    RequireLowercase = false,
-                    RequiredLength = 8,
-                    RequireNonAlphanumeric = false,
-                    RequireUppercase = false
-                };
-                options.ClaimsIdentity = new ClaimsIdentityOptions
-                {
-                    SecurityStampClaimType = "securitystamp",
-                    UserNameClaimType = ClaimTypes.Email
-                };
-                options.Tokens.ChangeEmailTokenProvider = TokenOptions.DefaultEmailProvider;
-            }, jwtBearerOptions =>
-            {
-                jwtBearerOptions.Audience = "bitwarden";
-                jwtBearerOptions.Issuer = "bitwarden";
-                jwtBearerOptions.TokenLifetime = TimeSpan.FromDays(10 * 365);
-                jwtBearerOptions.TwoFactorTokenLifetime = TimeSpan.FromMinutes(10);
-                var keyBytes = Encoding.ASCII.GetBytes(globalSettings.JwtSigningKey);
-                jwtBearerOptions.SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(keyBytes), SecurityAlgorithms.HmacSha256);
-            })
-            .AddUserStore<UserStore>()
-            .AddRoleStore<RoleStore>()
-            .AddTokenProvider<AuthenticatorTokenProvider>(TwoFactorProviderType.Authenticator.ToString())
-            .AddTokenProvider<EmailTokenProvider<User>>(TokenOptions.DefaultEmailProvider);
 
             var jwtIdentityOptions = provider.GetRequiredService<IOptions<JwtBearerIdentityOptions>>().Value;
             services.AddAuthorization(config =>
@@ -215,9 +137,8 @@ namespace Bit.Api
             IApplicationLifetime appLifetime,
             GlobalSettings globalSettings)
         {
-            if(env.IsProduction())
+            loggerFactory
-            {
+                .AddSerilog(env, appLifetime, globalSettings, (e) =>
-                Func<LogEvent, bool> serilogFilter = (e) =>
                 {
                     var context = e.Properties["SourceContext"].ToString();
                     if(e.Exception != null && (e.Exception.GetType() == typeof(SecurityTokenValidationException) ||
@@ -237,20 +158,8 @@ namespace Bit.Api
                     }
 
                     return e.Level >= LogEventLevel.Error;
-                };
+                })
-
+                .AddDebug();
-                var serilog = new LoggerConfiguration()
-                    .Enrich.FromLogContext()
-                    .Filter.ByIncludingOnly(serilogFilter)
-                    .WriteTo.AzureDocumentDB(new Uri(globalSettings.DocumentDb.Uri), globalSettings.DocumentDb.Key,
-                        timeToLive: TimeSpan.FromDays(7))
-                    .CreateLogger();
-
-                loggerFactory.AddSerilog(serilog);
-                appLifetime.ApplicationStopped.Register(Log.CloseAndFlush);
-            }
-
-            loggerFactory.AddDebug();
 
             // Rate limiting
             app.UseMiddleware<CustomIpRateLimitMiddleware>();

src/Billing/Billing.csproj

@@ -24,8 +24,6 @@
     <PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" 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>

src/Billing/Startup.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -9,6 +6,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Bit.Core;
 using Stripe;
+using Bit.Core.Utilities;
+using Serilog.Events;
 
 namespace Bit.Billing
 {
@@ -39,10 +38,7 @@ namespace Bit.Billing
             services.AddOptions();
 
             // Settings
-            var globalSettings = new GlobalSettings();
+            var globalSettings = services.AddGlobalSettingsServices(Configuration);
-            ConfigurationBinder.Bind(Configuration.GetSection("GlobalSettings"), globalSettings);
-            services.AddSingleton(s => globalSettings);
-            services.Configure<BillingSettings>(Configuration.GetSection("BillingSettings"));
 
             // Stripe Billing
             StripeConfiguration.SetApiKey(globalSettings.StripeApiKey);
@@ -61,10 +57,17 @@ namespace Bit.Billing
             services.AddMvc();
         }
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(
+            IApplicationBuilder app,
+            IHostingEnvironment env,
+            IApplicationLifetime appLifetime,
+            GlobalSettings globalSettings,
+            ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole(Configuration.GetSection("Logging"));
+            loggerFactory
-            loggerFactory.AddDebug();
+                .AddSerilog(env, appLifetime, globalSettings, (e) => e.Level >= LogEventLevel.Error)
+                .AddConsole()
+                .AddDebug();
 
             app.UseMvc();
         }

src/Billing/settings.json

@@ -1,10 +1,4 @@
 {
-  "Logging": {
-    "IncludeScopes": false,
-    "LogLevel": {
-      "Default": "Warning"
-    }
-  },
   "globalSettings": {
     "siteName": "bitwarden",
     "baseVaultUri": "http://localhost:4001/#",

src/Core/Core.csproj

@@ -15,13 +15,16 @@
 
   <ItemGroup>
     <PackageReference Include="IdentityServer4" Version="1.3.1" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="1.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="1.1.1" />
     <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="Newtonsoft.Json" Version="10.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
-    <PackageReference Include="Sendgrid" Version="9.0.12" />
+    <PackageReference Include="Sendgrid" Version="9.1.1" />
     <PackageReference Include="PushSharp" Version="4.0.10" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="1.4.0" />
+    <PackageReference Include="Serilog.Sinks.AzureDocumentDB" Version="3.6.1" />
     <PackageReference Include="Stripe.net" Version="7.8.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="8.1.1" />
     <PackageReference Include="Otp.NET" Version="1.0.1" />

src/Core/ServiceCollectionExtensions.cs

@@ -1,47 +0,0 @@
-using Bit.Core.Repositories;
-using Bit.Core.Services;
-using Microsoft.Extensions.DependencyInjection;
-using SqlServerRepos = Bit.Core.Repositories.SqlServer;
-
-namespace Bit.Core
-{
-    public static class ServiceCollectionExtensions
-    {
-        public static void AddSqlServerRepositories(this IServiceCollection services)
-        {
-            services.AddSingleton<IUserRepository, SqlServerRepos.UserRepository>();
-            services.AddSingleton<ICipherRepository, SqlServerRepos.CipherRepository>();
-            services.AddSingleton<IDeviceRepository, SqlServerRepos.DeviceRepository>();
-            services.AddSingleton<IGrantRepository, SqlServerRepos.GrantRepository>();
-            services.AddSingleton<IOrganizationRepository, SqlServerRepos.OrganizationRepository>();
-            services.AddSingleton<IOrganizationUserRepository, SqlServerRepos.OrganizationUserRepository>();
-            services.AddSingleton<ICollectionRepository, SqlServerRepos.CollectionRepository>();
-            services.AddSingleton<ICollectionUserRepository, SqlServerRepos.CollectionUserRepository>();
-            services.AddSingleton<IFolderRepository, SqlServerRepos.FolderRepository>();
-            services.AddSingleton<ICollectionCipherRepository, SqlServerRepos.CollectionCipherRepository>();
-        }
-
-        public static void AddBaseServices(this IServiceCollection services)
-        {
-            services.AddSingleton<ICipherService, CipherService>();
-            services.AddScoped<IUserService, UserService>();
-            services.AddSingleton<IDeviceService, DeviceService>();
-            services.AddSingleton<IOrganizationService, OrganizationService>();
-            services.AddSingleton<ICollectionService, CollectionService>();
-        }
-
-        public static void AddDefaultServices(this IServiceCollection services)
-        {
-            services.AddSingleton<IMailService, SendGridMailService>();
-            services.AddSingleton<IPushService, PushSharpPushService>();
-            services.AddSingleton<IBlockIpService, AzureQueueBlockIpService>();
-        }
-
-        public static void AddNoopServices(this IServiceCollection services)
-        {
-            services.AddSingleton<IMailService, NoopMailService>();
-            services.AddSingleton<IPushService, NoopPushService>();
-            services.AddSingleton<IBlockIpService, NoopBlockIpService>();
-        }
-    }
-}

src/Core/Utilities/LoggerFactoryExtensions.cs

@@ -0,0 +1,39 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Logging;
+using Serilog;
+using Serilog.Events;
+using System;
+
+namespace Bit.Core.Utilities
+{
+    public static class LoggerFactoryExtensions
+    {
+        public static ILoggerFactory AddSerilog(
+            this ILoggerFactory factory,
+            IHostingEnvironment env,
+            IApplicationLifetime appLifetime,
+            GlobalSettings globalSettings,
+            Func<LogEvent, bool> filter = null)
+        {
+            if(env.IsProduction())
+            {
+                if(filter == null)
+                {
+                    filter = (e) => true;
+                }
+
+                var serilog = new LoggerConfiguration()
+                    .Enrich.FromLogContext()
+                    .Filter.ByIncludingOnly(filter)
+                    .WriteTo.AzureDocumentDB(new Uri(globalSettings.DocumentDb.Uri), globalSettings.DocumentDb.Key,
+                        timeToLive: TimeSpan.FromDays(7))
+                    .CreateLogger();
+
+                factory.AddSerilog(serilog);
+                appLifetime.ApplicationStopped.Register(Log.CloseAndFlush);
+            }
+
+            return factory;
+        }
+    }
+}

src/Core/Utilities/ServiceCollectionExtensions.cs

@@ -0,0 +1,165 @@
+using Bit.Core.Enums;
+using Bit.Core.Identity;
+using Bit.Core.IdentityServer;
+using Bit.Core.Models.Table;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using IdentityServer4.Services;
+using IdentityServer4.Stores;
+using IdentityServer4.Validation;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.IdentityModel.Tokens;
+using Microsoft.WindowsAzure.Storage;
+using System;
+using System.Security.Claims;
+using System.Text;
+using SqlServerRepos = Bit.Core.Repositories.SqlServer;
+
+namespace Bit.Core.Utilities
+{
+    public static class ServiceCollectionExtensions
+    {
+        public static void AddSqlServerRepositories(this IServiceCollection services)
+        {
+            services.AddSingleton<IUserRepository, SqlServerRepos.UserRepository>();
+            services.AddSingleton<ICipherRepository, SqlServerRepos.CipherRepository>();
+            services.AddSingleton<IDeviceRepository, SqlServerRepos.DeviceRepository>();
+            services.AddSingleton<IGrantRepository, SqlServerRepos.GrantRepository>();
+            services.AddSingleton<IOrganizationRepository, SqlServerRepos.OrganizationRepository>();
+            services.AddSingleton<IOrganizationUserRepository, SqlServerRepos.OrganizationUserRepository>();
+            services.AddSingleton<ICollectionRepository, SqlServerRepos.CollectionRepository>();
+            services.AddSingleton<ICollectionUserRepository, SqlServerRepos.CollectionUserRepository>();
+            services.AddSingleton<IFolderRepository, SqlServerRepos.FolderRepository>();
+            services.AddSingleton<ICollectionCipherRepository, SqlServerRepos.CollectionCipherRepository>();
+        }
+
+        public static void AddBaseServices(this IServiceCollection services)
+        {
+            services.AddSingleton<ICipherService, CipherService>();
+            services.AddScoped<IUserService, UserService>();
+            services.AddSingleton<IDeviceService, DeviceService>();
+            services.AddSingleton<IOrganizationService, OrganizationService>();
+            services.AddSingleton<ICollectionService, CollectionService>();
+        }
+
+        public static void AddDefaultServices(this IServiceCollection services)
+        {
+            services.AddSingleton<IMailService, SendGridMailService>();
+            services.AddSingleton<IPushService, PushSharpPushService>();
+            services.AddSingleton<IBlockIpService, AzureQueueBlockIpService>();
+        }
+
+        public static void AddNoopServices(this IServiceCollection services)
+        {
+            services.AddSingleton<IMailService, NoopMailService>();
+            services.AddSingleton<IPushService, NoopPushService>();
+            services.AddSingleton<IBlockIpService, NoopBlockIpService>();
+        }
+
+        public static IdentityBuilder AddCustomIdentityServices(
+            this IServiceCollection services, GlobalSettings globalSettings)
+        {
+            services.AddTransient<ILookupNormalizer, LowerInvariantLookupNormalizer>();
+
+            var identityBuilder = services.AddJwtBearerIdentity(options =>
+            {
+                options.User = new UserOptions
+                {
+                    RequireUniqueEmail = true,
+                    AllowedUserNameCharacters = null // all
+                };
+                options.Password = new PasswordOptions
+                {
+                    RequireDigit = false,
+                    RequireLowercase = false,
+                    RequiredLength = 8,
+                    RequireNonAlphanumeric = false,
+                    RequireUppercase = false
+                };
+                options.ClaimsIdentity = new ClaimsIdentityOptions
+                {
+                    SecurityStampClaimType = "securitystamp",
+                    UserNameClaimType = ClaimTypes.Email
+                };
+                options.Tokens.ChangeEmailTokenProvider = TokenOptions.DefaultEmailProvider;
+            }, jwtBearerOptions =>
+            {
+                jwtBearerOptions.Audience = "bitwarden";
+                jwtBearerOptions.Issuer = "bitwarden";
+                jwtBearerOptions.TokenLifetime = TimeSpan.FromDays(10 * 365);
+                jwtBearerOptions.TwoFactorTokenLifetime = TimeSpan.FromMinutes(10);
+                var keyBytes = Encoding.ASCII.GetBytes(globalSettings.JwtSigningKey);
+                jwtBearerOptions.SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(keyBytes), SecurityAlgorithms.HmacSha256);
+            });
+
+            identityBuilder
+                .AddUserStore<UserStore>()
+                .AddRoleStore<RoleStore>()
+                .AddTokenProvider<AuthenticatorTokenProvider>(TwoFactorProviderType.Authenticator.ToString())
+                .AddTokenProvider<EmailTokenProvider<User>>(TokenOptions.DefaultEmailProvider);
+
+            return identityBuilder;
+        }
+
+        public static IIdentityServerBuilder AddCustomIdentityServerServices(
+            this IServiceCollection services, IHostingEnvironment env, GlobalSettings globalSettings)
+        {
+            var identityServerBuilder = services
+                .AddIdentityServer(options =>
+                {
+                    options.Endpoints.EnableAuthorizeEndpoint = false;
+                    options.Endpoints.EnableIntrospectionEndpoint = false;
+                    options.Endpoints.EnableEndSessionEndpoint = false;
+                    options.Endpoints.EnableUserInfoEndpoint = false;
+                    options.Endpoints.EnableCheckSessionEndpoint = false;
+                    options.Endpoints.EnableTokenRevocationEndpoint = false;
+                })
+                .AddInMemoryApiResources(ApiResources.GetApiResources())
+                .AddInMemoryClients(Clients.GetClients());
+
+            services.AddTransient<ICorsPolicyService, AllowAllCorsPolicyService>();
+
+            if(env.IsProduction())
+            {
+                var identityServerCert = CoreHelpers.GetCertificate(globalSettings.IdentityServer.CertificateThumbprint);
+                identityServerBuilder.AddSigningCredential(identityServerCert);
+            }
+            else
+            {
+                identityServerBuilder.AddTemporarySigningCredential();
+            }
+
+            services.AddScoped<IResourceOwnerPasswordValidator, ResourceOwnerPasswordValidator>();
+            services.AddScoped<IProfileService, ProfileService>();
+            services.AddSingleton<IPersistedGrantStore, PersistedGrantStore>();
+
+            return identityServerBuilder;
+        }
+
+        public static void AddCustomDataProtectionServices(
+            this IServiceCollection services, IHostingEnvironment env, GlobalSettings globalSettings)
+        {
+            if(env.IsProduction())
+            {
+                var dataProtectionCert = CoreHelpers.GetCertificate(globalSettings.DataProtection.CertificateThumbprint);
+                var storageAccount = CloudStorageAccount.Parse(globalSettings.Storage.ConnectionString);
+                services.AddDataProtection()
+                    .PersistKeysToAzureBlobStorage(storageAccount, "aspnet-dataprotection/keys.xml")
+                    .ProtectKeysWithCertificate(dataProtectionCert);
+            }
+        }
+
+        public static GlobalSettings AddGlobalSettingsServices(this IServiceCollection services,
+            IConfigurationRoot root)
+        {
+            var globalSettings = new GlobalSettings();
+            ConfigurationBinder.Bind(root.GetSection("GlobalSettings"), globalSettings);
+            services.AddSingleton(s => globalSettings);
+            return globalSettings;
+        }
+    }
+}

src/Identity/Identity.csproj

@@ -4,10 +4,13 @@
     <TargetFramework>net461</TargetFramework>
     <AssemblyName>Identity</AssemblyName>
     <RootNamespace>Bit.Identity</RootNamespace>
+    <UserSecretsId>527b1fab-a4b5-465b-881a-f44f08c42899</UserSecretsId>
   </PropertyGroup>
   
   <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>
   
   <ItemGroup>

src/Identity/Startup.cs

@@ -4,24 +4,84 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
+using Bit.Core;
+using Bit.Core.Utilities;
+using Serilog.Events;
 
 namespace Bit.Identity
 {
     public class Startup
     {
-        public void ConfigureServices(IServiceCollection services)
+        public Startup(IHostingEnvironment env)
         {
+            var builder = new ConfigurationBuilder()
+                .SetBasePath(env.ContentRootPath)
+                .AddJsonFile("settings.json")
+                .AddJsonFile($"settings.{env.EnvironmentName}.json", optional: true);
+
+            if(env.IsDevelopment())
+            {
+                builder.AddUserSecrets<Startup>();
+            }
+
+            builder.AddEnvironmentVariables();
+
+            Configuration = builder.Build();
+            Environment = env;
         }
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        public IConfigurationRoot Configuration { get; private set; }
+        public IHostingEnvironment Environment { get; set; }
+
+        public void ConfigureServices(IServiceCollection services)
         {
-            loggerFactory.AddConsole();
+            // Options
+            services.AddOptions();
+
+            // Settings
+            var globalSettings = services.AddGlobalSettingsServices(Configuration);
+
+            // Data Protection
+            services.AddCustomDataProtectionServices(Environment, globalSettings);
+
+            // Repositories
+            services.AddSqlServerRepositories();
+
+            // Context
+            services.AddScoped<CurrentContext>();
+
+            // IdentityServer
+            services.AddCustomIdentityServerServices(Environment, globalSettings);
+
+            // Identity
+            services.AddCustomIdentityServices(globalSettings);
+
+            // Services
+            services.AddBaseServices();
+            services.AddDefaultServices();
+        }
+
+        public void Configure(
+            IApplicationBuilder app,
+            IHostingEnvironment env,
+            ILoggerFactory loggerFactory,
+            IApplicationLifetime appLifetime,
+            GlobalSettings globalSettings)
+        {
+            loggerFactory
+                .AddSerilog(env, appLifetime, globalSettings, (e) => e.Level >= LogEventLevel.Error)
+                .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!");

src/Identity/settings.Preview.json

@@ -0,0 +1,5 @@
+{
+  "globalSettings": {
+    "baseVaultUri": "https://preview-vault.bitwarden.com/#"
+  }
+}

src/Identity/settings.Production.json

@@ -0,0 +1,5 @@
+{
+  "globalSettings": {
+    "baseVaultUri": "https://vault.bitwarden.com/#"
+  }
+}

src/Identity/settings.Staging.json

@@ -0,0 +1,5 @@
+{
+  "globalSettings": {
+    "baseVaultUri": "https://vault.bitwarden.com/#"
+  }
+}

src/Identity/settings.json

@@ -0,0 +1,35 @@
+{
+  "globalSettings": {
+    "siteName": "bitwarden",
+    "baseVaultUri": "http://localhost:4001/#",
+    "jwtSigningKey": "THIS IS A SECRET. IT KEEPS YOUR TOKEN SAFE. :)",
+    "stripeApiKey": "SECRET",
+    "sqlServer": {
+      "connectionString": "SECRET"
+    },
+    "mail": {
+      "apiKey": "SECRET",
+      "replyToEmail": "hello@bitwarden.com"
+    },
+    "push": {
+      "apnsCertificateThumbprint": "SECRET",
+      "apnsCertificatePassword": "SECRET",
+      "gcmSenderId": "SECRET",
+      "gcmApiKey": "SECRET",
+      "gcmAppPackageName": "com.x8bit.bitwarden"
+    },
+    "identityServer": {
+      "certificateThumbprint": "SECRET"
+    },
+    "dataProtection": {
+      "certificateThumbprint": "SECRET"
+    },
+    "storage": {
+      "connectionString": "SECRET"
+    },
+    "documentDb": {
+      "uri": "SECRET",
+      "key": "SECRET"
+    }
+  }
+}

src/Mail/Mail.csproj

@@ -21,7 +21,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.0" />
   </ItemGroup>
 
 </Project>

src/Mail/Startup.cs

@@ -10,7 +10,6 @@ namespace Bit.Mail
         public void Configure(IApplicationBuilder app)
         {
             app.UseFileServer();
-            app.UseBrowserLink();
         }
     }
 }