diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-21 15:11:56 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-21 15:11:56 -0700 |
commit | ed9a2da83b3b77e7dd0314eaa92082ac8a2a9a9c (patch) | |
tree | 3c890327d884b33ad149196ddf9879313b2b000b /utils/config.go | |
parent | ee5a77ec56ee13f5eb96fce6065b4b7a1845de89 (diff) | |
download | chat-ed9a2da83b3b77e7dd0314eaa92082ac8a2a9a9c.tar.gz chat-ed9a2da83b3b77e7dd0314eaa92082ac8a2a9a9c.tar.bz2 chat-ed9a2da83b3b77e7dd0314eaa92082ac8a2a9a9c.zip |
Adding email to admin console
Diffstat (limited to 'utils/config.go')
-rw-r--r-- | utils/config.go | 29 |
1 files changed, 10 insertions, 19 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 |