diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/email.go | 34 | ||||
-rw-r--r-- | app/ldap.go | 4 | ||||
-rw-r--r-- | app/oauth.go | 4 | ||||
-rw-r--r-- | app/session.go | 4 | ||||
-rw-r--r-- | app/team.go | 2 | ||||
-rw-r--r-- | app/user.go | 10 | ||||
-rw-r--r-- | app/webrtc.go | 48 |
7 files changed, 53 insertions, 53 deletions
diff --git a/app/email.go b/app/email.go index a96c7005c..b676685e2 100644 --- a/app/email.go +++ b/app/email.go @@ -14,18 +14,18 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func SendChangeUsernameEmail(oldUsername, newUsername, email, locale, siteURL string) *model.AppError { +func (a *App) SendChangeUsernameEmail(oldUsername, newUsername, email, locale, siteURL string) *model.AppError { T := utils.GetUserTranslations(locale) subject := T("api.templates.username_change_subject", map[string]interface{}{"SiteName": utils.ClientCfg["SiteName"], - "TeamDisplayName": utils.Cfg.TeamSettings.SiteName}) + "TeamDisplayName": a.Config().TeamSettings.SiteName}) bodyPage := utils.NewHTMLTemplate("email_change_body", locale) bodyPage.Props["SiteURL"] = siteURL bodyPage.Props["Title"] = T("api.templates.username_change_body.title") bodyPage.Html["Info"] = utils.TranslateAsHtml(T, "api.templates.username_change_body.info", - map[string]interface{}{"TeamDisplayName": utils.Cfg.TeamSettings.SiteName, "NewUsername": newUsername}) + map[string]interface{}{"TeamDisplayName": a.Config().TeamSettings.SiteName, "NewUsername": newUsername}) if err := utils.SendMail(email, subject, bodyPage.Render()); err != nil { return model.NewAppError("SendChangeUsernameEmail", "api.user.send_email_change_username_and_forget.error", nil, err.Error(), http.StatusInternalServerError) @@ -34,20 +34,20 @@ func SendChangeUsernameEmail(oldUsername, newUsername, email, locale, siteURL st return nil } -func SendEmailChangeVerifyEmail(newUserEmail, locale, siteURL, token string) *model.AppError { +func (a *App) SendEmailChangeVerifyEmail(newUserEmail, locale, siteURL, token string) *model.AppError { T := utils.GetUserTranslations(locale) link := fmt.Sprintf("%s/do_verify_email?token=%s&email=%s", siteURL, token, url.QueryEscape(newUserEmail)) subject := T("api.templates.email_change_verify_subject", map[string]interface{}{"SiteName": utils.ClientCfg["SiteName"], - "TeamDisplayName": utils.Cfg.TeamSettings.SiteName}) + "TeamDisplayName": a.Config().TeamSettings.SiteName}) bodyPage := utils.NewHTMLTemplate("email_change_verify_body", locale) bodyPage.Props["SiteURL"] = siteURL bodyPage.Props["Title"] = T("api.templates.email_change_verify_body.title") bodyPage.Props["Info"] = T("api.templates.email_change_verify_body.info", - map[string]interface{}{"TeamDisplayName": utils.Cfg.TeamSettings.SiteName}) + map[string]interface{}{"TeamDisplayName": a.Config().TeamSettings.SiteName}) bodyPage.Props["VerifyUrl"] = link bodyPage.Props["VerifyButton"] = T("api.templates.email_change_verify_body.button") @@ -58,18 +58,18 @@ func SendEmailChangeVerifyEmail(newUserEmail, locale, siteURL, token string) *mo return nil } -func SendEmailChangeEmail(oldEmail, newEmail, locale, siteURL string) *model.AppError { +func (a *App) SendEmailChangeEmail(oldEmail, newEmail, locale, siteURL string) *model.AppError { T := utils.GetUserTranslations(locale) subject := T("api.templates.email_change_subject", map[string]interface{}{"SiteName": utils.ClientCfg["SiteName"], - "TeamDisplayName": utils.Cfg.TeamSettings.SiteName}) + "TeamDisplayName": a.Config().TeamSettings.SiteName}) bodyPage := utils.NewHTMLTemplate("email_change_body", locale) bodyPage.Props["SiteURL"] = siteURL bodyPage.Props["Title"] = T("api.templates.email_change_body.title") bodyPage.Html["Info"] = utils.TranslateAsHtml(T, "api.templates.email_change_body.info", - map[string]interface{}{"TeamDisplayName": utils.Cfg.TeamSettings.SiteName, "NewEmail": newEmail}) + map[string]interface{}{"TeamDisplayName": a.Config().TeamSettings.SiteName, "NewEmail": newEmail}) if err := utils.SendMail(oldEmail, subject, bodyPage.Render()); err != nil { return model.NewAppError("SendEmailChangeEmail", "api.user.send_email_change_email_and_forget.error", nil, err.Error(), http.StatusInternalServerError) @@ -78,7 +78,7 @@ func SendEmailChangeEmail(oldEmail, newEmail, locale, siteURL string) *model.App return nil } -func SendVerifyEmail(userEmail, locale, siteURL, token string) *model.AppError { +func (a *App) SendVerifyEmail(userEmail, locale, siteURL, token string) *model.AppError { T := utils.GetUserTranslations(locale) link := fmt.Sprintf("%s/do_verify_email?token=%s&email=%s", siteURL, token, url.QueryEscape(userEmail)) @@ -102,7 +102,7 @@ func SendVerifyEmail(userEmail, locale, siteURL, token string) *model.AppError { return nil } -func SendSignInChangeEmail(email, method, locale, siteURL string) *model.AppError { +func (a *App) SendSignInChangeEmail(email, method, locale, siteURL string) *model.AppError { T := utils.GetUserTranslations(locale) subject := T("api.templates.signin_change_email.subject", @@ -160,18 +160,18 @@ func (a *App) SendWelcomeEmail(userId string, email string, verified bool, local return nil } -func SendPasswordChangeEmail(email, method, locale, siteURL string) *model.AppError { +func (a *App) SendPasswordChangeEmail(email, method, locale, siteURL string) *model.AppError { T := utils.GetUserTranslations(locale) subject := T("api.templates.password_change_subject", map[string]interface{}{"SiteName": utils.ClientCfg["SiteName"], - "TeamDisplayName": utils.Cfg.TeamSettings.SiteName}) + "TeamDisplayName": a.Config().TeamSettings.SiteName}) bodyPage := utils.NewHTMLTemplate("password_change_body", locale) bodyPage.Props["SiteURL"] = siteURL bodyPage.Props["Title"] = T("api.templates.password_change_body.title") bodyPage.Html["Info"] = utils.TranslateAsHtml(T, "api.templates.password_change_body.info", - map[string]interface{}{"TeamDisplayName": utils.Cfg.TeamSettings.SiteName, "TeamURL": siteURL, "Method": method}) + map[string]interface{}{"TeamDisplayName": a.Config().TeamSettings.SiteName, "TeamURL": siteURL, "Method": method}) if err := utils.SendMail(email, subject, bodyPage.Render()); err != nil { return model.NewAppError("SendPasswordChangeEmail", "api.user.send_password_change_email_and_forget.error", nil, err.Error(), http.StatusInternalServerError) @@ -248,7 +248,7 @@ func SendMfaChangeEmail(email string, activated bool, locale, siteURL string) *m return nil } -func SendInviteEmails(team *model.Team, senderName string, invites []string, siteURL string) { +func (a *App) SendInviteEmails(team *model.Team, senderName string, invites []string, siteURL string) { for _, invite := range invites { if len(invite) > 0 { senderRole := utils.T("api.team.invite_members.member") @@ -275,10 +275,10 @@ func SendInviteEmails(team *model.Team, senderName string, invites []string, sit props["name"] = team.Name props["time"] = fmt.Sprintf("%v", model.GetMillis()) data := model.MapToJson(props) - hash := utils.HashSha256(fmt.Sprintf("%v:%v", data, utils.Cfg.EmailSettings.InviteSalt)) + hash := utils.HashSha256(fmt.Sprintf("%v:%v", data, a.Config().EmailSettings.InviteSalt)) bodyPage.Props["Link"] = fmt.Sprintf("%s/signup_user_complete/?d=%s&h=%s", siteURL, url.QueryEscape(data), url.QueryEscape(hash)) - if !utils.Cfg.EmailSettings.SendEmailNotifications { + if !a.Config().EmailSettings.SendEmailNotifications { l4g.Info(utils.T("api.team.invite_members.sending.info"), invite, bodyPage.Props["Link"]) } diff --git a/app/ldap.go b/app/ldap.go index f1d46f824..bb49349de 100644 --- a/app/ldap.go +++ b/app/ldap.go @@ -61,7 +61,7 @@ func (a *App) SwitchEmailToLdap(email, password, code, ldapId, ldapPassword stri } a.Go(func() { - if err := SendSignInChangeEmail(user.Email, "AD/LDAP", user.Locale, utils.GetSiteURL()); err != nil { + if err := a.SendSignInChangeEmail(user.Email, "AD/LDAP", user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }) @@ -103,7 +103,7 @@ func (a *App) SwitchLdapToEmail(ldapPassword, code, email, newPassword string) ( T := utils.GetUserTranslations(user.Locale) a.Go(func() { - if err := SendSignInChangeEmail(user.Email, T("api.templates.signin_change_email.body.method_email"), user.Locale, utils.GetSiteURL()); err != nil { + if err := a.SendSignInChangeEmail(user.Email, T("api.templates.signin_change_email.body.method_email"), user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }) diff --git a/app/oauth.go b/app/oauth.go index 83e9390c5..f3ecdac54 100644 --- a/app/oauth.go +++ b/app/oauth.go @@ -527,7 +527,7 @@ func (a *App) CompleteSwitchWithOAuth(service string, userData io.ReadCloser, em } a.Go(func() { - if err := SendSignInChangeEmail(user.Email, strings.Title(service)+" SSO", user.Locale, utils.GetSiteURL()); err != nil { + if err := a.SendSignInChangeEmail(user.Email, strings.Title(service)+" SSO", user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }) @@ -760,7 +760,7 @@ func (a *App) SwitchOAuthToEmail(email, password, requesterId string) (string, * T := utils.GetUserTranslations(user.Locale) a.Go(func() { - if err := SendSignInChangeEmail(user.Email, T("api.templates.signin_change_email.body.method_email"), user.Locale, utils.GetSiteURL()); err != nil { + if err := a.SendSignInChangeEmail(user.Email, T("api.templates.signin_change_email.body.method_email"), user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }) diff --git a/app/session.go b/app/session.go index 7492a7c37..31f658e2f 100644 --- a/app/session.go +++ b/app/session.go @@ -109,7 +109,7 @@ func (a *App) RevokeAllSessions(userId string) *model.AppError { } } - RevokeWebrtcToken(session.Id) + a.RevokeWebrtcToken(session.Id) } } @@ -202,7 +202,7 @@ func (a *App) RevokeSession(session *model.Session) *model.AppError { } } - RevokeWebrtcToken(session.Id) + a.RevokeWebrtcToken(session.Id) a.ClearSessionCacheForUser(session.UserId) return nil diff --git a/app/team.go b/app/team.go index db3d9bb7a..303fa9129 100644 --- a/app/team.go +++ b/app/team.go @@ -675,7 +675,7 @@ func (a *App) InviteNewUsersToTeam(emailList []string, teamId, senderId string) } nameFormat := *a.Config().TeamSettings.TeammateNameDisplay - SendInviteEmails(team, user.GetDisplayName(nameFormat), emailList, utils.GetSiteURL()) + a.SendInviteEmails(team, user.GetDisplayName(nameFormat), emailList, utils.GetSiteURL()) return nil } diff --git a/app/user.go b/app/user.go index f27e4e06f..a38c61554 100644 --- a/app/user.go +++ b/app/user.go @@ -996,7 +996,7 @@ func (a *App) UpdateUser(user *model.User, sendNotifications bool) (*model.User, if sendNotifications { if rusers[0].Email != rusers[1].Email { a.Go(func() { - if err := SendEmailChangeEmail(rusers[1].Email, rusers[0].Email, rusers[0].Locale, utils.GetSiteURL()); err != nil { + if err := a.SendEmailChangeEmail(rusers[1].Email, rusers[0].Email, rusers[0].Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }) @@ -1010,7 +1010,7 @@ func (a *App) UpdateUser(user *model.User, sendNotifications bool) (*model.User, if rusers[0].Username != rusers[1].Username { a.Go(func() { - if err := SendChangeUsernameEmail(rusers[1].Username, rusers[0].Username, rusers[0].Email, rusers[0].Locale, utils.GetSiteURL()); err != nil { + if err := a.SendChangeUsernameEmail(rusers[1].Username, rusers[0].Username, rusers[0].Email, rusers[0].Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }) @@ -1098,7 +1098,7 @@ func (a *App) UpdatePasswordSendEmail(user *model.User, newPassword, method stri } a.Go(func() { - if err := SendPasswordChangeEmail(user.Email, method, user.Locale, utils.GetSiteURL()); err != nil { + if err := a.SendPasswordChangeEmail(user.Email, method, user.Locale, utils.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }) @@ -1304,9 +1304,9 @@ func (a *App) SendEmailVerification(user *model.User) *model.AppError { } if _, err := a.GetStatus(user.Id); err != nil { - return SendVerifyEmail(user.Email, user.Locale, utils.GetSiteURL(), token.Token) + return a.SendVerifyEmail(user.Email, user.Locale, utils.GetSiteURL(), token.Token) } else { - return SendEmailChangeVerifyEmail(user.Email, user.Locale, utils.GetSiteURL(), token.Token) + return a.SendEmailChangeVerifyEmail(user.Email, user.Locale, utils.GetSiteURL(), token.Token) } } diff --git a/app/webrtc.go b/app/webrtc.go index d8684f1fd..28c754622 100644 --- a/app/webrtc.go +++ b/app/webrtc.go @@ -16,58 +16,58 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func GetWebrtcInfoForSession(sessionId string) (*model.WebrtcInfoResponse, *model.AppError) { - token, err := GetWebrtcToken(sessionId) +func (a *App) GetWebrtcInfoForSession(sessionId string) (*model.WebrtcInfoResponse, *model.AppError) { + token, err := a.GetWebrtcToken(sessionId) if err != nil { return nil, err } result := &model.WebrtcInfoResponse{ Token: token, - GatewayUrl: *utils.Cfg.WebrtcSettings.GatewayWebsocketUrl, - GatewayType: *utils.Cfg.WebrtcSettings.GatewayType, + GatewayUrl: *a.Config().WebrtcSettings.GatewayWebsocketUrl, + GatewayType: *a.Config().WebrtcSettings.GatewayType, } - if len(*utils.Cfg.WebrtcSettings.StunURI) > 0 { - result.StunUri = *utils.Cfg.WebrtcSettings.StunURI + if len(*a.Config().WebrtcSettings.StunURI) > 0 { + result.StunUri = *a.Config().WebrtcSettings.StunURI } - if len(*utils.Cfg.WebrtcSettings.TurnURI) > 0 { + if len(*a.Config().WebrtcSettings.TurnURI) > 0 { timestamp := strconv.FormatInt(utils.EndOfDay(time.Now().AddDate(0, 0, 1)).Unix(), 10) - username := timestamp + ":" + *utils.Cfg.WebrtcSettings.TurnUsername + username := timestamp + ":" + *a.Config().WebrtcSettings.TurnUsername - result.TurnUri = *utils.Cfg.WebrtcSettings.TurnURI - result.TurnPassword = GenerateTurnPassword(username, *utils.Cfg.WebrtcSettings.TurnSharedKey) + result.TurnUri = *a.Config().WebrtcSettings.TurnURI + result.TurnPassword = GenerateTurnPassword(username, *a.Config().WebrtcSettings.TurnSharedKey) result.TurnUsername = username } return result, nil } -func GetWebrtcToken(sessionId string) (string, *model.AppError) { - if !*utils.Cfg.WebrtcSettings.Enable { +func (a *App) GetWebrtcToken(sessionId string) (string, *model.AppError) { + if !*a.Config().WebrtcSettings.Enable { return "", model.NewAppError("WebRTC.getWebrtcToken", "api.webrtc.disabled.app_error", nil, "", http.StatusNotImplemented) } - switch strings.ToLower(*utils.Cfg.WebrtcSettings.GatewayType) { + switch strings.ToLower(*a.Config().WebrtcSettings.GatewayType) { case "kopano-webmeetings": - return GetKopanoWebmeetingsWebrtcToken(sessionId) + return a.GetKopanoWebmeetingsWebrtcToken(sessionId) default: // Default to Janus. - return GetJanusWebrtcToken(sessionId) + return a.GetJanusWebrtcToken(sessionId) } } -func GetJanusWebrtcToken(sessionId string) (string, *model.AppError) { +func (a *App) GetJanusWebrtcToken(sessionId string) (string, *model.AppError) { token := base64.StdEncoding.EncodeToString([]byte(sessionId)) data := make(map[string]string) data["janus"] = "add_token" data["token"] = token data["transaction"] = model.NewId() - data["admin_secret"] = *utils.Cfg.WebrtcSettings.GatewayAdminSecret + data["admin_secret"] = *a.Config().WebrtcSettings.GatewayAdminSecret - rq, _ := http.NewRequest("POST", *utils.Cfg.WebrtcSettings.GatewayAdminUrl, strings.NewReader(model.MapToJson(data))) + rq, _ := http.NewRequest("POST", *a.Config().WebrtcSettings.GatewayAdminUrl, strings.NewReader(model.MapToJson(data))) rq.Header.Set("Content-Type", "application/json") if rp, err := utils.HttpClient(true).Do(rq); err != nil { @@ -85,14 +85,14 @@ func GetJanusWebrtcToken(sessionId string) (string, *model.AppError) { return token, nil } -func GetKopanoWebmeetingsWebrtcToken(sessionId string) (string, *model.AppError) { +func (a *App) GetKopanoWebmeetingsWebrtcToken(sessionId string) (string, *model.AppError) { data := make(map[string]string) data["type"] = "Token" data["id"] = sessionId - rq, _ := http.NewRequest("POST", *utils.Cfg.WebrtcSettings.GatewayAdminUrl+"/auth/tokens", strings.NewReader(model.MapToJson(data))) + rq, _ := http.NewRequest("POST", *a.Config().WebrtcSettings.GatewayAdminUrl+"/auth/tokens", strings.NewReader(model.MapToJson(data))) rq.Header.Set("Content-Type", "application/json") - rq.Header.Set("Authorization", "Bearer "+*utils.Cfg.WebrtcSettings.GatewayAdminSecret) + rq.Header.Set("Authorization", "Bearer "+*a.Config().WebrtcSettings.GatewayAdminSecret) if rp, err := utils.HttpClient(true).Do(rq); err != nil { return "", model.NewAppError("WebRTC.Token", "model.client.connecting.app_error", nil, err.Error(), http.StatusInternalServerError) @@ -115,15 +115,15 @@ func GenerateTurnPassword(username string, secret string) string { return base64.StdEncoding.EncodeToString(h.Sum(nil)) } -func RevokeWebrtcToken(sessionId string) { +func (a *App) RevokeWebrtcToken(sessionId string) { token := base64.StdEncoding.EncodeToString([]byte(sessionId)) data := make(map[string]string) data["janus"] = "remove_token" data["token"] = token data["transaction"] = model.NewId() - data["admin_secret"] = *utils.Cfg.WebrtcSettings.GatewayAdminSecret + data["admin_secret"] = *a.Config().WebrtcSettings.GatewayAdminSecret - rq, _ := http.NewRequest("POST", *utils.Cfg.WebrtcSettings.GatewayAdminUrl, strings.NewReader(model.MapToJson(data))) + rq, _ := http.NewRequest("POST", *a.Config().WebrtcSettings.GatewayAdminUrl, strings.NewReader(model.MapToJson(data))) rq.Header.Set("Content-Type", "application/json") // we do not care about the response |