From 7f250a4e749ef2f179f5ec3d1c86dd29ea3c976d Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 28 Mar 2018 10:45:30 -0400 Subject: [PATCH] adminsettings to docker env setup --- src/Core/Identity/ReadOnlyEnvIdentityUserStore.cs | 3 ++- util/Setup/EnvironmentFileBuilder.cs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Core/Identity/ReadOnlyEnvIdentityUserStore.cs b/src/Core/Identity/ReadOnlyEnvIdentityUserStore.cs index 324764e76..f5586f6b8 100644 --- a/src/Core/Identity/ReadOnlyEnvIdentityUserStore.cs +++ b/src/Core/Identity/ReadOnlyEnvIdentityUserStore.cs @@ -1,6 +1,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using Bit.Core.Utilities; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Configuration; @@ -19,7 +20,7 @@ namespace Bit.Core.Identity CancellationToken cancellationToken = default(CancellationToken)) { var usersCsv = _configuration["adminSettings:admins"]; - if(string.IsNullOrWhiteSpace(usersCsv)) + if(!CoreHelpers.SettingHasValue(usersCsv)) { return Task.FromResult(null); } diff --git a/util/Setup/EnvironmentFileBuilder.cs b/util/Setup/EnvironmentFileBuilder.cs index 2e32c8ac6..8d365f2e9 100644 --- a/util/Setup/EnvironmentFileBuilder.cs +++ b/util/Setup/EnvironmentFileBuilder.cs @@ -61,6 +61,7 @@ namespace Bit.Setup ["globalSettings__mail__smtp__port"] = "587", ["globalSettings__mail__smtp__useDefaultCredentials"] = "false", ["globalSettings__disableUserRegistration"] = "false", + ["adminSettings__admins"] = string.Empty, }; if(forInstall && !Push)