From 5b2ec623473abeb44577fbfc9122b792a94a5184 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 20 Jan 2016 08:33:26 -0600 Subject: PLT-7 adding loc db calls for team table --- api/context.go | 2 +- api/export.go | 20 +++++++++++--------- api/post.go | 2 +- api/team.go | 28 ++++++++++++++-------------- api/user.go | 24 ++++++++++++------------ 5 files changed, 39 insertions(+), 37 deletions(-) (limited to 'api') diff --git a/api/context.go b/api/context.go index fdca52085..13f0f2c42 100644 --- a/api/context.go +++ b/api/context.go @@ -387,7 +387,7 @@ func (c *Context) setTeamURL(url string, valid bool) { } func (c *Context) SetTeamURLFromSession() { - if result := <-Srv.Store.Team().Get(c.Session.TeamId); result.Err == nil { + if result := <-Srv.Store.Team().Get(c.T, c.Session.TeamId); result.Err == nil { c.setTeamURL(c.GetSiteURL()+"/"+result.Data.(*model.Team).Name, true) } } diff --git a/api/export.go b/api/export.go index fa9686005..160da8d9f 100644 --- a/api/export.go +++ b/api/export.go @@ -6,10 +6,12 @@ package api import ( "archive/zip" "encoding/json" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" "io" "os" + + "github.com/mattermost/platform/model" + "github.com/mattermost/platform/utils" + goi18n "github.com/nicksnyder/go-i18n/i18n" ) const ( @@ -51,19 +53,19 @@ func ExportOptionsFromJson(data io.Reader) *ExportOptions { return &o } -func ExportToFile(options *ExportOptions) (link string, err *model.AppError) { +func ExportToFile(T goi18n.TranslateFunc, options *ExportOptions) (link string, err *model.AppError) { // Open file for export if file, err := openFileWriteStream(EXPORT_PATH + EXPORT_FILENAME); err != nil { return "", err } else { defer closeFileWriteStream(file) - ExportToWriter(file, options) + ExportToWriter(T, file, options) } return "/api/v1/files/get_export", nil } -func ExportToWriter(w io.Writer, options *ExportOptions) *model.AppError { +func ExportToWriter(T goi18n.TranslateFunc, w io.Writer, options *ExportOptions) *model.AppError { // Open a writer to write to zip file zipWriter := zip.NewWriter(w) defer zipWriter.Close() @@ -78,23 +80,23 @@ func ExportToWriter(w io.Writer, options *ExportOptions) *model.AppError { } // Export Teams - ExportTeams(zipWriter, options) + ExportTeams(T, zipWriter, options) return nil } -func ExportTeams(writer ExportWriter, options *ExportOptions) *model.AppError { +func ExportTeams(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOptions) *model.AppError { // Get the teams var teams []*model.Team if len(options.TeamsToExport) == 0 { - if result := <-Srv.Store.Team().GetAll(); result.Err != nil { + if result := <-Srv.Store.Team().GetAll(T); result.Err != nil { return result.Err } else { teams = result.Data.([]*model.Team) } } else { for _, teamId := range options.TeamsToExport { - if result := <-Srv.Store.Team().Get(teamId); result.Err != nil { + if result := <-Srv.Store.Team().Get(T, teamId); result.Err != nil { return result.Err } else { team := result.Data.(*model.Team) diff --git a/api/post.go b/api/post.go index a662cc147..87678e9c6 100644 --- a/api/post.go +++ b/api/post.go @@ -205,7 +205,7 @@ func CreateWebhookPost(c *Context, channelId, text, overrideUsername, overrideIc func handlePostEventsAndForget(c *Context, post *model.Post, triggerWebhooks bool) { go func() { - tchan := Srv.Store.Team().Get(c.Session.TeamId) + tchan := Srv.Store.Team().Get(c.T, c.Session.TeamId) cchan := Srv.Store.Channel().Get(post.ChannelId) uchan := Srv.Store.User().Get(post.UserId) diff --git a/api/team.go b/api/team.go index e94e60326..7ee7b41c9 100644 --- a/api/team.go +++ b/api/team.go @@ -128,7 +128,7 @@ func createTeamFromSSO(c *Context, w http.ResponseWriter, r *http.Request) { } } - if result := <-Srv.Store.Team().Save(team); result.Err != nil { + if result := <-Srv.Store.Team().Save(c.T, team); result.Err != nil { c.Err = result.Err return } else { @@ -209,7 +209,7 @@ func createTeamFromSignup(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.Team().Save(&teamSignup.Team); result.Err != nil { + if result := <-Srv.Store.Team().Save(c.T, &teamSignup.Team); result.Err != nil { c.Err = result.Err return } else { @@ -264,7 +264,7 @@ func CreateTeam(c *Context, team *model.Team) *model.Team { return nil } - if result := <-Srv.Store.Team().Save(team); result.Err != nil { + if result := <-Srv.Store.Team().Save(c.T, team); result.Err != nil { c.Err = result.Err return nil } else { @@ -313,7 +313,7 @@ func getAll(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.Team().GetAll(); result.Err != nil { + if result := <-Srv.Store.Team().GetAll(c.T); result.Err != nil { c.Err = result.Err return } else { @@ -382,7 +382,7 @@ func FindTeamByName(c *Context, name string, all string) bool { return false } - if result := <-Srv.Store.Team().GetByName(name); result.Err != nil { + if result := <-Srv.Store.Team().GetByName(c.T, name); result.Err != nil { return false } else { return true @@ -402,7 +402,7 @@ func findTeams(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.Team().GetTeamsForEmail(email); result.Err != nil { + if result := <-Srv.Store.Team().GetTeamsForEmail(c.T, email); result.Err != nil { c.Err = result.Err return } else { @@ -433,7 +433,7 @@ func emailTeams(c *Context, w http.ResponseWriter, r *http.Request) { bodyPage := NewServerTemplatePage("find_teams_body") bodyPage.ClientCfg["SiteURL"] = c.GetSiteURL() - if result := <-Srv.Store.Team().GetTeamsForEmail(email); result.Err != nil { + if result := <-Srv.Store.Team().GetTeamsForEmail(c.T, email); result.Err != nil { c.Err = result.Err } else { teams := result.Data.([]*model.Team) @@ -461,7 +461,7 @@ func inviteMembers(c *Context, w http.ResponseWriter, r *http.Request) { return } - tchan := Srv.Store.Team().Get(c.Session.TeamId) + tchan := Srv.Store.Team().Get(c.T, c.Session.TeamId) uchan := Srv.Store.User().Get(c.Session.UserId) var team *model.Team @@ -561,7 +561,7 @@ func updateTeam(c *Context, w http.ResponseWriter, r *http.Request) { } var oldTeam *model.Team - if result := <-Srv.Store.Team().Get(team.Id); result.Err != nil { + if result := <-Srv.Store.Team().Get(c.T, team.Id); result.Err != nil { c.Err = result.Err return } else { @@ -576,7 +576,7 @@ func updateTeam(c *Context, w http.ResponseWriter, r *http.Request) { oldTeam.AllowedDomains = team.AllowedDomains //oldTeam.Type = team.Type - if result := <-Srv.Store.Team().Update(oldTeam); result.Err != nil { + if result := <-Srv.Store.Team().Update(c.T, oldTeam); result.Err != nil { c.Err = result.Err return } @@ -592,7 +592,7 @@ func PermanentDeleteTeam(c *Context, team *model.Team) *model.AppError { c.LogAuditWithUserId("", fmt.Sprintf("attempt teamId=%v", team.Id)) team.DeleteAt = model.GetMillis() - if result := <-Srv.Store.Team().Update(team); result.Err != nil { + if result := <-Srv.Store.Team().Update(c.T, team); result.Err != nil { return result.Err } @@ -609,7 +609,7 @@ func PermanentDeleteTeam(c *Context, team *model.Team) *model.AppError { return result.Err } - if result := <-Srv.Store.Team().PermanentDelete(team.Id); result.Err != nil { + if result := <-Srv.Store.Team().PermanentDelete(c.T, team.Id); result.Err != nil { return result.Err } @@ -625,7 +625,7 @@ func getMyTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.Team().Get(c.Session.TeamId); result.Err != nil { + if result := <-Srv.Store.Team().Get(c.T, c.Session.TeamId); result.Err != nil { c.Err = result.Err return } else if HandleEtag(result.Data.(*model.Team).Etag(), w, r) { @@ -714,7 +714,7 @@ func exportTeam(c *Context, w http.ResponseWriter, r *http.Request) { options := ExportOptionsFromJson(r.Body) - if link, err := ExportToFile(options); err != nil { + if link, err := ExportToFile(c.T, options); err != nil { c.Err = err return } else { diff --git a/api/user.go b/api/user.go index c8c6a6fb9..001caae6c 100644 --- a/api/user.go +++ b/api/user.go @@ -84,7 +84,7 @@ func createUser(c *Context, w http.ResponseWriter, r *http.Request) { var team *model.Team - if result := <-Srv.Store.Team().Get(user.TeamId); result.Err != nil { + if result := <-Srv.Store.Team().Get(c.T, user.TeamId); result.Err != nil { c.Err = result.Err return } else { @@ -264,7 +264,7 @@ func CreateOAuthUser(c *Context, w http.ResponseWriter, r *http.Request, service if team.Email == "" { team.Email = user.Email - if result := <-Srv.Store.Team().Update(team); result.Err != nil { + if result := <-Srv.Store.Team().Update(c.T, team); result.Err != nil { c.Err = result.Err return nil } @@ -404,7 +404,7 @@ func LoginById(c *Context, w http.ResponseWriter, r *http.Request, userId, passw func LoginByEmail(c *Context, w http.ResponseWriter, r *http.Request, email, name, password, deviceId string) *model.User { var team *model.Team - if result := <-Srv.Store.Team().GetByName(name); result.Err != nil { + if result := <-Srv.Store.Team().GetByName(c.T, name); result.Err != nil { c.Err = result.Err return nil } else { @@ -659,7 +659,7 @@ func loginLdap(c *Context, w http.ResponseWriter, r *http.Request) { return } - teamc := Srv.Store.Team().GetByName(teamName) + teamc := Srv.Store.Team().GetByName(c.T, teamName) ldapInterface := einterfaces.GetLdapInterface() if ldapInterface == nil { @@ -1134,7 +1134,7 @@ func updateUser(c *Context, w http.ResponseWriter, r *http.Request) { rusers := result.Data.([2]*model.User) if rusers[0].Email != rusers[1].Email { - if tresult := <-Srv.Store.Team().Get(rusers[1].TeamId); tresult.Err != nil { + if tresult := <-Srv.Store.Team().Get(c.T, rusers[1].TeamId); tresult.Err != nil { l4g.Error(tresult.Err.Message) } else { team := tresult.Data.(*model.Team) @@ -1195,7 +1195,7 @@ func updatePassword(c *Context, w http.ResponseWriter, r *http.Request) { user := result.Data.(*model.User) - tchan := Srv.Store.Team().Get(user.TeamId) + tchan := Srv.Store.Team().Get(c.T, user.TeamId) if user.AuthData != "" { c.LogAudit("failed - tried to update user password who was logged in through oauth") @@ -1494,7 +1494,7 @@ func sendPasswordReset(c *Context, w http.ResponseWriter, r *http.Request) { } var team *model.Team - if result := <-Srv.Store.Team().GetByName(name); result.Err != nil { + if result := <-Srv.Store.Team().GetByName(c.T, name); result.Err != nil { c.Err = result.Err return } else { @@ -1583,7 +1583,7 @@ func resetPassword(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAuditWithUserId(userId, "attempt") var team *model.Team - if result := <-Srv.Store.Team().GetByName(name); result.Err != nil { + if result := <-Srv.Store.Team().GetByName(c.T, name); result.Err != nil { c.Err = result.Err return } else { @@ -1822,7 +1822,7 @@ func GetAuthorizationCode(c *Context, service, teamName string, props map[string return authUrl, nil } -func AuthorizeOAuthUser(service, code, state, redirectUri string) (io.ReadCloser, *model.Team, map[string]string, *model.AppError) { +func AuthorizeOAuthUser(T goi18n.TranslateFunc, service, code, state, redirectUri string) (io.ReadCloser, *model.Team, map[string]string, *model.AppError) { sso := utils.Cfg.GetSSOService(service) if sso == nil || !sso.Enable { return nil, nil, nil, model.NewAppError("AuthorizeOAuthUser", "Unsupported OAuth service provider", "service="+service) @@ -1847,7 +1847,7 @@ func AuthorizeOAuthUser(service, code, state, redirectUri string) (io.ReadCloser return nil, nil, nil, model.NewAppError("AuthorizeOAuthUser", "Invalid state; missing team name", "") } - tchan := Srv.Store.Team().GetByName(teamName) + tchan := Srv.Store.Team().GetByName(T, teamName) p := url.Values{} p.Set("client_id", sso.Id) @@ -1945,7 +1945,7 @@ func switchToSSO(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAudit("attempt") var team *model.Team - if result := <-Srv.Store.Team().GetByName(teamName); result.Err != nil { + if result := <-Srv.Store.Team().GetByName(c.T, teamName); result.Err != nil { c.LogAudit("fail - couldn't get team") c.Err = result.Err return @@ -2049,7 +2049,7 @@ func switchToEmail(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAudit("attempt") var team *model.Team - if result := <-Srv.Store.Team().GetByName(teamName); result.Err != nil { + if result := <-Srv.Store.Team().GetByName(c.T, teamName); result.Err != nil { c.LogAudit("fail - couldn't get team") c.Err = result.Err return -- cgit v1.2.3-1-g7c22