Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 06:40:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

smtp: require templates only if a server is configured or in service mode

Browse Source 
This regression was introduced after recent changes to allow setting the SMTP
settings from the WebAdmin UI.

Fixes #1217

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2023-03-01 18:31:02 +01:00
parent fad6af11e5
commit 662164c7ff
9 changed files with 104 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/common/dataretention_test.go
View File

@@ -87,7 +87,7 @@ func TestRetentionValidation(t *testing.T) {
From: "notification@example.com",
TemplatesPath: "templates",
}
err = smtpCfg.Initialize(configDir)
err = smtpCfg.Initialize(configDir, true)
require.NoError(t, err)
err = check.Validate()
@@ -99,7 +99,7 @@ func TestRetentionValidation(t *testing.T) {
assert.NoError(t, err)
smtpCfg = smtp.Config{}
err = smtpCfg.Initialize(configDir)
err = smtpCfg.Initialize(configDir, true)
require.NoError(t, err)
check.Notifications = []RetentionCheckNotification{RetentionCheckNotificationHook}
@@ -120,7 +120,7 @@ func TestRetentionEmailNotifications(t *testing.T) {
From: "notification@example.com",
TemplatesPath: "templates",
}
err := smtpCfg.Initialize(configDir)
err := smtpCfg.Initialize(configDir, true)
require.NoError(t, err)
user := dataprovider.User{
@@ -160,7 +160,7 @@ func TestRetentionEmailNotifications(t *testing.T) {
}
smtpCfg.Port = 2626
err = smtpCfg.Initialize(configDir)
err = smtpCfg.Initialize(configDir, true)
require.NoError(t, err)
err = check.sendEmailNotification(nil)
assert.Error(t, err)
@@ -175,7 +175,7 @@ func TestRetentionEmailNotifications(t *testing.T) {
}
smtpCfg = smtp.Config{}
err = smtpCfg.Initialize(configDir)
err = smtpCfg.Initialize(configDir, true)
require.NoError(t, err)
err = check.sendEmailNotification(nil)
assert.Error(t, err)