Removing all FakeApp usages (#14174)
* Removing some other fake apps * More FakeApp removed * Removing entirely FakeApp * Fixing some tests * Fixing get Cluster id from get plugin status * Fixing failing tests * Fixing tests * Fixing test initialization for web * Fixing InitServer for server tests * Fixing InitServer for server tests * Reverting go.sum and go.mod * Removing unneded HTMLTemplates function in App layer * Moving back some functions to its old place to easy the review * Moving back some functions to its old place to easy the review * Using the last struct2interface version * Generating store layers * Fixing merge problems * Addressing PR comments * Small fix * Fixing app tests build * Fixing tests * fixing tests * Fix tests * Fixing tests * Fixing tests * Fixing tests * Moving license to server struct * Adding some fixes to the test compilation * Fixing cluster and some jobs initialization * Fixing some license tests compilation problems * Fixing recursive cache invalidation * Regenerating app layers * Fix test compilation Co-authored-by: mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
f3ac33e6dc
Коммит
f5eab1271b
@@ -12,9 +12,9 @@ import (
|
||||
"github.com/mattermost/mattermost-server/v5/services/searchengine"
|
||||
)
|
||||
|
||||
var accountMigrationInterface func(*Server) einterfaces.AccountMigrationInterface
|
||||
var accountMigrationInterface func(*App) einterfaces.AccountMigrationInterface
|
||||
|
||||
func RegisterAccountMigrationInterface(f func(*Server) einterfaces.AccountMigrationInterface) {
|
||||
func RegisterAccountMigrationInterface(f func(*App) einterfaces.AccountMigrationInterface) {
|
||||
accountMigrationInterface = f
|
||||
}
|
||||
|
||||
@@ -130,43 +130,45 @@ func (s *Server) initEnterprise() {
|
||||
if metricsInterface != nil {
|
||||
s.Metrics = metricsInterface(s)
|
||||
}
|
||||
if accountMigrationInterface != nil {
|
||||
s.AccountMigration = accountMigrationInterface(s)
|
||||
}
|
||||
if complianceInterface != nil {
|
||||
s.Compliance = complianceInterface(s)
|
||||
}
|
||||
if ldapInterface != nil {
|
||||
s.Ldap = ldapInterface(s.FakeApp())
|
||||
}
|
||||
if messageExportInterface != nil {
|
||||
s.MessageExport = messageExportInterface(s)
|
||||
}
|
||||
if notificationInterface != nil {
|
||||
s.Notification = notificationInterface(s.FakeApp())
|
||||
}
|
||||
if samlInterface != nil {
|
||||
if *s.FakeApp().Config().ExperimentalSettings.UseNewSAMLLibrary && samlInterfaceNew != nil {
|
||||
mlog.Debug("Loading new SAML2 library")
|
||||
s.Saml = samlInterfaceNew(s.FakeApp())
|
||||
} else {
|
||||
mlog.Debug("Loading original SAML library")
|
||||
s.Saml = samlInterface(s.FakeApp())
|
||||
}
|
||||
s.AddConfigListener(func(_, cfg *model.Config) {
|
||||
if err := s.Saml.ConfigureSP(); err != nil {
|
||||
mlog.Error("An error occurred while configuring SAML Service Provider", mlog.Err(err))
|
||||
}
|
||||
})
|
||||
}
|
||||
if dataRetentionInterface != nil {
|
||||
s.DataRetention = dataRetentionInterface(s)
|
||||
}
|
||||
if clusterInterface != nil {
|
||||
s.Cluster = clusterInterface(s)
|
||||
}
|
||||
|
||||
if elasticsearchInterface != nil {
|
||||
s.SearchEngine.RegisterElasticsearchEngine(elasticsearchInterface(s))
|
||||
}
|
||||
}
|
||||
|
||||
func (a *App) initEnterprise() {
|
||||
if accountMigrationInterface != nil {
|
||||
a.srv.AccountMigration = accountMigrationInterface(a)
|
||||
}
|
||||
if ldapInterface != nil {
|
||||
a.srv.Ldap = ldapInterface(a)
|
||||
}
|
||||
if notificationInterface != nil {
|
||||
a.srv.Notification = notificationInterface(a)
|
||||
}
|
||||
if samlInterface != nil {
|
||||
if *a.Config().ExperimentalSettings.UseNewSAMLLibrary && samlInterfaceNew != nil {
|
||||
mlog.Debug("Loading new SAML2 library")
|
||||
a.srv.Saml = samlInterfaceNew(a)
|
||||
} else {
|
||||
mlog.Debug("Loading original SAML library")
|
||||
a.srv.Saml = samlInterface(a)
|
||||
}
|
||||
a.AddConfigListener(func(_, cfg *model.Config) {
|
||||
if err := a.srv.Saml.ConfigureSP(); err != nil {
|
||||
mlog.Error("An error occurred while configuring SAML Service Provider", mlog.Err(err))
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user