aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-19 15:04:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Store: Allow resetting custom email server (#6547)

Browse Source 
* Store: Allow resetting custom email server

Fixes #6546.

* Do not show fallback settings in form
This commit is contained in:
d11n
2025-01-16 06:32:53 +01:00
committed by GitHub
parent 92a92a7fff
commit 1c25d793c7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BTCPayServer/Controllers/UIStoresController.Email.cs
View File

@@ -179,7 +179,8 @@ public partial class UIStoresController
var fallbackSettings = emailSender is StoreEmailSender { FallbackSender: { } fallbackSender }
? await fallbackSender.GetEmailSettings()
: null;
return View(new EmailsViewModel(data, fallbackSettings));
var settings = data != fallbackSettings ? data : new EmailSettings();
return View(new EmailsViewModel(settings, fallbackSettings));
}
[HttpPost("{storeId}/email-settings")]
@@ -236,7 +237,8 @@ public partial class UIStoresController
await _storeRepo.UpdateStore(store);
TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["Email server password reset"].Value;
}
if (useCustomSMTP)
var unsetCustomSMTP = !useCustomSMTP && store.GetStoreBlob().EmailSettings is not null;
if (useCustomSMTP || unsetCustomSMTP)
{
if (model.Settings.From is not null && !MailboxAddressValidator.IsMailboxAddress(model.Settings.From))
{
@@ -249,7 +251,7 @@ public partial class UIStoresController
{
model.Settings.Password = storeBlob.EmailSettings.Password;
}
storeBlob.EmailSettings = model.Settings;
storeBlob.EmailSettings = unsetCustomSMTP ? null : model.Settings;
store.SetStoreBlob(storeBlob);
await _storeRepo.UpdateStore(store);
TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["Email settings modified"].Value;