1
0
mirror of https://github.com/bitwarden/server.git synced 2025-07-14 22:27:32 -05:00

Merge branch 'main' into brant/PM-17562-Slack-Event-Posting

This commit is contained in:
Brant DeBow
2025-03-04 09:56:24 -05:00
211 changed files with 4947 additions and 1252 deletions

View File

@ -84,6 +84,8 @@ public class GlobalSettings : IGlobalSettings
public virtual IDomainVerificationSettings DomainVerification { get; set; } = new DomainVerificationSettings();
public virtual ILaunchDarklySettings LaunchDarkly { get; set; } = new LaunchDarklySettings();
public virtual string DevelopmentDirectory { get; set; }
public virtual IWebPushSettings WebPush { get; set; } = new WebPushSettings();
public virtual bool EnableEmailVerification { get; set; }
public virtual string KdfDefaultHashKey { get; set; }
public virtual string PricingUri { get; set; }
@ -689,4 +691,9 @@ public class GlobalSettings : IGlobalSettings
public virtual IConnectionStringSettings Redis { get; set; } = new ConnectionStringSettings();
public virtual IConnectionStringSettings Cosmos { get; set; } = new ConnectionStringSettings();
}
public class WebPushSettings : IWebPushSettings
{
public string VapidPublicKey { get; set; }
}
}