bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-26 21:23:39 +00:00
Code Issues Releases Wiki Activity

centralize a lot of service registration

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-05 20:57:33 -04:00
parent 49bee6935a
commit 3daf0bcd18
17 changed files with 348 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Billing/Billing.csproj
View File

@@ -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>

23
src/Billing/Startup.cs
View File

@@ -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();
ConfigurationBinder.Bind(Configuration.GetSection("GlobalSettings"), globalSettings);
services.AddSingleton(s => globalSettings);
services.Configure<BillingSettings>(Configuration.GetSection("BillingSettings"));
var globalSettings = services.AddGlobalSettingsServices(Configuration);
// 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.AddDebug();
loggerFactory
.AddSerilog(env, appLifetime, globalSettings, (e) => e.Level >= LogEventLevel.Error)
.AddConsole()
.AddDebug();
app.UseMvc();
}

6
src/Billing/settings.json
View File

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