From 1331cc90f74b2d1ea335c5f045a12a0b620f8f82 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 19 Mar 2020 11:10:23 -0400 Subject: [PATCH] check SettingHasValue instead of empty --- src/Core/Utilities/ServiceCollectionExtensions.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Core/Utilities/ServiceCollectionExtensions.cs b/src/Core/Utilities/ServiceCollectionExtensions.cs index a79eb08655..014cf2338a 100644 --- a/src/Core/Utilities/ServiceCollectionExtensions.cs +++ b/src/Core/Utilities/ServiceCollectionExtensions.cs @@ -42,7 +42,7 @@ namespace Bit.Core.Utilities { public static void AddSqlServerRepositories(this IServiceCollection services, GlobalSettings globalSettings) { - var usePostgreSql = !string.IsNullOrWhiteSpace(globalSettings.PostgreSql?.ConnectionString); + var usePostgreSql = CoreHelpers.SettingHasValue(globalSettings.PostgreSql?.ConnectionString); var useEf = usePostgreSql; if(useEf) @@ -354,16 +354,17 @@ namespace Bit.Core.Utilities identityServerBuilder.AddDeveloperSigningCredential(false); } else if(globalSettings.SelfHosted && - !string.IsNullOrWhiteSpace(globalSettings.IdentityServer.CertificatePassword) + CoreHelpers.SettingHasValue(globalSettings.IdentityServer.CertificatePassword) && File.Exists("identity.pfx")) { var identityServerCert = CoreHelpers.GetCertificate("identity.pfx", globalSettings.IdentityServer.CertificatePassword); identityServerBuilder.AddSigningCredential(identityServerCert); } - else if(!string.IsNullOrWhiteSpace(globalSettings.IdentityServer.CertificateThumbprint)) + else if(CoreHelpers.SettingHasValue(globalSettings.IdentityServer.CertificateThumbprint)) { - var identityServerCert = CoreHelpers.GetCertificate(globalSettings.IdentityServer.CertificateThumbprint); + var identityServerCert = CoreHelpers.GetCertificate( + globalSettings.IdentityServer.CertificateThumbprint); identityServerBuilder.AddSigningCredential(identityServerCert); } else if(!globalSettings.SelfHosted &&