nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-29 23:34:53 -05:00
Code

check SettingHasValue instead of empty

Browse Source
This commit is contained in:
Kyle Spearrin 2020-03-19 11:10:23 -04:00
parent 981d6a0526
commit 1331cc90f7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ namespace Bit.Core.Utilities
{ {
public static void AddSqlServerRepositories(this IServiceCollection services, GlobalSettings globalSettings) 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; var useEf = usePostgreSql;
if(useEf) if(useEf)
@ -354,16 +354,17 @@ namespace Bit.Core.Utilities
identityServerBuilder.AddDeveloperSigningCredential(false); identityServerBuilder.AddDeveloperSigningCredential(false);
} }
else if(globalSettings.SelfHosted && else if(globalSettings.SelfHosted &&
!string.IsNullOrWhiteSpace(globalSettings.IdentityServer.CertificatePassword) CoreHelpers.SettingHasValue(globalSettings.IdentityServer.CertificatePassword)
&& File.Exists("identity.pfx")) && File.Exists("identity.pfx"))
{ {
var identityServerCert = CoreHelpers.GetCertificate("identity.pfx", var identityServerCert = CoreHelpers.GetCertificate("identity.pfx",
globalSettings.IdentityServer.CertificatePassword); globalSettings.IdentityServer.CertificatePassword);
identityServerBuilder.AddSigningCredential(identityServerCert); 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); identityServerBuilder.AddSigningCredential(identityServerCert);
} }
else if(!globalSettings.SelfHosted && else if(!globalSettings.SelfHosted &&