Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-01-22 21:51:22 +01:00
Code Issues Projects Releases Wiki Activity

simplify secrets in startup via csproj tools

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-19 00:08:09 -04:00
parent 8b07244c95
commit 5ee0b4a9da
11 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Api/Api.csproj
View File

@ -27,4 +27,9 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
</ItemGroup>
</Project>

11
src/Api/Startup.cs
View File

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

5
src/Billing/Billing.csproj
View File

@ -25,4 +25,9 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
</ItemGroup>
</Project>

11
src/Billing/Startup.cs
View File

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

4
src/Core/Utilities/ServiceCollectionExtensions.cs
View File

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

2
src/Icons/Icons.csproj
View File

@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RootNamespace>Bit.Icons</RootNamespace>
<UserSecretsId>bitwarden-Icons</UserSecretsId>
</PropertyGroup>
<ItemGroup>
@ -15,6 +16,7 @@
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
</ItemGroup>
</Project>

5
src/Identity/Identity.csproj
View File

@ -18,4 +18,9 @@
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
</ItemGroup>
</Project>

11
src/Identity/Startup.cs
View File

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

4
src/Jobs/Jobs.csproj
View File

@ -23,4 +23,8 @@
<ProjectReference Include="..\Core\Core.csproj" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
</ItemGroup>
</Project>

4
util/Mail/Mail.csproj
View File

@ -16,4 +16,8 @@
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
</ItemGroup>
</Project>

4
util/Server/Server.csproj
View File

@ -10,4 +10,8 @@
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
</ItemGroup>
</Project>