Adding email to admin console

2 files changed, 34 insertions, 55 deletions

diff --git a/utils/config.go b/utils/config.go
index dd2c17977..f3e93ef11 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -176,18 +176,24 @@ func getClientProperties(c *model.Config) map[string]string {
 	props["BuildHash"] = model.BuildHash
 
 	props["SiteName"] = c.ServiceSettings.SiteName
-	props["ByPassEmail"] = strconv.FormatBool(c.EmailSettings.ByPassEmail)
+	props["AnalyticsUrl"] = c.ServiceSettings.AnalyticsUrl
+	props["EnableOAuthServiceProvider"] = strconv.FormatBool(c.ServiceSettings.EnableOAuthServiceProvider)
+
+	props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications)
+	props["AllowSignUpWithEmail"] = strconv.FormatBool(c.EmailSettings.AllowSignUpWithEmail)
 	props["FeedbackEmail"] = c.EmailSettings.FeedbackEmail
+
+	props["AllowSignUpWithGitLab"] = strconv.FormatBool(false)
+
 	props["ShowEmailAddress"] = strconv.FormatBool(c.PrivacySettings.ShowEmailAddress)
 	props["AllowPublicLink"] = strconv.FormatBool(c.TeamSettings.AllowPublicLink)
+
 	props["SegmentDeveloperKey"] = c.ClientSettings.SegmentDeveloperKey
 	props["GoogleDeveloperKey"] = c.ClientSettings.GoogleDeveloperKey
-	props["AnalyticsUrl"] = c.ServiceSettings.AnalyticsUrl
-	props["ByPassEmail"] = strconv.FormatBool(c.EmailSettings.ByPassEmail)
+
 	props["ProfileHeight"] = fmt.Sprintf("%v", c.ImageSettings.ProfileHeight)
 	props["ProfileWidth"] = fmt.Sprintf("%v", c.ImageSettings.ProfileWidth)
 	props["ProfileWidth"] = fmt.Sprintf("%v", c.ImageSettings.ProfileWidth)
-	props["EnableOAuthServiceProvider"] = strconv.FormatBool(c.ServiceSettings.EnableOAuthServiceProvider)
 
 	return props
 }
@@ -200,21 +206,6 @@ func IsS3Configured() bool {
 	return true
 }
 
-func GetAllowedAuthServices() []string {
-	authServices := []string{}
-	for name, service := range Cfg.SSOSettings {
-		if service.Allow {
-			authServices = append(authServices, name)
-		}
-	}
-
-	if !Cfg.ServiceSettings.DisableEmailSignUp {
-		authServices = append(authServices, "email")
-	}
-
-	return authServices
-}
-
 func IsServiceAllowed(s string) bool {
 	if len(s) == 0 {
 		return false
diff --git a/utils/mail.go b/utils/mail.go
index 7cb178626..9d3db9640 100644
--- a/utils/mail.go
+++ b/utils/mail.go
@@ -15,43 +15,28 @@ import (
 	"time"
 )
 
-func CheckMailSettings() *model.AppError {
-	if len(Cfg.EmailSettings.SMTPServer) == 0 || Cfg.EmailSettings.ByPassEmail {
-		return model.NewAppError("CheckMailSettings", "No email settings present, mail will not be sent", "")
-	}
-	conn, err := connectToSMTPServer()
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-	c, err2 := newSMTPClient(conn)
-	if err2 != nil {
-		return err
-	}
-	defer c.Quit()
-	defer c.Close()
-
-	return nil
-}
-
-func connectToSMTPServer() (net.Conn, *model.AppError) {
-	host, _, _ := net.SplitHostPort(Cfg.EmailSettings.SMTPServer)
+const (
+	CONN_SECURITY_NONE     = ""
+	CONN_SECURITY_TLS      = "TLS"
+	CONN_SECURITY_STARTTLS = "STARTTLS"
+)
 
+func connectToSMTPServer(config *model.Config) (net.Conn, *model.AppError) {
 	var conn net.Conn
 	var err error
 
-	if Cfg.EmailSettings.UseTLS {
+	if config.EmailSettings.ConnectionSecurity == CONN_SECURITY_TLS {
 		tlsconfig := &tls.Config{
 			InsecureSkipVerify: true,
-			ServerName:         host,
+			ServerName:         config.EmailSettings.SMTPServer,
 		}
 
-		conn, err = tls.Dial("tcp", Cfg.EmailSettings.SMTPServer, tlsconfig)
+		conn, err = tls.Dial("tcp", config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort, tlsconfig)
 		if err != nil {
 			return nil, model.NewAppError("SendMail", "Failed to open TLS connection", err.Error())
 		}
 	} else {
-		conn, err = net.Dial("tcp", Cfg.EmailSettings.SMTPServer)
+		conn, err = net.Dial("tcp", config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort)
 		if err != nil {
 			return nil, model.NewAppError("SendMail", "Failed to open connection", err.Error())
 		}
@@ -60,24 +45,23 @@ func connectToSMTPServer() (net.Conn, *model.AppError) {
 	return conn, nil
 }
 
-func newSMTPClient(conn net.Conn) (*smtp.Client, *model.AppError) {
-	host, _, _ := net.SplitHostPort(Cfg.EmailSettings.SMTPServer)
-	c, err := smtp.NewClient(conn, host)
+func newSMTPClient(conn net.Conn, config *model.Config) (*smtp.Client, *model.AppError) {
+	c, err := smtp.NewClient(conn, config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort)
 	if err != nil {
 		l4g.Error("Failed to open a connection to SMTP server %v", err)
 		return nil, model.NewAppError("SendMail", "Failed to open TLS connection", err.Error())
 	}
 	// GO does not support plain auth over a non encrypted connection.
 	// so if not tls then no auth
-	auth := smtp.PlainAuth("", Cfg.EmailSettings.SMTPUsername, Cfg.EmailSettings.SMTPPassword, host)
-	if Cfg.EmailSettings.UseTLS {
+	auth := smtp.PlainAuth("", config.EmailSettings.SMTPUsername, config.EmailSettings.SMTPPassword, config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort)
+	if config.EmailSettings.ConnectionSecurity == CONN_SECURITY_TLS {
 		if err = c.Auth(auth); err != nil {
 			return nil, model.NewAppError("SendMail", "Failed to authenticate on SMTP server", err.Error())
 		}
-	} else if Cfg.EmailSettings.UseStartTLS {
+	} else if config.EmailSettings.ConnectionSecurity == CONN_SECURITY_TLS {
 		tlsconfig := &tls.Config{
 			InsecureSkipVerify: true,
-			ServerName:         host,
+			ServerName:         config.EmailSettings.SMTPServer,
 		}
 		c.StartTLS(tlsconfig)
 		if err = c.Auth(auth); err != nil {
@@ -88,12 +72,16 @@ func newSMTPClient(conn net.Conn) (*smtp.Client, *model.AppError) {
 }
 
 func SendMail(to, subject, body string) *model.AppError {
+	return SendMailUsingConfig(to, subject, body, Cfg)
+}
+
+func SendMailUsingConfig(to, subject, body string, config *model.Config) *model.AppError {
 
-	if len(Cfg.EmailSettings.SMTPServer) == 0 || Cfg.EmailSettings.ByPassEmail {
+	if !config.EmailSettings.SendEmailNotifications {
 		return nil
 	}
 
-	fromMail := mail.Address{Cfg.EmailSettings.FeedbackName, Cfg.EmailSettings.FeedbackEmail}
+	fromMail := mail.Address{config.EmailSettings.FeedbackName, config.EmailSettings.FeedbackEmail}
 	toMail := mail.Address{"", to}
 
 	headers := make(map[string]string)
@@ -110,13 +98,13 @@ func SendMail(to, subject, body string) *model.AppError {
 	}
 	message += "\r\n<html><body>" + body + "</body></html>"
 
-	conn, err1 := connectToSMTPServer()
+	conn, err1 := connectToSMTPServer(config)
 	if err1 != nil {
 		return err1
 	}
 	defer conn.Close()
 
-	c, err2 := newSMTPClient(conn)
+	c, err2 := newSMTPClient(conn, config)
 	if err2 != nil {
 		return err2
 	}