Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-17 02:01:53 +01:00
Code Issues Projects Releases Wiki Activity

DisableEmailNewDevice

Browse Source
This commit is contained in:
Kyle Spearrin 2019-04-01 08:28:36 -04:00
parent 6c86996ab3
commit 7d47dac65f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/GlobalSettings.cs
View File

@ -14,7 +14,7 @@ namespace Bit.Core
public virtual string InternalIdentityKey { get; set; } public virtual string InternalIdentityKey { get; set; }
public virtual string HibpBreachApiKey { get; set; } public virtual string HibpBreachApiKey { get; set; }
public virtual bool DisableUserRegistration { get; set; } public virtual bool DisableUserRegistration { get; set; }
public virtual bool DisableNewDeviceEmails { get; set; } public virtual bool DisableEmailNewDevice { get; set; }
public virtual InstallationSettings Installation { get; set; } = new InstallationSettings(); public virtual InstallationSettings Installation { get; set; } = new InstallationSettings();
public virtual BaseServiceUriSettings BaseServiceUri { get; set; } = new BaseServiceUriSettings(); public virtual BaseServiceUriSettings BaseServiceUri { get; set; } = new BaseServiceUriSettings();
public virtual SqlSettings SqlServer { get; set; } = new SqlSettings(); public virtual SqlSettings SqlServer { get; set; } = new SqlSettings();

2
src/Core/IdentityServer/ResourceOwnerPasswordValidator.cs
View File

@ -387,7 +387,7 @@ namespace Bit.Core.IdentityServer
{ {
var deviceType = device.Type.GetType().GetMember(device.Type.ToString()) var deviceType = device.Type.GetType().GetMember(device.Type.ToString())
.FirstOrDefault()?.GetCustomAttribute<DisplayAttribute>()?.GetName(); .FirstOrDefault()?.GetCustomAttribute<DisplayAttribute>()?.GetName();
if(!_globalSettings.DisableNewDeviceEmails) if(!_globalSettings.DisableEmailNewDevice)
{ {
await _mailService.SendNewDeviceLoggedInEmail(user.Email, deviceType, now, await _mailService.SendNewDeviceLoggedInEmail(user.Email, deviceType, now,
_currentContext.IpAddress); _currentContext.IpAddress);