nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-22 13:35:10 -05:00
Code

user secrets from string param

Browse Source
This commit is contained in:
Kyle Spearrin 2017-05-05 23:03:03 -04:00
parent 33e0e3b071
commit 94fa3b1d1d
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Api/Api.csproj
View File

@ -7,7 +7,6 @@
<AssemblyName>Api</AssemblyName> <AssemblyName>Api</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<PackageId>Api</PackageId> <PackageId>Api</PackageId>
<UserSecretsId>aspnet5-bitwarden-Api</UserSecretsId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute> <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute> <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

2
src/Api/Startup.cs
View File

@ -29,7 +29,7 @@ namespace Bit.Api
public Startup(IHostingEnvironment env) public Startup(IHostingEnvironment env)
{ {
var builder = new ConfigurationBuilder() var builder = new ConfigurationBuilder()
.AddSettingsConfiguration<Startup>(env); .AddSettingsConfiguration(env, "aspnet5-bitwarden-Api");
Configuration = builder.Build(); Configuration = builder.Build();
Environment = env; Environment = env;
} }

2
src/Billing/Billing.csproj
View File

@ -6,7 +6,6 @@
<AssemblyName>Billing</AssemblyName> <AssemblyName>Billing</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<PackageId>Billing</PackageId> <PackageId>Billing</PackageId>
<UserSecretsId>bitwarden-Billing</UserSecretsId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute> <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute> <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@ -25,6 +24,7 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" 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="Microsoft.Extensions.Configuration.Binder" Version="1.1.1" />
<PackageReference Include="System.Net.Http" Version="4.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/Billing/Startup.cs
View File

@ -16,7 +16,7 @@ namespace Bit.Billing
public Startup(IHostingEnvironment env) public Startup(IHostingEnvironment env)
{ {
var builder = new ConfigurationBuilder() var builder = new ConfigurationBuilder()
.AddSettingsConfiguration<Startup>(env); .AddSettingsConfiguration(env, "bitwarden-Billing");
Configuration = builder.Build(); Configuration = builder.Build();
} }

7
src/Core/Utilities/ConfigurationBuilderExtensions.cs
View File

@ -5,9 +5,10 @@ namespace Bit.Core.Utilities
{ {
public static class ConfigurationBuilderExtensions public static class ConfigurationBuilderExtensions
{ {
public static IConfigurationBuilder AddSettingsConfiguration<T>( public static IConfigurationBuilder AddSettingsConfiguration(
this ConfigurationBuilder builder, this ConfigurationBuilder builder,
IHostingEnvironment env) where T : class IHostingEnvironment env,
string userSecretsId)
{ {
builder.SetBasePath(env.ContentRootPath) builder.SetBasePath(env.ContentRootPath)
.AddJsonFile("settings.json") .AddJsonFile("settings.json")
@ -15,7 +16,7 @@ namespace Bit.Core.Utilities
if(env.IsDevelopment()) if(env.IsDevelopment())
{ {
builder.AddUserSecrets<T>(); builder.AddUserSecrets(userSecretsId);
} }
builder.AddEnvironmentVariables(); builder.AddEnvironmentVariables();

2
src/Identity/Identity.csproj
View File

@ -4,12 +4,12 @@
<TargetFramework>net461</TargetFramework> <TargetFramework>net461</TargetFramework>
<AssemblyName>Identity</AssemblyName> <AssemblyName>Identity</AssemblyName>
<RootNamespace>Bit.Identity</RootNamespace> <RootNamespace>Bit.Identity</RootNamespace>
<UserSecretsId>527b1fab-a4b5-465b-881a-f44f08c42899</UserSecretsId>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
<PackageReference Include="System.Net.Http" Version="4.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/Identity/Startup.cs
View File

@ -15,7 +15,7 @@ namespace Bit.Identity
public Startup(IHostingEnvironment env) public Startup(IHostingEnvironment env)
{ {
var builder = new ConfigurationBuilder() var builder = new ConfigurationBuilder()
.AddSettingsConfiguration<Startup>(env); .AddSettingsConfiguration(env, "527b1fab-a4b5-465b-881a-f44f08c42899");
Configuration = builder.Build(); Configuration = builder.Build();
Environment = env; Environment = env;
} }