nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-08 06:28:14 -05:00
Code

adminsettings to docker env setup

Browse Source
This commit is contained in:
Kyle Spearrin 2018-03-28 10:45:30 -04:00
parent 40dff2cd6e
commit 7f250a4e74
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Identity/ReadOnlyEnvIdentityUserStore.cs
View File

@ -1,6 +1,7 @@
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Bit.Core.Utilities;
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
@ -19,7 +20,7 @@ namespace Bit.Core.Identity
CancellationToken cancellationToken = default(CancellationToken)) CancellationToken cancellationToken = default(CancellationToken))
{ {
var usersCsv = _configuration["adminSettings:admins"]; var usersCsv = _configuration["adminSettings:admins"];
if(string.IsNullOrWhiteSpace(usersCsv)) if(!CoreHelpers.SettingHasValue(usersCsv))
{ {
return Task.FromResult<IdentityUser>(null); return Task.FromResult<IdentityUser>(null);
} }

1
util/Setup/EnvironmentFileBuilder.cs
View File

@ -61,6 +61,7 @@ namespace Bit.Setup
["globalSettings__mail__smtp__port"] = "587", ["globalSettings__mail__smtp__port"] = "587",
["globalSettings__mail__smtp__useDefaultCredentials"] = "false", ["globalSettings__mail__smtp__useDefaultCredentials"] = "false",
["globalSettings__disableUserRegistration"] = "false", ["globalSettings__disableUserRegistration"] = "false",
["adminSettings__admins"] = string.Empty,
}; };
if(forInstall && !Push) if(forInstall && !Push)