Remove more global refs / state (#7723)

* remove more global refs / state

* fix job enterprise initialization

* fix api4 test compilation

* saml api endpoints fix

1 files changed, 31 insertions, 37 deletions

diff --git a/app/saml.go b/app/saml.go
index e6a688d8e..2fdb30e99 100644
--- a/app/saml.go
+++ b/app/saml.go
@@ -52,59 +52,56 @@ func WriteSamlFile(fileData *multipart.FileHeader) *model.AppError {
 	return nil
 }
 
-func AddSamlPublicCertificate(fileData *multipart.FileHeader) *model.AppError {
+func (a *App) AddSamlPublicCertificate(fileData *multipart.FileHeader) *model.AppError {
 	if err := WriteSamlFile(fileData); err != nil {
 		return err
 	}
 
-	cfg := &model.Config{}
-	*cfg = *utils.Cfg
-
+	cfg := a.Config().Clone()
 	*cfg.SamlSettings.PublicCertificateFile = fileData.Filename
 
 	if err := cfg.IsValid(); err != nil {
 		return err
 	}
 
-	utils.SaveConfig(utils.CfgFileName, cfg)
+	a.UpdateConfig(func(dest *model.Config) { *dest = *cfg })
+	utils.SaveConfig(a.ConfigFileName(), cfg)
 
 	return nil
 }
 
-func AddSamlPrivateCertificate(fileData *multipart.FileHeader) *model.AppError {
+func (a *App) AddSamlPrivateCertificate(fileData *multipart.FileHeader) *model.AppError {
 	if err := WriteSamlFile(fileData); err != nil {
 		return err
 	}
 
-	cfg := &model.Config{}
-	*cfg = *utils.Cfg
-
+	cfg := a.Config().Clone()
 	*cfg.SamlSettings.PrivateKeyFile = fileData.Filename
 
 	if err := cfg.IsValid(); err != nil {
 		return err
 	}
 
-	utils.SaveConfig(utils.CfgFileName, cfg)
+	a.UpdateConfig(func(dest *model.Config) { *dest = *cfg })
+	utils.SaveConfig(a.ConfigFileName(), cfg)
 
 	return nil
 }
 
-func AddSamlIdpCertificate(fileData *multipart.FileHeader) *model.AppError {
+func (a *App) AddSamlIdpCertificate(fileData *multipart.FileHeader) *model.AppError {
 	if err := WriteSamlFile(fileData); err != nil {
 		return err
 	}
 
-	cfg := &model.Config{}
-	*cfg = *utils.Cfg
-
+	cfg := a.Config().Clone()
 	*cfg.SamlSettings.IdpCertificateFile = fileData.Filename
 
 	if err := cfg.IsValid(); err != nil {
 		return err
 	}
 
-	utils.SaveConfig(utils.CfgFileName, cfg)
+	a.UpdateConfig(func(dest *model.Config) { *dest = *cfg })
+	utils.SaveConfig(a.ConfigFileName(), cfg)
 
 	return nil
 }
@@ -123,14 +120,12 @@ func RemoveSamlFile(filename string) *model.AppError {
 	return nil
 }
 
-func RemoveSamlPublicCertificate() *model.AppError {
-	if err := RemoveSamlFile(*utils.Cfg.SamlSettings.PublicCertificateFile); err != nil {
+func (a *App) RemoveSamlPublicCertificate() *model.AppError {
+	if err := RemoveSamlFile(*a.Config().SamlSettings.PublicCertificateFile); err != nil {
 		return err
 	}
 
-	cfg := &model.Config{}
-	*cfg = *utils.Cfg
-
+	cfg := a.Config().Clone()
 	*cfg.SamlSettings.PublicCertificateFile = ""
 	*cfg.SamlSettings.Encrypt = false
 
@@ -138,19 +133,18 @@ func RemoveSamlPublicCertificate() *model.AppError {
 		return err
 	}
 
-	utils.SaveConfig(utils.CfgFileName, cfg)
+	a.UpdateConfig(func(dest *model.Config) { *dest = *cfg })
+	utils.SaveConfig(a.ConfigFileName(), cfg)
 
 	return nil
 }
 
-func RemoveSamlPrivateCertificate() *model.AppError {
-	if err := RemoveSamlFile(*utils.Cfg.SamlSettings.PrivateKeyFile); err != nil {
+func (a *App) RemoveSamlPrivateCertificate() *model.AppError {
+	if err := RemoveSamlFile(*a.Config().SamlSettings.PrivateKeyFile); err != nil {
 		return err
 	}
 
-	cfg := &model.Config{}
-	*cfg = *utils.Cfg
-
+	cfg := a.Config().Clone()
 	*cfg.SamlSettings.PrivateKeyFile = ""
 	*cfg.SamlSettings.Encrypt = false
 
@@ -158,19 +152,18 @@ func RemoveSamlPrivateCertificate() *model.AppError {
 		return err
 	}
 
-	utils.SaveConfig(utils.CfgFileName, cfg)
+	a.UpdateConfig(func(dest *model.Config) { *dest = *cfg })
+	utils.SaveConfig(a.ConfigFileName(), cfg)
 
 	return nil
 }
 
-func RemoveSamlIdpCertificate() *model.AppError {
-	if err := RemoveSamlFile(*utils.Cfg.SamlSettings.IdpCertificateFile); err != nil {
+func (a *App) RemoveSamlIdpCertificate() *model.AppError {
+	if err := RemoveSamlFile(*a.Config().SamlSettings.IdpCertificateFile); err != nil {
 		return err
 	}
 
-	cfg := &model.Config{}
-	*cfg = *utils.Cfg
-
+	cfg := a.Config().Clone()
 	*cfg.SamlSettings.IdpCertificateFile = ""
 	*cfg.SamlSettings.Enable = false
 
@@ -178,17 +171,18 @@ func RemoveSamlIdpCertificate() *model.AppError {
 		return err
 	}
 
-	utils.SaveConfig(utils.CfgFileName, cfg)
+	a.UpdateConfig(func(dest *model.Config) { *dest = *cfg })
+	utils.SaveConfig(a.ConfigFileName(), cfg)
 
 	return nil
 }
 
-func GetSamlCertificateStatus() *model.SamlCertificateStatus {
+func (a *App) GetSamlCertificateStatus() *model.SamlCertificateStatus {
 	status := &model.SamlCertificateStatus{}
 
-	status.IdpCertificateFile = utils.FileExistsInConfigFolder(*utils.Cfg.SamlSettings.IdpCertificateFile)
-	status.PrivateKeyFile = utils.FileExistsInConfigFolder(*utils.Cfg.SamlSettings.PrivateKeyFile)
-	status.PublicCertificateFile = utils.FileExistsInConfigFolder(*utils.Cfg.SamlSettings.PublicCertificateFile)
+	status.IdpCertificateFile = utils.FileExistsInConfigFolder(*a.Config().SamlSettings.IdpCertificateFile)
+	status.PrivateKeyFile = utils.FileExistsInConfigFolder(*a.Config().SamlSettings.PrivateKeyFile)
+	status.PublicCertificateFile = utils.FileExistsInConfigFolder(*a.Config().SamlSettings.PublicCertificateFile)
 
 	return status
 }