Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/DocSpace into release/v1.1.0

This commit is contained in:
Maksim Chegulov 2023-06-29 19:16:12 +03:00
commit d2c5345a60

View File

@ -64,14 +64,21 @@ public class SmtpSettingsController : ControllerBase
{
CheckSmtpPermissions();
var settings = _mapper.Map<SmtpSettings, SmtpSettingsDto>(_coreConfiguration.SmtpSettings);
var current = _coreConfiguration.SmtpSettings;
if (current.IsDefaultSettings && !_coreBaseSettings.Standalone)
{
current = SmtpSettings.Empty;
}
var settings = _mapper.Map<SmtpSettings, SmtpSettingsDto>(current);
settings.CredentialsUserPassword = "";
return settings;
}
[HttpPost("smtp")]
public SmtpSettingsDto SaveSmtpSettings( SmtpSettingsDto inDto)
public SmtpSettingsDto SaveSmtpSettings(SmtpSettingsDto inDto)
{
CheckSmtpPermissions();