fix: remove 3rd party assets from mail (#3569)

This commit is contained in:
Livio Amstutz
2022-05-02 16:41:57 +02:00
committed by GitHub
parent 2e97394246
commit ef6fd5a843
11 changed files with 24 additions and 28 deletions

View File

@@ -41,7 +41,8 @@ func Register(configs Configs,
externalPort uint16,
externalSecure bool,
dir http.FileSystem,
assetsPrefix string,
assetsPrefix,
fileSystemPath string,
userEncryption crypto.EncryptionAlgorithm,
smtpEncryption crypto.EncryptionAlgorithm,
smsEncryption crypto.EncryptionAlgorithm,
@@ -59,6 +60,7 @@ func Register(configs Configs,
externalSecure,
dir,
assetsPrefix,
fileSystemPath,
userEncryption,
smtpEncryption,
smsEncryption,

View File

@@ -59,7 +59,8 @@ func newNotification(
externalPort uint16,
externalSecure bool,
statikDir http.FileSystem,
assetsPrefix string,
assetsPrefix,
fileSystemPath string,
userEncryption crypto.EncryptionAlgorithm,
smtpEncryption crypto.EncryptionAlgorithm,
smsEncryption crypto.EncryptionAlgorithm,
@@ -75,6 +76,7 @@ func newNotification(
smsTokenCrypto: smsEncryption,
externalSecure: externalSecure,
externalPort: externalPort,
fileSystemPath: fileSystemPath,
}
h.subscribe()

View File

@@ -28,7 +28,8 @@ func Start(conf Config,
command *command.Commands,
queries *query.Queries,
dbClient *sql.DB,
assetsPrefix string,
assetsPrefix,
fileSystemPath string,
userEncryption crypto.EncryptionAlgorithm,
smtpEncryption crypto.EncryptionAlgorithm,
smsEncryption crypto.EncryptionAlgorithm,
@@ -43,7 +44,7 @@ func Start(conf Config,
return nil, err
}
spool := spooler.StartSpooler(conf.Spooler, es, view, dbClient, command, queries, externalPort, externalSecure, dir, assetsPrefix, userEncryption, smtpEncryption, smsEncryption)
spool := spooler.StartSpooler(conf.Spooler, es, view, dbClient, command, queries, externalPort, externalSecure, dir, assetsPrefix, fileSystemPath, userEncryption, smtpEncryption, smsEncryption)
return &EsRepository{
spool,

View File

@@ -29,7 +29,8 @@ func StartSpooler(c SpoolerConfig,
externalPort uint16,
externalSecure bool,
dir http.FileSystem,
assetsPrefix string,
assetsPrefix,
fileSystemPath string,
userEncryption crypto.EncryptionAlgorithm,
smtpEncryption crypto.EncryptionAlgorithm,
smsEncryption crypto.EncryptionAlgorithm,
@@ -38,7 +39,7 @@ func StartSpooler(c SpoolerConfig,
Eventstore: es,
Locker: &locker{dbClient: sql},
ConcurrentWorkers: c.ConcurrentWorkers,
ViewHandlers: handler.Register(c.Handlers, c.BulkLimit, c.FailureCountUntilSkip, view, es, command, queries, externalPort, externalSecure, dir, assetsPrefix, userEncryption, smtpEncryption, smsEncryption),
ViewHandlers: handler.Register(c.Handlers, c.BulkLimit, c.FailureCountUntilSkip, view, es, command, queries, externalPort, externalSecure, dir, assetsPrefix, fileSystemPath, userEncryption, smtpEncryption, smsEncryption),
}
spool := spoolerConfig.New()
spool.Start()