diff options
-rw-r--r-- | api/admin.go | 2 | ||||
-rw-r--r-- | api/admin_test.go | 14 | ||||
-rw-r--r-- | api/api_test.go | 2 | ||||
-rw-r--r-- | api/auto_users.go | 4 | ||||
-rw-r--r-- | api/channel.go | 16 | ||||
-rw-r--r-- | api/channel_benchmark_test.go | 2 | ||||
-rw-r--r-- | api/channel_test.go | 60 | ||||
-rw-r--r-- | api/command.go | 2 | ||||
-rw-r--r-- | api/command_test.go | 12 | ||||
-rw-r--r-- | api/context.go | 2 | ||||
-rw-r--r-- | api/export.go | 6 | ||||
-rw-r--r-- | api/file_test.go | 10 | ||||
-rw-r--r-- | api/import.go | 4 | ||||
-rw-r--r-- | api/oauth_test.go | 4 | ||||
-rw-r--r-- | api/post.go | 4 | ||||
-rw-r--r-- | api/post_test.go | 42 | ||||
-rw-r--r-- | api/preference_test.go | 15 | ||||
-rw-r--r-- | api/team.go | 6 | ||||
-rw-r--r-- | api/team_test.go | 20 | ||||
-rw-r--r-- | api/user.go | 84 | ||||
-rw-r--r-- | api/user_test.go | 58 | ||||
-rw-r--r-- | api/web_conn.go | 6 | ||||
-rw-r--r-- | api/web_socket_test.go | 4 | ||||
-rw-r--r-- | api/webhook_test.go | 14 | ||||
-rw-r--r-- | manualtesting/manual_testing.go | 2 | ||||
-rw-r--r-- | mattermost.go | 14 | ||||
-rw-r--r-- | store/sql_channel_store_test.go | 16 | ||||
-rw-r--r-- | store/sql_team_store_test.go | 2 | ||||
-rw-r--r-- | store/sql_user_store.go | 46 | ||||
-rw-r--r-- | store/sql_user_store_test.go | 108 | ||||
-rw-r--r-- | store/store.go | 42 | ||||
-rw-r--r-- | web/web.go | 16 | ||||
-rw-r--r-- | web/web_test.go | 4 |
33 files changed, 323 insertions, 320 deletions
diff --git a/api/admin.go b/api/admin.go index 0905487ea..9cc90a650 100644 --- a/api/admin.go +++ b/api/admin.go @@ -128,7 +128,7 @@ func testEmail(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.User().Get(c.Session.UserId); result.Err != nil { + if result := <-Srv.Store.User().Get(c.T, c.Session.UserId); result.Err != nil { c.Err = result.Err return } else { diff --git a/api/admin_test.go b/api/admin_test.go index f7b6a7eeb..b2054daee 100644 --- a/api/admin_test.go +++ b/api/admin_test.go @@ -19,7 +19,7 @@ func TestGetLogs(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -63,7 +63,7 @@ func TestGetConfig(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -97,7 +97,7 @@ func TestSaveConfig(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -131,7 +131,7 @@ func TestEmailTest(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -159,7 +159,7 @@ func TestGetAnalyticsStandard(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -225,7 +225,7 @@ func TestGetPostCount(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -270,7 +270,7 @@ func TestUserCountsWithPostsByDay(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") diff --git a/api/api_test.go b/api/api_test.go index 2ef4e196d..29c80be08 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -31,7 +31,7 @@ func SetupBenchmark() (*model.Team, *model.User, *model.Channel) { team = Client.Must(Client.CreateTeam(team)).Data.(*model.Team) user := &model.User{TeamId: team.Id, Email: model.NewId() + "benchmark@test.com", Nickname: "Mr. Benchmarker", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") channel := &model.Channel{DisplayName: "Benchmark Channel", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id} channel = Client.Must(Client.CreateChannel(channel)).Data.(*model.Channel) diff --git a/api/auto_users.go b/api/auto_users.go index d1e3d494e..3e4b0b16c 100644 --- a/api/auto_users.go +++ b/api/auto_users.go @@ -46,7 +46,7 @@ func CreateBasicUser(client *model.Client) *model.AppError { if err != nil { return err } - store.Must(Srv.Store.User().VerifyEmail(result.Data.(*model.User).Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, result.Data.(*model.User).Id)) } return nil } @@ -73,7 +73,7 @@ func (cfg *AutoUserCreator) createRandomUser() (*model.User, bool) { return nil, false } // We need to cheat to verify the user's email - store.Must(Srv.Store.User().VerifyEmail(result.Data.(*model.User).Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, result.Data.(*model.User).Id)) return result.Data.(*model.User), true } diff --git a/api/channel.go b/api/channel.go index 39ea62f2b..476c20909 100644 --- a/api/channel.go +++ b/api/channel.go @@ -125,7 +125,7 @@ func CreateDirectChannel(c *Context, otherUserId string) (*model.Channel, *model return nil, model.NewAppError("CreateDirectChannel", "Invalid other user id ", otherUserId) } - uc := Srv.Store.User().Get(otherUserId) + uc := Srv.Store.User().Get(c.T, otherUserId) channel := new(model.Channel) @@ -292,7 +292,7 @@ func updateChannelHeader(c *Context, w http.ResponseWriter, r *http.Request) { func PostUpdateChannelHeaderMessageAndForget(c *Context, channelId string, oldChannelHeader, newChannelHeader string) { go func() { - uc := Srv.Store.User().Get(c.Session.UserId) + uc := Srv.Store.User().Get(c.T, c.Session.UserId) if uresult := <-uc; uresult.Err != nil { l4g.Error("Failed to retrieve user while trying to save update channel header message %v", uresult.Err) @@ -371,7 +371,7 @@ func getChannels(c *Context, w http.ResponseWriter, r *http.Request) { if result := <-Srv.Store.Channel().GetChannels(c.T, c.Session.TeamId, c.Session.UserId); result.Err != nil { if result.Err.Message == "No channels were found" { // lets make sure the user is valid - if result := <-Srv.Store.User().Get(c.Session.UserId); result.Err != nil { + if result := <-Srv.Store.User().Get(c.T, c.Session.UserId); result.Err != nil { c.Err = result.Err c.RemoveSessionCookie(w, r) l4g.Error("Error in getting users profile for id=%v forcing logout", c.Session.UserId) @@ -440,7 +440,7 @@ func join(c *Context, w http.ResponseWriter, r *http.Request) { func JoinChannel(c *Context, channelId string, role string) { sc := Srv.Store.Channel().Get(c.T, channelId) - uc := Srv.Store.User().Get(c.Session.UserId) + uc := Srv.Store.User().Get(c.T, c.Session.UserId) if cresult := <-sc; cresult.Err != nil { c.Err = cresult.Err @@ -544,7 +544,7 @@ func leave(c *Context, w http.ResponseWriter, r *http.Request) { id := params["id"] sc := Srv.Store.Channel().Get(c.T, id) - uc := Srv.Store.User().Get(c.Session.UserId) + uc := Srv.Store.User().Get(c.T, c.Session.UserId) if cresult := <-sc; cresult.Err != nil { c.Err = cresult.Err @@ -594,7 +594,7 @@ func deleteChannel(c *Context, w http.ResponseWriter, r *http.Request) { sc := Srv.Store.Channel().Get(c.T, id) scm := Srv.Store.Channel().GetMember(c.T, id, c.Session.UserId) - uc := Srv.Store.User().Get(c.Session.UserId) + uc := Srv.Store.User().Get(c.T, c.Session.UserId) ihc := Srv.Store.Webhook().GetIncomingByChannel(c.T, id) ohc := Srv.Store.Webhook().GetOutgoingByChannel(c.T, id) @@ -818,8 +818,8 @@ func addMember(c *Context, w http.ResponseWriter, r *http.Request) { cchan := Srv.Store.Channel().CheckPermissionsTo(c.T, c.Session.TeamId, id, c.Session.UserId) sc := Srv.Store.Channel().Get(c.T, id) - ouc := Srv.Store.User().Get(c.Session.UserId) - nuc := Srv.Store.User().Get(userId) + ouc := Srv.Store.User().Get(c.T, c.Session.UserId) + nuc := Srv.Store.User().Get(c.T, userId) // Only need to be a member of the channel to add a new member if !c.HasPermissionsToChannel(cchan, "addMember") { diff --git a/api/channel_benchmark_test.go b/api/channel_benchmark_test.go index d6e1e5a55..f6fc53257 100644 --- a/api/channel_benchmark_test.go +++ b/api/channel_benchmark_test.go @@ -140,7 +140,7 @@ func BenchmarkJoinChannel(b *testing.B) { // Secondary test user to join channels created by primary test user user := &model.User{TeamId: team.Id, Email: model.NewId() + "random@test.com", Nickname: "That Guy", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") // Benchmark Start diff --git a/api/channel_test.go b/api/channel_test.go index 117278378..27034aadd 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -24,7 +24,7 @@ func TestCreateChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -101,11 +101,11 @@ func TestCreateDirectChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -156,15 +156,15 @@ func TestUpdateChannel(t *testing.T) { userTeamAdmin := &model.User{TeamId: team.Id, Email: team.Email, Nickname: "Corey Hulen", Password: "pwd"} userTeamAdmin = Client.Must(Client.CreateUser(userTeamAdmin, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(userTeamAdmin.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, userTeamAdmin.Id)) userChannelAdmin := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} userChannelAdmin = Client.Must(Client.CreateUser(userChannelAdmin, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(userChannelAdmin.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, userChannelAdmin.Id)) userStd := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} userStd = Client.Must(Client.CreateUser(userStd, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(userStd.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, userStd.Id)) userStd.Roles = "" Client.LoginByEmail(team.Name, userChannelAdmin.Email, "pwd") @@ -238,7 +238,7 @@ func TestUpdateChannelHeader(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -278,7 +278,7 @@ func TestUpdateChannelHeader(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user2.Email, "pwd") @@ -297,7 +297,7 @@ func TestUpdateChannelPurpose(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -337,7 +337,7 @@ func TestUpdateChannelPurpose(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user2.Email, "pwd") @@ -356,7 +356,7 @@ func TestGetChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -419,7 +419,7 @@ func TestGetMoreChannel(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -431,7 +431,7 @@ func TestGetMoreChannel(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user2.Email, "pwd") @@ -463,7 +463,7 @@ func TestGetChannelCounts(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -504,7 +504,7 @@ func TestJoinChannel(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -516,7 +516,7 @@ func TestJoinChannel(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user2.Email, "pwd") @@ -548,7 +548,7 @@ func TestLeaveChannel(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -560,7 +560,7 @@ func TestLeaveChannel(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user2.Email, "pwd") @@ -597,11 +597,11 @@ func TestDeleteChannel(t *testing.T) { userTeamAdmin := &model.User{TeamId: team.Id, Email: team.Email, Nickname: "Corey Hulen", Password: "pwd"} userTeamAdmin = Client.Must(Client.CreateUser(userTeamAdmin, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(userTeamAdmin.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, userTeamAdmin.Id)) userChannelAdmin := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} userChannelAdmin = Client.Must(Client.CreateUser(userChannelAdmin, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(userChannelAdmin.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, userChannelAdmin.Id)) Client.LoginByEmail(team.Name, userChannelAdmin.Email, "pwd") @@ -633,7 +633,7 @@ func TestDeleteChannel(t *testing.T) { userStd := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} userStd = Client.Must(Client.CreateUser(userStd, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(userStd.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, userStd.Id)) Client.LoginByEmail(team.Name, userStd.Email, "pwd") @@ -667,7 +667,7 @@ func TestGetChannelExtraInfo(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -703,7 +703,7 @@ func TestGetChannelExtraInfo(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "tester2@test.com", Nickname: "Tester 2", Password: "pwd"} user2 = Client2.Must(Client2.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client2.LoginByEmail(team.Name, user2.Email, "pwd") Client2.Must(Client2.JoinChannel(channel1.Id)) @@ -791,7 +791,7 @@ func TestAddChannelMember(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -800,7 +800,7 @@ func TestAddChannelMember(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) if _, err := Client.AddChannelMember(channel1.Id, user2.Id); err != nil { t.Fatal(err) @@ -849,11 +849,11 @@ func TestRemoveChannelMember(t *testing.T) { userTeamAdmin := &model.User{TeamId: team.Id, Email: team.Email, Nickname: "Corey Hulen", Password: "pwd"} userTeamAdmin = Client.Must(Client.CreateUser(userTeamAdmin, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(userTeamAdmin.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, userTeamAdmin.Id)) userChannelAdmin := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} userChannelAdmin = Client.Must(Client.CreateUser(userChannelAdmin, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(userChannelAdmin.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, userChannelAdmin.Id)) Client.LoginByEmail(team.Name, userChannelAdmin.Email, "pwd") @@ -869,7 +869,7 @@ func TestRemoveChannelMember(t *testing.T) { userStd := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} userStd = Client.Must(Client.CreateUser(userStd, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(userStd.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, userStd.Id)) Client.Must(Client.AddChannelMember(channel1.Id, userStd.Id)) @@ -919,7 +919,7 @@ func TestUpdateNotifyProps(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -1041,7 +1041,7 @@ func TestFuzzyChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") diff --git a/api/command.go b/api/command.go index 5db7e0d13..e041797a6 100644 --- a/api/command.go +++ b/api/command.go @@ -544,7 +544,7 @@ func loadTestPostsCommand(c *Context, command *model.Command) bool { } var usernames []string - if result := <-Srv.Store.User().GetProfiles(c.Session.TeamId); result.Err == nil { + if result := <-Srv.Store.User().GetProfiles(c.T, c.Session.TeamId); result.Err == nil { profileUsers := result.Data.(map[string]*model.User) usernames = make([]string, len(profileUsers)) i := 0 diff --git a/api/command_test.go b/api/command_test.go index b31aec03a..b6069c881 100644 --- a/api/command_test.go +++ b/api/command_test.go @@ -21,7 +21,7 @@ func TestSuggestRootCommands(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -70,7 +70,7 @@ func TestLogoutCommands(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -88,7 +88,7 @@ func TestJoinCommands(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -102,7 +102,7 @@ func TestJoinCommands(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) data := make(map[string]string) data["user_id"] = user2.Id @@ -164,7 +164,7 @@ func TestEchoCommand(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -202,7 +202,7 @@ func TestLoadTestUrlCommand(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") diff --git a/api/context.go b/api/context.go index 2dcf51e10..59db724c4 100644 --- a/api/context.go +++ b/api/context.go @@ -195,7 +195,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { if c.Err == nil && h.isUserActivity && token != "" && len(c.Session.UserId) > 0 { go func() { - if err := (<-Srv.Store.User().UpdateUserAndSessionActivity(c.Session.UserId, c.Session.Id, model.GetMillis())).Err; err != nil { + if err := (<-Srv.Store.User().UpdateUserAndSessionActivity(c.T, c.Session.UserId, c.Session.Id, model.GetMillis())).Err; err != nil { l4g.Error("Failed to update LastActivityAt for user_id=%v and session_id=%v, err=%v", c.Session.UserId, c.Session.Id, err) } }() diff --git a/api/export.go b/api/export.go index b5da8937e..39d6c4389 100644 --- a/api/export.go +++ b/api/export.go @@ -125,7 +125,7 @@ func ExportTeams(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOpt if err := ExportChannels(T, writer, options, team.Id); err != nil { return err } - if err := ExportUsers(writer, options, team.Id); err != nil { + if err := ExportUsers(T, writer, options, team.Id); err != nil { return err } if err := ExportLocalStorage(writer, options, team.Id); err != nil { @@ -225,10 +225,10 @@ func ExportPosts(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOpt return nil } -func ExportUsers(writer ExportWriter, options *ExportOptions, teamId string) *model.AppError { +func ExportUsers(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOptions, teamId string) *model.AppError { // Get the users var users []*model.User - if result := <-Srv.Store.User().GetForExport(teamId); result.Err != nil { + if result := <-Srv.Store.User().GetForExport(T, teamId); result.Err != nil { return result.Err } else { users = result.Data.([]*model.User) diff --git a/api/file_test.go b/api/file_test.go index b3fbd2a27..9a2d0bf57 100644 --- a/api/file_test.go +++ b/api/file_test.go @@ -29,7 +29,7 @@ func TestUploadFile(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -144,7 +144,7 @@ func TestGetFile(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -214,7 +214,7 @@ func TestGetFile(t *testing.T) { user2 := &model.User{TeamId: team2.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) newProps := make(map[string]string) newProps["filename"] = filenames[0] @@ -322,11 +322,11 @@ func TestGetPublicLink(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") diff --git a/api/import.go b/api/import.go index 0b31d05a3..e94e83e9a 100644 --- a/api/import.go +++ b/api/import.go @@ -25,7 +25,7 @@ func ImportPost(T goi18n.TranslateFunc, post *model.Post) { func ImportUser(T goi18n.TranslateFunc, user *model.User) *model.User { user.MakeNonNil() - if result := <-Srv.Store.User().Save(user); result.Err != nil { + if result := <-Srv.Store.User().Save(T, user); result.Err != nil { l4g.Error("Error saving user. err=%v", result.Err) return nil } else { @@ -35,7 +35,7 @@ func ImportUser(T goi18n.TranslateFunc, user *model.User) *model.User { l4g.Error("Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v", ruser.Id, ruser.TeamId, err) } - if cresult := <-Srv.Store.User().VerifyEmail(ruser.Id); cresult.Err != nil { + if cresult := <-Srv.Store.User().VerifyEmail(T, ruser.Id); cresult.Err != nil { l4g.Error("Failed to set email verified err=%v", cresult.Err) } diff --git a/api/oauth_test.go b/api/oauth_test.go index 7d825ef5a..ffe5ab5ac 100644 --- a/api/oauth_test.go +++ b/api/oauth_test.go @@ -20,7 +20,7 @@ func TestRegisterApp(t *testing.T) { user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Password: "pwd"} ruser := Client.Must(Client.CreateUser(&user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser.Id)) app := &model.OAuthApp{Name: "TestApp" + model.NewId(), Homepage: "https://nowhere.com", Description: "test", CallbackUrls: []string{"https://nowhere.com"}} @@ -77,7 +77,7 @@ func TestAllowOAuth(t *testing.T) { user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Password: "pwd"} ruser := Client.Must(Client.CreateUser(&user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser.Id)) app := &model.OAuthApp{Name: "TestApp" + model.NewId(), Homepage: "https://nowhere.com", Description: "test", CallbackUrls: []string{"https://nowhere.com"}} diff --git a/api/post.go b/api/post.go index f41f52fe9..181385f56 100644 --- a/api/post.go +++ b/api/post.go @@ -207,7 +207,7 @@ func handlePostEventsAndForget(c *Context, post *model.Post, triggerWebhooks boo go func() { tchan := Srv.Store.Team().Get(c.T, c.Session.TeamId) cchan := Srv.Store.Channel().Get(c.T, post.ChannelId) - uchan := Srv.Store.User().Get(post.UserId) + uchan := Srv.Store.User().Get(c.T, post.UserId) var team *model.Team if result := <-tchan; result.Err != nil { @@ -394,7 +394,7 @@ func sendNotificationsAndForget(c *Context, post *model.Post, team *model.Team, go func() { // Get a list of user names (to be used as keywords) and ids for the given team - uchan := Srv.Store.User().GetProfiles(c.Session.TeamId) + uchan := Srv.Store.User().GetProfiles(c.T, c.Session.TeamId) echan := Srv.Store.Channel().GetMembers(c.T, post.ChannelId) var channelName string diff --git a/api/post_test.go b/api/post_test.go index fc98333a8..d2061b187 100644 --- a/api/post_test.go +++ b/api/post_test.go @@ -23,11 +23,11 @@ func TestCreatePost(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -105,7 +105,7 @@ func TestCreatePost(t *testing.T) { user3 := &model.User{TeamId: team2.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user3 = Client.Must(Client.CreateUser(user3, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user3.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user3.Id)) Client.LoginByEmail(team2.Name, user3.Email, "pwd") @@ -134,11 +134,11 @@ func TestUpdatePost(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -202,7 +202,7 @@ func TestGetPosts(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -267,7 +267,7 @@ func TestGetPostsSince(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -337,7 +337,7 @@ func TestGetPostsBeforeAfter(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -414,7 +414,7 @@ func TestSearchPosts(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -464,7 +464,7 @@ func TestSearchHashtagPosts(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -495,7 +495,7 @@ func TestSearchPostsInChannel(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -577,7 +577,7 @@ func TestSearchPostsFromUser(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -592,7 +592,7 @@ func TestSearchPostsFromUser(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user2.Email, "pwd") Client.Must(Client.JoinChannel(channel1.Id)) @@ -621,7 +621,7 @@ func TestSearchPostsFromUser(t *testing.T) { user3 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user3 = Client.Must(Client.CreateUser(user3, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user3.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user3.Id)) Client.LoginByEmail(team.Name, user3.Email, "pwd") Client.Must(Client.JoinChannel(channel1.Id)) @@ -655,7 +655,7 @@ func TestGetPostsCache(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -704,11 +704,11 @@ func TestDeletePosts(t *testing.T) { userAdmin := &model.User{TeamId: team.Id, Email: team.Email, Nickname: "Corey Hulen", Password: "pwd"} userAdmin = Client.Must(Client.CreateUser(userAdmin, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(userAdmin.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, userAdmin.Id)) user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -765,7 +765,7 @@ func TestEmailMention(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: "corey+test@test.com", Nickname: "Bob Bobby", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -787,7 +787,7 @@ func TestFuzzyPosts(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -814,11 +814,11 @@ func TestMakeDirectChannelVisible(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) // user2 will be created with prefs created to show user1 in the sidebar so set that to false to get rid of it Client.LoginByEmail(team.Name, user2.Email, "pwd") diff --git a/api/preference_test.go b/api/preference_test.go index 6bebe205c..99ca12922 100644 --- a/api/preference_test.go +++ b/api/preference_test.go @@ -6,6 +6,7 @@ package api import ( "github.com/mattermost/platform/model" "github.com/mattermost/platform/store" + "github.com/mattermost/platform/utils" "testing" ) @@ -17,11 +18,11 @@ func TestGetAllPreferences(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) category := model.NewId() @@ -70,7 +71,7 @@ func TestSetPreferences(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -101,7 +102,7 @@ func TestSetPreferences(t *testing.T) { // not able to update as a different user user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user2.Email, "pwd") @@ -118,11 +119,11 @@ func TestGetPreferenceCategory(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) category := model.NewId() @@ -174,7 +175,7 @@ func TestGetPreference(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") diff --git a/api/team.go b/api/team.go index 0d0f440d8..e945d9f10 100644 --- a/api/team.go +++ b/api/team.go @@ -462,7 +462,7 @@ func inviteMembers(c *Context, w http.ResponseWriter, r *http.Request) { } tchan := Srv.Store.Team().Get(c.T, c.Session.TeamId) - uchan := Srv.Store.User().Get(c.Session.UserId) + uchan := Srv.Store.User().Get(c.T, c.Session.UserId) var team *model.Team if result := <-tchan; result.Err != nil { @@ -482,7 +482,7 @@ func inviteMembers(c *Context, w http.ResponseWriter, r *http.Request) { var invNum int64 = 0 for i, invite := range invites.Invites { - if result := <-Srv.Store.User().GetByEmail(c.Session.TeamId, invite["email"]); result.Err == nil || result.Err.Message != store.MISSING_ACCOUNT_ERROR { + if result := <-Srv.Store.User().GetByEmail(c.T, c.Session.TeamId, invite["email"]); result.Err == nil || result.Err.Message != store.MISSING_ACCOUNT_ERROR { invNum = int64(i) c.Err = model.NewAppError("invite_members", "This person is already on your team", strconv.FormatInt(invNum, 10)) return @@ -596,7 +596,7 @@ func PermanentDeleteTeam(c *Context, team *model.Team) *model.AppError { return result.Err } - if result := <-Srv.Store.User().GetForExport(team.Id); result.Err != nil { + if result := <-Srv.Store.User().GetForExport(c.T, team.Id); result.Err != nil { return result.Err } else { users := result.Data.([]*model.User) diff --git a/api/team_test.go b/api/team_test.go index cba043bbb..fe3eeae49 100644 --- a/api/team_test.go +++ b/api/team_test.go @@ -79,7 +79,7 @@ func TestCreateTeam(t *testing.T) { user := &model.User{TeamId: rteam.Data.(*model.Team).Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -116,7 +116,7 @@ func TestFindTeamByEmail(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) if r1, err := Client.FindTeams(user.Email); err != nil { t.Fatal(err) @@ -143,7 +143,7 @@ func TestGetAllTeams(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -176,7 +176,7 @@ func TestTeamPermDelete(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -219,7 +219,7 @@ func TestFindTeamByDomain(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) if r1, err := Client.FindTeamByDomain(team.Name, false); err != nil { t.Fatal(err) @@ -259,7 +259,7 @@ func TestFindTeamByEmailSend(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") if _, err := Client.FindTeamsSendEmail(user.Email); err != nil { @@ -284,7 +284,7 @@ func TestInviteMembers(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -313,11 +313,11 @@ func TestUpdateTeamDisplayName(t *testing.T) { user := &model.User{TeamId: team.Id, Email: "test@nowhere.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user2.Email, "pwd") @@ -370,7 +370,7 @@ func TestGetMyTeam(t *testing.T) { user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser, _ := Client.CreateUser(&user, "") - store.Must(Srv.Store.User().VerifyEmail(ruser.Data.(*model.User).Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser.Data.(*model.User).Id)) Client.LoginByEmail(team.Name, user.Email, user.Password) diff --git a/api/user.go b/api/user.go index 38c214bb3..d8f5050d4 100644 --- a/api/user.go +++ b/api/user.go @@ -194,7 +194,7 @@ func CreateUser(T goi18n.TranslateFunc, team *model.Team, user *model.User) (*mo // Below is a speical case where the first user in the entire // system is granted the system_admin role instead of admin - if result := <-Srv.Store.User().GetTotalUsersCount(); result.Err != nil { + if result := <-Srv.Store.User().GetTotalUsersCount(T); result.Err != nil { return nil, result.Err } else { count := result.Data.(int64) @@ -209,7 +209,7 @@ func CreateUser(T goi18n.TranslateFunc, team *model.Team, user *model.User) (*mo user.MakeNonNil() - if result := <-Srv.Store.User().Save(user); result.Err != nil { + if result := <-Srv.Store.User().Save(T, user); result.Err != nil { l4g.Error("Couldn't save the user err=%v", result.Err) return nil, result.Err } else { @@ -223,7 +223,7 @@ func CreateUser(T goi18n.TranslateFunc, team *model.Team, user *model.User) (*mo addDirectChannelsAndForget(T, ruser) if user.EmailVerified { - if cresult := <-Srv.Store.User().VerifyEmail(ruser.Id); cresult.Err != nil { + if cresult := <-Srv.Store.User().VerifyEmail(T, ruser.Id); cresult.Err != nil { l4g.Error("Failed to set email verified err=%v", cresult.Err) } } @@ -259,8 +259,8 @@ func CreateOAuthUser(c *Context, w http.ResponseWriter, r *http.Request, service return nil } - suchan := Srv.Store.User().GetByAuth(team.Id, user.AuthData, service) - euchan := Srv.Store.User().GetByEmail(team.Id, user.Email) + suchan := Srv.Store.User().GetByAuth(c.T, team.Id, user.AuthData, service) + euchan := Srv.Store.User().GetByEmail(c.T, team.Id, user.Email) if team.Email == "" { team.Email = user.Email @@ -272,7 +272,7 @@ func CreateOAuthUser(c *Context, w http.ResponseWriter, r *http.Request, service found := true count := 0 for found { - if found = IsUsernameTaken(user.Username, team.Id); c.Err != nil { + if found = IsUsernameTaken(c.T, user.Username, team.Id); c.Err != nil { return nil } else if found { user.Username = user.Username + strconv.Itoa(count) @@ -331,7 +331,7 @@ func sendWelcomeEmailAndForget(T goi18n.TranslateFunc, userId, email, teamName, func addDirectChannelsAndForget(T goi18n.TranslateFunc, user *model.User) { go func() { var profiles map[string]*model.User - if result := <-Srv.Store.User().GetProfiles(user.TeamId); result.Err != nil { + if result := <-Srv.Store.User().GetProfiles(T, user.TeamId); result.Err != nil { l4g.Error("Failed to add direct channel preferences for user user_id=%s, team_id=%s, err=%v", user.Id, user.TeamId, result.Err.Error()) return } else { @@ -387,7 +387,7 @@ func SendVerifyEmailAndForget(userId, userEmail, teamName, teamDisplayName, site } func LoginById(c *Context, w http.ResponseWriter, r *http.Request, userId, password, deviceId string) *model.User { - if result := <-Srv.Store.User().Get(userId); result.Err != nil { + if result := <-Srv.Store.User().Get(c.T, userId); result.Err != nil { c.Err = result.Err return nil } else { @@ -411,7 +411,7 @@ func LoginByEmail(c *Context, w http.ResponseWriter, r *http.Request, email, nam team = result.Data.(*model.Team) } - if result := <-Srv.Store.User().GetByEmail(team.Id, email); result.Err != nil { + if result := <-Srv.Store.User().GetByEmail(c.T, team.Id, email); result.Err != nil { c.Err = result.Err c.Err.StatusCode = http.StatusForbidden return nil @@ -448,7 +448,7 @@ func LoginByOAuth(c *Context, w http.ResponseWriter, r *http.Request, service st } var user *model.User - if result := <-Srv.Store.User().GetByAuth(team.Id, authData, service); result.Err != nil { + if result := <-Srv.Store.User().GetByAuth(c.T, team.Id, authData, service); result.Err != nil { c.Err = result.Err return nil } else { @@ -476,13 +476,13 @@ func checkUserPassword(c *Context, user *model.User, password string) bool { c.Err = model.NewAppError("checkUserPassword", "Login failed because of invalid password", "user_id="+user.Id) c.Err.StatusCode = http.StatusForbidden - if result := <-Srv.Store.User().UpdateFailedPasswordAttempts(user.Id, user.FailedAttempts+1); result.Err != nil { + if result := <-Srv.Store.User().UpdateFailedPasswordAttempts(c.T, user.Id, user.FailedAttempts+1); result.Err != nil { c.LogError(result.Err) } return false } else { - if result := <-Srv.Store.User().UpdateFailedPasswordAttempts(user.Id, 0); result.Err != nil { + if result := <-Srv.Store.User().UpdateFailedPasswordAttempts(c.T, user.Id, 0); result.Err != nil { c.LogError(result.Err) } @@ -793,7 +793,7 @@ func getMe(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.User().Get(c.Session.UserId); result.Err != nil { + if result := <-Srv.Store.User().Get(c.T, c.Session.UserId); result.Err != nil { c.Err = result.Err c.RemoveSessionCookie(w, r) l4g.Error("Error in getting users profile for id=%v forcing logout", c.Session.UserId) @@ -817,7 +817,7 @@ func getUser(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.User().Get(id); result.Err != nil { + if result := <-Srv.Store.User().Get(c.T, id); result.Err != nil { c.Err = result.Err return } else if HandleEtag(result.Data.(*model.User).Etag(), w, r) { @@ -845,12 +845,12 @@ func getProfiles(c *Context, w http.ResponseWriter, r *http.Request) { id = c.Session.TeamId } - etag := (<-Srv.Store.User().GetEtagForProfiles(id)).Data.(string) + etag := (<-Srv.Store.User().GetEtagForProfiles(c.T, id)).Data.(string) if HandleEtag(etag, w, r) { return } - if result := <-Srv.Store.User().GetProfiles(id); result.Err != nil { + if result := <-Srv.Store.User().GetProfiles(c.T, id); result.Err != nil { c.Err = result.Err return } else { @@ -884,7 +884,7 @@ func getAudits(c *Context, w http.ResponseWriter, r *http.Request) { return } - userChan := Srv.Store.User().Get(id) + userChan := Srv.Store.User().Get(c.T, id) auditChan := Srv.Store.Audit().Get(c.T, id, 20) if c.Err = (<-userChan).Err; c.Err != nil { @@ -990,7 +990,7 @@ func getProfileImage(c *Context, w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) id := params["id"] - if result := <-Srv.Store.User().Get(id); result.Err != nil { + if result := <-Srv.Store.User().Get(c.T, id); result.Err != nil { c.Err = result.Err return } else { @@ -1105,7 +1105,7 @@ func uploadProfileImage(c *Context, w http.ResponseWriter, r *http.Request) { return } - Srv.Store.User().UpdateLastPictureUpdate(c.Session.UserId) + Srv.Store.User().UpdateLastPictureUpdate(c.T, c.Session.UserId) c.LogAudit("") @@ -1125,7 +1125,7 @@ func updateUser(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.User().Update(user, false); result.Err != nil { + if result := <-Srv.Store.User().Update(c.T, user, false); result.Err != nil { c.Err = result.Err return } else { @@ -1182,7 +1182,7 @@ func updatePassword(c *Context, w http.ResponseWriter, r *http.Request) { var result store.StoreResult - if result = <-Srv.Store.User().Get(userId); result.Err != nil { + if result = <-Srv.Store.User().Get(c.T, userId); result.Err != nil { c.Err = result.Err return } @@ -1210,7 +1210,7 @@ func updatePassword(c *Context, w http.ResponseWriter, r *http.Request) { return } - if uresult := <-Srv.Store.User().UpdatePassword(c.Session.UserId, model.HashPassword(newPassword)); uresult.Err != nil { + if uresult := <-Srv.Store.User().UpdatePassword(c.T, c.Session.UserId, model.HashPassword(newPassword)); uresult.Err != nil { c.Err = model.NewAppError("updatePassword", "Update password failed", uresult.Err.Error()) c.Err.StatusCode = http.StatusForbidden return @@ -1252,7 +1252,7 @@ func updateRoles(c *Context, w http.ResponseWriter, r *http.Request) { } var user *model.User - if result := <-Srv.Store.User().Get(user_id); result.Err != nil { + if result := <-Srv.Store.User().Get(c.T, user_id); result.Err != nil { c.Err = result.Err return } else { @@ -1309,7 +1309,7 @@ func UpdateRoles(c *Context, user *model.User, roles string) *model.User { if !model.IsInRole(roles, model.ROLE_SYSTEM_ADMIN) { if model.IsInRole(user.Roles, model.ROLE_TEAM_ADMIN) && !model.IsInRole(roles, model.ROLE_TEAM_ADMIN) { - if result := <-Srv.Store.User().GetProfiles(user.TeamId); result.Err != nil { + if result := <-Srv.Store.User().GetProfiles(c.T, user.TeamId); result.Err != nil { c.Err = result.Err return nil } else { @@ -1332,7 +1332,7 @@ func UpdateRoles(c *Context, user *model.User, roles string) *model.User { user.Roles = roles var ruser *model.User - if result := <-Srv.Store.User().Update(user, true); result.Err != nil { + if result := <-Srv.Store.User().Update(c.T, user, true); result.Err != nil { c.Err = result.Err return nil } else { @@ -1355,7 +1355,7 @@ func updateActive(c *Context, w http.ResponseWriter, r *http.Request) { active := props["active"] == "true" var user *model.User - if result := <-Srv.Store.User().Get(user_id); result.Err != nil { + if result := <-Srv.Store.User().Get(c.T, user_id); result.Err != nil { c.Err = result.Err return } else { @@ -1374,7 +1374,7 @@ func updateActive(c *Context, w http.ResponseWriter, r *http.Request) { // make sure there is at least 1 other active admin if !active && model.IsInRole(user.Roles, model.ROLE_TEAM_ADMIN) { - if result := <-Srv.Store.User().GetProfiles(user.TeamId); result.Err != nil { + if result := <-Srv.Store.User().GetProfiles(c.T, user.TeamId); result.Err != nil { c.Err = result.Err return } else { @@ -1407,7 +1407,7 @@ func UpdateActive(c *Context, user *model.User, active bool) *model.User { user.DeleteAt = model.GetMillis() } - if result := <-Srv.Store.User().Update(user, true); result.Err != nil { + if result := <-Srv.Store.User().Update(c.T, user, true); result.Err != nil { c.Err = result.Err return nil } else { @@ -1464,7 +1464,7 @@ func PermanentDeleteUser(c *Context, user *model.User) *model.AppError { return result.Err } - if result := <-Srv.Store.User().PermanentDelete(user.Id); result.Err != nil { + if result := <-Srv.Store.User().PermanentDelete(c.T, user.Id); result.Err != nil { return result.Err } @@ -1502,7 +1502,7 @@ func sendPasswordReset(c *Context, w http.ResponseWriter, r *http.Request) { } var user *model.User - if result := <-Srv.Store.User().GetByEmail(team.Id, email); result.Err != nil { + if result := <-Srv.Store.User().GetByEmail(c.T, team.Id, email); result.Err != nil { c.Err = model.NewAppError("sendPasswordReset", "We couldn’t find an account with that address.", "email="+email+" team_id="+team.Id) return } else { @@ -1591,7 +1591,7 @@ func resetPassword(c *Context, w http.ResponseWriter, r *http.Request) { } var user *model.User - if result := <-Srv.Store.User().Get(userId); result.Err != nil { + if result := <-Srv.Store.User().Get(c.T, userId); result.Err != nil { c.Err = result.Err return } else { @@ -1622,7 +1622,7 @@ func resetPassword(c *Context, w http.ResponseWriter, r *http.Request) { } } - if result := <-Srv.Store.User().UpdatePassword(userId, model.HashPassword(newPassword)); result.Err != nil { + if result := <-Srv.Store.User().UpdatePassword(c.T, userId, model.HashPassword(newPassword)); result.Err != nil { c.Err = result.Err return } else { @@ -1701,7 +1701,7 @@ func updateUserNotify(c *Context, w http.ResponseWriter, r *http.Request) { return } - uchan := Srv.Store.User().Get(user_id) + uchan := Srv.Store.User().Get(c.T, user_id) if !c.HasPermissionsToUser(user_id, "updateUserNotify") { return @@ -1737,7 +1737,7 @@ func updateUserNotify(c *Context, w http.ResponseWriter, r *http.Request) { user.NotifyProps = props - if result := <-Srv.Store.User().Update(user, false); result.Err != nil { + if result := <-Srv.Store.User().Update(c.T, user, false); result.Err != nil { c.Err = result.Err return } else { @@ -1758,7 +1758,7 @@ func getStatuses(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.User().GetProfiles(c.Session.TeamId); result.Err != nil { + if result := <-Srv.Store.User().GetProfiles(c.T, c.Session.TeamId); result.Err != nil { c.Err = result.Err return } else { @@ -1900,13 +1900,13 @@ func AuthorizeOAuthUser(T goi18n.TranslateFunc, service, code, state, redirectUr } -func IsUsernameTaken(name string, teamId string) bool { +func IsUsernameTaken(T goi18n.TranslateFunc, name string, teamId string) bool { if !model.IsValidUsername(name) { return false } - if result := <-Srv.Store.User().GetByUsername(teamId, name); result.Err != nil { + if result := <-Srv.Store.User().GetByUsername(T, teamId, name); result.Err != nil { return false } else { return true @@ -1954,7 +1954,7 @@ func switchToSSO(c *Context, w http.ResponseWriter, r *http.Request) { } var user *model.User - if result := <-Srv.Store.User().GetByEmail(team.Id, email); result.Err != nil { + if result := <-Srv.Store.User().GetByEmail(c.T, team.Id, email); result.Err != nil { c.LogAudit("fail - couldn't get user") c.Err = result.Err return @@ -2005,7 +2005,7 @@ func CompleteSwitchWithOAuth(c *Context, w http.ResponseWriter, r *http.Request, } var user *model.User - if result := <-Srv.Store.User().GetByEmail(team.Id, email); result.Err != nil { + if result := <-Srv.Store.User().GetByEmail(c.T, team.Id, email); result.Err != nil { c.Err = result.Err return } else { @@ -2017,7 +2017,7 @@ func CompleteSwitchWithOAuth(c *Context, w http.ResponseWriter, r *http.Request, return } - if result := <-Srv.Store.User().UpdateAuthData(user.Id, service, authData); result.Err != nil { + if result := <-Srv.Store.User().UpdateAuthData(c.T, user.Id, service, authData); result.Err != nil { c.Err = result.Err return } @@ -2058,7 +2058,7 @@ func switchToEmail(c *Context, w http.ResponseWriter, r *http.Request) { } var user *model.User - if result := <-Srv.Store.User().GetByEmail(team.Id, email); result.Err != nil { + if result := <-Srv.Store.User().GetByEmail(c.T, team.Id, email); result.Err != nil { c.LogAudit("fail - couldn't get user") c.Err = result.Err return @@ -2073,7 +2073,7 @@ func switchToEmail(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.User().UpdatePassword(c.Session.UserId, model.HashPassword(password)); result.Err != nil { + if result := <-Srv.Store.User().UpdatePassword(c.T, c.Session.UserId, model.HashPassword(password)); result.Err != nil { c.LogAudit("fail - database issue") c.Err = result.Err return diff --git a/api/user_test.go b/api/user_test.go index 1728cdcde..a85e88008 100644 --- a/api/user_test.go +++ b/api/user_test.go @@ -101,7 +101,7 @@ func TestLogin(t *testing.T) { user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser, _ := Client.CreateUser(&user, "") - store.Must(Srv.Store.User().VerifyEmail(ruser.Data.(*model.User).Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser.Data.(*model.User).Id)) if result, err := Client.LoginById(ruser.Data.(*model.User).Id, user.Password); err != nil { t.Fatal(err) @@ -170,7 +170,7 @@ func TestLoginWithDeviceId(t *testing.T) { user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser := Client.Must(Client.CreateUser(&user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser.Id)) deviceId := model.NewId() if result, err := Client.LoginByEmailWithDevice(team.Name, user.Email, user.Password, deviceId); err != nil { @@ -201,7 +201,7 @@ func TestSessions(t *testing.T) { user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser := Client.Must(Client.CreateUser(&user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser.Id)) deviceId := model.NewId() Client.LoginByEmailWithDevice(team.Name, user.Email, user.Password, deviceId) @@ -253,18 +253,18 @@ func TestGetUser(t *testing.T) { user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser, _ := Client.CreateUser(&user, "") - store.Must(Srv.Store.User().VerifyEmail(ruser.Data.(*model.User).Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser.Data.(*model.User).Id)) user2 := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser2, _ := Client.CreateUser(&user2, "") - store.Must(Srv.Store.User().VerifyEmail(ruser2.Data.(*model.User).Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser2.Data.(*model.User).Id)) team2 := model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} rteam2, _ := Client.CreateTeam(&team2) user3 := model.User{TeamId: rteam2.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser3, _ := Client.CreateUser(&user3, "") - store.Must(Srv.Store.User().VerifyEmail(ruser3.Data.(*model.User).Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser3.Data.(*model.User).Id)) Client.LoginByEmail(team.Name, user.Email, user.Password) @@ -345,7 +345,7 @@ func TestGetAudits(t *testing.T) { user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser, _ := Client.CreateUser(&user, "") - store.Must(Srv.Store.User().VerifyEmail(ruser.Data.(*model.User).Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser.Data.(*model.User).Id)) time.Sleep(100 * time.Millisecond) @@ -398,7 +398,7 @@ func TestUserCreateImage(t *testing.T) { user := &model.User{TeamId: team.Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -432,7 +432,7 @@ func TestUserUploadProfileImage(t *testing.T) { user := &model.User{TeamId: team.Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) if utils.Cfg.FileSettings.DriverName != "" { @@ -538,7 +538,7 @@ func TestUserUpdate(t *testing.T) { user := &model.User{TeamId: team.Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd", LastActivityAt: time1, LastPingAt: time1, Roles: ""} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) if _, err := Client.UpdateUser(user); err == nil { t.Fatal("Should have errored") @@ -594,7 +594,7 @@ func TestUserUpdate(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user2.Email, "pwd") @@ -613,7 +613,7 @@ func TestUserUpdatePassword(t *testing.T) { user := &model.User{TeamId: team.Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) if _, err := Client.UpdateUserPassword(user.Id, "pwd", "newpwd"); err == nil { t.Fatal("Should have errored") @@ -672,11 +672,11 @@ func TestUserUpdateRoles(t *testing.T) { user := &model.User{TeamId: team.Id, Email: "test@nowhere.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) user2 := &model.User{TeamId: team.Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) data := make(map[string]string) data["user_id"] = user.Id @@ -697,7 +697,7 @@ func TestUserUpdateRoles(t *testing.T) { user3 := &model.User{TeamId: team2.Id, Email: "test@nowhere.com", Nickname: "Corey Hulen", Password: "pwd"} user3 = Client.Must(Client.CreateUser(user3, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user3.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user3.Id)) Client.LoginByEmail(team2.Name, user3.Email, "pwd") @@ -742,11 +742,11 @@ func TestUserUpdateActive(t *testing.T) { user := &model.User{TeamId: team.Id, Email: "test@nowhere.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) user2 := &model.User{TeamId: team.Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) if _, err := Client.UpdateActive(user.Id, false); err == nil { t.Fatal("Should have errored, not logged in") @@ -763,7 +763,7 @@ func TestUserUpdateActive(t *testing.T) { user3 := &model.User{TeamId: team2.Id, Email: "test@nowhere.com", Nickname: "Corey Hulen", Password: "pwd"} user3 = Client.Must(Client.CreateUser(user3, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user3.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user3.Id)) Client.LoginByEmail(team2.Name, user3.Email, "pwd") @@ -806,7 +806,7 @@ func TestUserPermDelete(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") @@ -845,7 +845,7 @@ func TestSendPasswordReset(t *testing.T) { user := &model.User{TeamId: team.Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) data := make(map[string]string) data["email"] = user.Email @@ -878,7 +878,7 @@ func TestSendPasswordReset(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", AuthData: "1", AuthService: "random"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) data["email"] = user2.Email data["name"] = team.Name @@ -895,7 +895,7 @@ func TestResetPassword(t *testing.T) { user := &model.User{TeamId: team.Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) data := make(map[string]string) data["new_password"] = "newpwd" @@ -972,7 +972,7 @@ func TestResetPassword(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", AuthData: "1", AuthService: "random"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) data["new_password"] = "newpwd" props["user_id"] = user2.Id @@ -993,7 +993,7 @@ func TestUserUpdateNotify(t *testing.T) { user := &model.User{TeamId: team.Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd", Roles: ""} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) data := make(map[string]string) data["user_id"] = user.Id @@ -1088,11 +1088,11 @@ func TestStatuses(t *testing.T) { user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser := Client.Must(Client.CreateUser(&user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser.Id)) user2 := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser2 := Client.Must(Client.CreateUser(&user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(ruser2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser2.Id)) Client.LoginByEmail(team.Name, user.Email, user.Password) @@ -1125,7 +1125,7 @@ func TestSwitchToSSO(t *testing.T) { user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser := Client.Must(Client.CreateUser(&user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser.Id)) m := map[string]string{} if _, err := Client.SwitchToSSO(m); err == nil { @@ -1174,11 +1174,11 @@ func TestSwitchToEmail(t *testing.T) { user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser := Client.Must(Client.CreateUser(&user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser.Id)) user2 := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} ruser2 := Client.Must(Client.CreateUser(&user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(ruser2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, ruser2.Id)) m := map[string]string{} if _, err := Client.SwitchToSSO(m); err == nil { diff --git a/api/web_conn.go b/api/web_conn.go index aed16aa55..b9c728174 100644 --- a/api/web_conn.go +++ b/api/web_conn.go @@ -30,8 +30,8 @@ type WebConn struct { func NewWebConn(ws *websocket.Conn, teamId string, userId string, sessionId string) *WebConn { go func() { - achan := Srv.Store.User().UpdateUserAndSessionActivity(userId, sessionId, model.GetMillis()) - pchan := Srv.Store.User().UpdateLastPingAt(userId, model.GetMillis()) + achan := Srv.Store.User().UpdateUserAndSessionActivity(utils.T, userId, sessionId, model.GetMillis()) + pchan := Srv.Store.User().UpdateLastPingAt(utils.T, userId, model.GetMillis()) if result := <-achan; result.Err != nil { l4g.Error("Failed to update LastActivityAt for user_id=%v and session_id=%v, err=%v", userId, sessionId, result.Err) @@ -56,7 +56,7 @@ func (c *WebConn) readPump() { c.WebSocket.SetReadDeadline(time.Now().Add(PONG_WAIT)) go func() { - if result := <-Srv.Store.User().UpdateLastPingAt(c.UserId, model.GetMillis()); result.Err != nil { + if result := <-Srv.Store.User().UpdateLastPingAt(utils.T, c.UserId, model.GetMillis()); result.Err != nil { l4g.Error("Failed to updated LastPingAt for user_id=%v, err=%v", c.UserId, result.Err) } }() diff --git a/api/web_socket_test.go b/api/web_socket_test.go index 24e860628..b8639e7c8 100644 --- a/api/web_socket_test.go +++ b/api/web_socket_test.go @@ -22,7 +22,7 @@ func TestSocket(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user1.Id)) Client.LoginByEmail(team.Name, user1.Email, "pwd") channel1 := &model.Channel{DisplayName: "Test Web Scoket 1", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id} @@ -41,7 +41,7 @@ func TestSocket(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user2.Id)) Client.LoginByEmail(team.Name, user2.Email, "pwd") header2 := http.Header{} diff --git a/api/webhook_test.go b/api/webhook_test.go index 85117ec18..ad2f61d09 100644 --- a/api/webhook_test.go +++ b/api/webhook_test.go @@ -19,7 +19,7 @@ func TestCreateIncomingHook(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -82,7 +82,7 @@ func TestListIncomingHooks(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -120,7 +120,7 @@ func TestDeleteIncomingHook(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -160,7 +160,7 @@ func TestCreateOutgoingHook(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -223,7 +223,7 @@ func TestListOutgoingHooks(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -261,7 +261,7 @@ func TestDeleteOutgoingHook(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") @@ -301,7 +301,7 @@ func TestRegenOutgoingHookToken(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(Srv.Store.User().VerifyEmail(utils.T, user.Id)) Client.LoginByEmail(team.Name, user.Email, "pwd") diff --git a/manualtesting/manual_testing.go b/manualtesting/manual_testing.go index d1dd16b28..b9549690e 100644 --- a/manualtesting/manual_testing.go +++ b/manualtesting/manual_testing.go @@ -100,7 +100,7 @@ func manualTest(c *api.Context, w http.ResponseWriter, r *http.Request) { c.Err = err return } - api.Srv.Store.User().VerifyEmail(result.Data.(*model.User).Id) + api.Srv.Store.User().VerifyEmail(c.T, result.Data.(*model.User).Id) newuser := result.Data.(*model.User) userID = newuser.Id diff --git a/mattermost.go b/mattermost.go index cfe68f76e..868029c66 100644 --- a/mattermost.go +++ b/mattermost.go @@ -140,11 +140,11 @@ func runSecurityAndDiagnosticsJobAndForget() { <-api.Srv.Store.System().Update(utils.T, systemSecurityLastTime) } - if ucr := <-api.Srv.Store.User().GetTotalUsersCount(); ucr.Err == nil { + if ucr := <-api.Srv.Store.User().GetTotalUsersCount(utils.T); ucr.Err == nil { v.Set(utils.PROP_DIAGNOSTIC_USER_COUNT, strconv.FormatInt(ucr.Data.(int64), 10)) } - if ucr := <-api.Srv.Store.User().GetTotalActiveUsersCount(); ucr.Err == nil { + if ucr := <-api.Srv.Store.User().GetTotalActiveUsersCount(utils.T); ucr.Err == nil { v.Set(utils.PROP_DIAGNOSTIC_ACTIVE_USER_COUNT, strconv.FormatInt(ucr.Data.(int64), 10)) } @@ -159,7 +159,7 @@ func runSecurityAndDiagnosticsJobAndForget() { for _, bulletin := range bulletins { if bulletin.AppliesToVersion == model.CurrentVersion { if props["SecurityBulletin_"+bulletin.Id] == "" { - if results := <-api.Srv.Store.User().GetSystemAdminProfiles(); results.Err != nil { + if results := <-api.Srv.Store.User().GetSystemAdminProfiles(utils.T); results.Err != nil { l4g.Error("Failed to get system admins for security update information from Mattermost.") return } else { @@ -366,7 +366,7 @@ func cmdAssignRole() { } var user *model.User - if result := <-api.Srv.Store.User().GetByEmail(team.Id, flagEmail); result.Err != nil { + if result := <-api.Srv.Store.User().GetByEmail(utils.T, team.Id, flagEmail); result.Err != nil { l4g.Error("%v", result.Err) flushLogAndExit(1) } else { @@ -420,14 +420,14 @@ func cmdResetPassword() { } var user *model.User - if result := <-api.Srv.Store.User().GetByEmail(team.Id, flagEmail); result.Err != nil { + if result := <-api.Srv.Store.User().GetByEmail(utils.T, team.Id, flagEmail); result.Err != nil { l4g.Error("%v", result.Err) flushLogAndExit(1) } else { user = result.Data.(*model.User) } - if result := <-api.Srv.Store.User().UpdatePassword(user.Id, model.HashPassword(flagPassword)); result.Err != nil { + if result := <-api.Srv.Store.User().UpdatePassword(utils.T, user.Id, model.HashPassword(flagPassword)); result.Err != nil { l4g.Error("%v", result.Err) flushLogAndExit(1) } @@ -463,7 +463,7 @@ func cmdPermDeleteUser() { } var user *model.User - if result := <-api.Srv.Store.User().GetByEmail(team.Id, flagEmail); result.Err != nil { + if result := <-api.Srv.Store.User().GetByEmail(utils.T, team.Id, flagEmail); result.Err != nil { l4g.Error("%v", result.Err) flushLogAndExit(1) } else { diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go index 412b03b10..079fab92b 100644 --- a/store/sql_channel_store_test.go +++ b/store/sql_channel_store_test.go @@ -72,13 +72,13 @@ func TestChannelStoreSaveDirectChannel(t *testing.T) { u1.TeamId = model.NewId() u1.Email = model.NewId() u1.Nickname = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) u2 := model.User{} u2.TeamId = model.NewId() u2.Email = model.NewId() u2.Nickname = model.NewId() - Must(store.User().Save(&u2)) + Must(store.User().Save(utils.T, &u2)) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -168,13 +168,13 @@ func TestChannelStoreGet(t *testing.T) { u1.TeamId = model.NewId() u1.Email = model.NewId() u1.Nickname = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) u2 := model.User{} u2.TeamId = model.NewId() u2.Email = model.NewId() u2.Nickname = model.NewId() - Must(store.User().Save(&u2)) + Must(store.User().Save(utils.T, &u2)) o2 := model.Channel{} o2.TeamId = model.NewId() @@ -313,13 +313,13 @@ func TestChannelMemberStore(t *testing.T) { u1.TeamId = model.NewId() u1.Email = model.NewId() u1.Nickname = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) u2 := model.User{} u2.TeamId = model.NewId() u2.Email = model.NewId() u2.Nickname = model.NewId() - Must(store.User().Save(&u2)) + Must(store.User().Save(utils.T, &u2)) o1 := model.ChannelMember{} o1.ChannelId = c1.Id @@ -397,13 +397,13 @@ func TestChannelDeleteMemberStore(t *testing.T) { u1.TeamId = model.NewId() u1.Email = model.NewId() u1.Nickname = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) u2 := model.User{} u2.TeamId = model.NewId() u2.Email = model.NewId() u2.Nickname = model.NewId() - Must(store.User().Save(&u2)) + Must(store.User().Save(utils.T, &u2)) o1 := model.ChannelMember{} o1.ChannelId = c1.Id diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go index 47708777c..90f4772f1 100644 --- a/store/sql_team_store_test.go +++ b/store/sql_team_store_test.go @@ -194,7 +194,7 @@ func TestTeamStoreGetForEmail(t *testing.T) { u1 := model.User{} u1.TeamId = o1.Id u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) if r1 := <-store.Team().GetTeamsForEmail(utils.T, u1.Email); r1.Err != nil { t.Fatal(r1.Err) diff --git a/store/sql_user_store.go b/store/sql_user_store.go index 0f73f73c3..e17db6666 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -5,9 +5,11 @@ package store import ( "fmt" + "strings" + "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" - "strings" + goi18n "github.com/nicksnyder/go-i18n/i18n" ) const ( @@ -54,7 +56,7 @@ func (us SqlUserStore) CreateIndexesIfNotExists() { us.CreateIndexIfNotExists("idx_users_email", "Users", "Email") } -func (us SqlUserStore) Save(user *model.User) StoreChannel { +func (us SqlUserStore) Save(T goi18n.TranslateFunc, user *model.User) StoreChannel { storeChannel := make(StoreChannel) @@ -106,7 +108,7 @@ func (us SqlUserStore) Save(user *model.User) StoreChannel { return storeChannel } -func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreChannel { +func (us SqlUserStore) Update(T goi18n.TranslateFunc, user *model.User, allowActiveUpdate bool) StoreChannel { storeChannel := make(StoreChannel) @@ -183,7 +185,7 @@ func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreCha return storeChannel } -func (us SqlUserStore) UpdateLastPictureUpdate(userId string) StoreChannel { +func (us SqlUserStore) UpdateLastPictureUpdate(T goi18n.TranslateFunc, userId string) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -204,7 +206,7 @@ func (us SqlUserStore) UpdateLastPictureUpdate(userId string) StoreChannel { return storeChannel } -func (us SqlUserStore) UpdateLastPingAt(userId string, time int64) StoreChannel { +func (us SqlUserStore) UpdateLastPingAt(T goi18n.TranslateFunc, userId string, time int64) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -223,7 +225,7 @@ func (us SqlUserStore) UpdateLastPingAt(userId string, time int64) StoreChannel return storeChannel } -func (us SqlUserStore) UpdateLastActivityAt(userId string, time int64) StoreChannel { +func (us SqlUserStore) UpdateLastActivityAt(T goi18n.TranslateFunc, userId string, time int64) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -242,7 +244,7 @@ func (us SqlUserStore) UpdateLastActivityAt(userId string, time int64) StoreChan return storeChannel } -func (us SqlUserStore) UpdateUserAndSessionActivity(userId string, sessionId string, time int64) StoreChannel { +func (us SqlUserStore) UpdateUserAndSessionActivity(T goi18n.TranslateFunc, userId string, sessionId string, time int64) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -263,7 +265,7 @@ func (us SqlUserStore) UpdateUserAndSessionActivity(userId string, sessionId str return storeChannel } -func (us SqlUserStore) UpdatePassword(userId, hashedPassword string) StoreChannel { +func (us SqlUserStore) UpdatePassword(T goi18n.TranslateFunc, userId, hashedPassword string) StoreChannel { storeChannel := make(StoreChannel) @@ -285,7 +287,7 @@ func (us SqlUserStore) UpdatePassword(userId, hashedPassword string) StoreChanne return storeChannel } -func (us SqlUserStore) UpdateFailedPasswordAttempts(userId string, attempts int) StoreChannel { +func (us SqlUserStore) UpdateFailedPasswordAttempts(T goi18n.TranslateFunc, userId string, attempts int) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -304,7 +306,7 @@ func (us SqlUserStore) UpdateFailedPasswordAttempts(userId string, attempts int) return storeChannel } -func (us SqlUserStore) UpdateAuthData(userId, service, authData string) StoreChannel { +func (us SqlUserStore) UpdateAuthData(T goi18n.TranslateFunc, userId, service, authData string) StoreChannel { storeChannel := make(StoreChannel) @@ -326,7 +328,7 @@ func (us SqlUserStore) UpdateAuthData(userId, service, authData string) StoreCha return storeChannel } -func (us SqlUserStore) Get(id string) StoreChannel { +func (us SqlUserStore) Get(T goi18n.TranslateFunc, id string) StoreChannel { storeChannel := make(StoreChannel) @@ -349,7 +351,7 @@ func (us SqlUserStore) Get(id string) StoreChannel { return storeChannel } -func (s SqlUserStore) GetEtagForProfiles(teamId string) StoreChannel { +func (s SqlUserStore) GetEtagForProfiles(T goi18n.TranslateFunc, teamId string) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -369,7 +371,7 @@ func (s SqlUserStore) GetEtagForProfiles(teamId string) StoreChannel { return storeChannel } -func (us SqlUserStore) GetProfiles(teamId string) StoreChannel { +func (us SqlUserStore) GetProfiles(T goi18n.TranslateFunc, teamId string) StoreChannel { storeChannel := make(StoreChannel) @@ -400,7 +402,7 @@ func (us SqlUserStore) GetProfiles(teamId string) StoreChannel { return storeChannel } -func (us SqlUserStore) GetSystemAdminProfiles() StoreChannel { +func (us SqlUserStore) GetSystemAdminProfiles(T goi18n.TranslateFunc) StoreChannel { storeChannel := make(StoreChannel) @@ -431,7 +433,7 @@ func (us SqlUserStore) GetSystemAdminProfiles() StoreChannel { return storeChannel } -func (us SqlUserStore) GetByEmail(teamId string, email string) StoreChannel { +func (us SqlUserStore) GetByEmail(T goi18n.TranslateFunc, teamId string, email string) StoreChannel { storeChannel := make(StoreChannel) @@ -453,7 +455,7 @@ func (us SqlUserStore) GetByEmail(teamId string, email string) StoreChannel { return storeChannel } -func (us SqlUserStore) GetByAuth(teamId string, authData string, authService string) StoreChannel { +func (us SqlUserStore) GetByAuth(T goi18n.TranslateFunc, teamId string, authData string, authService string) StoreChannel { storeChannel := make(StoreChannel) @@ -475,7 +477,7 @@ func (us SqlUserStore) GetByAuth(teamId string, authData string, authService str return storeChannel } -func (us SqlUserStore) GetByUsername(teamId string, username string) StoreChannel { +func (us SqlUserStore) GetByUsername(T goi18n.TranslateFunc, teamId string, username string) StoreChannel { storeChannel := make(StoreChannel) @@ -497,7 +499,7 @@ func (us SqlUserStore) GetByUsername(teamId string, username string) StoreChanne return storeChannel } -func (us SqlUserStore) VerifyEmail(userId string) StoreChannel { +func (us SqlUserStore) VerifyEmail(T goi18n.TranslateFunc, userId string) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -516,7 +518,7 @@ func (us SqlUserStore) VerifyEmail(userId string) StoreChannel { return storeChannel } -func (us SqlUserStore) GetForExport(teamId string) StoreChannel { +func (us SqlUserStore) GetForExport(T goi18n.TranslateFunc, teamId string) StoreChannel { storeChannel := make(StoreChannel) @@ -543,7 +545,7 @@ func (us SqlUserStore) GetForExport(teamId string) StoreChannel { return storeChannel } -func (us SqlUserStore) GetTotalUsersCount() StoreChannel { +func (us SqlUserStore) GetTotalUsersCount(T goi18n.TranslateFunc) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -562,7 +564,7 @@ func (us SqlUserStore) GetTotalUsersCount() StoreChannel { return storeChannel } -func (us SqlUserStore) GetTotalActiveUsersCount() StoreChannel { +func (us SqlUserStore) GetTotalActiveUsersCount(T goi18n.TranslateFunc) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -583,7 +585,7 @@ func (us SqlUserStore) GetTotalActiveUsersCount() StoreChannel { return storeChannel } -func (us SqlUserStore) PermanentDelete(userId string) StoreChannel { +func (us SqlUserStore) PermanentDelete(T goi18n.TranslateFunc, userId string) StoreChannel { storeChannel := make(StoreChannel) diff --git a/store/sql_user_store_test.go b/store/sql_user_store_test.go index 12bc6d172..50296b251 100644 --- a/store/sql_user_store_test.go +++ b/store/sql_user_store_test.go @@ -19,27 +19,27 @@ func TestUserStoreSave(t *testing.T) { u1.Username = model.NewId() u1.TeamId = model.NewId() - if err := (<-store.User().Save(&u1)).Err; err != nil { + if err := (<-store.User().Save(utils.T, &u1)).Err; err != nil { t.Fatal("couldn't save user", err) } - if err := (<-store.User().Save(&u1)).Err; err == nil { + if err := (<-store.User().Save(utils.T, &u1)).Err; err == nil { t.Fatal("shouldn't be able to update user from save") } u1.Id = "" - if err := (<-store.User().Save(&u1)).Err; err == nil { + if err := (<-store.User().Save(utils.T, &u1)).Err; err == nil { t.Fatal("should be unique email") } u1.Email = "" - if err := (<-store.User().Save(&u1)).Err; err == nil { + if err := (<-store.User().Save(utils.T, &u1)).Err; err == nil { t.Fatal("should be unique username") } u1.Email = strings.Repeat("0123456789", 20) u1.Username = "" - if err := (<-store.User().Save(&u1)).Err; err == nil { + if err := (<-store.User().Save(utils.T, &u1)).Err; err == nil { t.Fatal("should be unique username") } @@ -47,7 +47,7 @@ func TestUserStoreSave(t *testing.T) { u1.Id = "" u1.Email = model.NewId() u1.Username = model.NewId() - if err := (<-store.User().Save(&u1)).Err; err != nil { + if err := (<-store.User().Save(utils.T, &u1)).Err; err != nil { t.Fatal("couldn't save item", err) } } @@ -55,7 +55,7 @@ func TestUserStoreSave(t *testing.T) { u1.Id = "" u1.Email = model.NewId() u1.Username = model.NewId() - if err := (<-store.User().Save(&u1)).Err; err == nil { + if err := (<-store.User().Save(utils.T, &u1)).Err; err == nil { t.Fatal("should be the limit", err) } } @@ -66,21 +66,21 @@ func TestUserStoreUpdate(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) time.Sleep(100 * time.Millisecond) - if err := (<-store.User().Update(&u1, false)).Err; err != nil { + if err := (<-store.User().Update(utils.T, &u1, false)).Err; err != nil { t.Fatal(err) } u1.Id = "missing" - if err := (<-store.User().Update(&u1, false)).Err; err == nil { + if err := (<-store.User().Update(utils.T, &u1, false)).Err; err == nil { t.Fatal("Update should have failed because of missing key") } u1.Id = model.NewId() - if err := (<-store.User().Update(&u1, false)).Err; err == nil { + if err := (<-store.User().Update(utils.T, &u1, false)).Err; err == nil { t.Fatal("Update should have faile because id change") } } @@ -91,13 +91,13 @@ func TestUserStoreUpdateLastPingAt(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) - if err := (<-store.User().UpdateLastPingAt(u1.Id, 1234567890)).Err; err != nil { + if err := (<-store.User().UpdateLastPingAt(utils.T, u1.Id, 1234567890)).Err; err != nil { t.Fatal(err) } - if r1 := <-store.User().Get(u1.Id); r1.Err != nil { + if r1 := <-store.User().Get(utils.T, u1.Id); r1.Err != nil { t.Fatal(r1.Err) } else { if r1.Data.(*model.User).LastPingAt != 1234567890 { @@ -113,13 +113,13 @@ func TestUserStoreUpdateLastActivityAt(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) - if err := (<-store.User().UpdateLastActivityAt(u1.Id, 1234567890)).Err; err != nil { + if err := (<-store.User().UpdateLastActivityAt(utils.T, u1.Id, 1234567890)).Err; err != nil { t.Fatal(err) } - if r1 := <-store.User().Get(u1.Id); r1.Err != nil { + if r1 := <-store.User().Get(utils.T, u1.Id); r1.Err != nil { t.Fatal(r1.Err) } else { if r1.Data.(*model.User).LastActivityAt != 1234567890 { @@ -135,13 +135,13 @@ func TestUserStoreUpdateFailedPasswordAttempts(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) - if err := (<-store.User().UpdateFailedPasswordAttempts(u1.Id, 3)).Err; err != nil { + if err := (<-store.User().UpdateFailedPasswordAttempts(utils.T, u1.Id, 3)).Err; err != nil { t.Fatal(err) } - if r1 := <-store.User().Get(u1.Id); r1.Err != nil { + if r1 := <-store.User().Get(utils.T, u1.Id); r1.Err != nil { t.Fatal(r1.Err) } else { if r1.Data.(*model.User).FailedAttempts != 3 { @@ -157,18 +157,18 @@ func TestUserStoreUpdateUserAndSessionActivity(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) s1 := model.Session{} s1.UserId = u1.Id s1.TeamId = u1.TeamId Must(store.Session().Save(utils.T, &s1)) - if err := (<-store.User().UpdateUserAndSessionActivity(u1.Id, s1.Id, 1234567890)).Err; err != nil { + if err := (<-store.User().UpdateUserAndSessionActivity(utils.T, u1.Id, s1.Id, 1234567890)).Err; err != nil { t.Fatal(err) } - if r1 := <-store.User().Get(u1.Id); r1.Err != nil { + if r1 := <-store.User().Get(utils.T, u1.Id); r1.Err != nil { t.Fatal(r1.Err) } else { if r1.Data.(*model.User).LastActivityAt != 1234567890 { @@ -192,9 +192,9 @@ func TestUserStoreGet(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) - if r1 := <-store.User().Get(u1.Id); r1.Err != nil { + if r1 := <-store.User().Get(utils.T, u1.Id); r1.Err != nil { t.Fatal(r1.Err) } else { if r1.Data.(*model.User).ToJson() != u1.ToJson() { @@ -202,7 +202,7 @@ func TestUserStoreGet(t *testing.T) { } } - if err := (<-store.User().Get("")).Err; err == nil { + if err := (<-store.User().Get(utils.T, "")).Err; err == nil { t.Fatal("Missing id should have failed") } } @@ -213,9 +213,9 @@ func TestUserCount(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) - if result := <-store.User().GetTotalUsersCount(); result.Err != nil { + if result := <-store.User().GetTotalUsersCount(utils.T); result.Err != nil { t.Fatal(result.Err) } else { count := result.Data.(int64) @@ -231,9 +231,9 @@ func TestActiveUserCount(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) - if result := <-store.User().GetTotalActiveUsersCount(); result.Err != nil { + if result := <-store.User().GetTotalActiveUsersCount(utils.T); result.Err != nil { t.Fatal(result.Err) } else { count := result.Data.(int64) @@ -249,14 +249,14 @@ func TestUserStoreGetProfiles(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) u2 := model.User{} u2.TeamId = u1.TeamId u2.Email = model.NewId() - Must(store.User().Save(&u2)) + Must(store.User().Save(utils.T, &u2)) - if r1 := <-store.User().GetProfiles(u1.TeamId); r1.Err != nil { + if r1 := <-store.User().GetProfiles(utils.T, u1.TeamId); r1.Err != nil { t.Fatal(r1.Err) } else { users := r1.Data.(map[string]*model.User) @@ -269,7 +269,7 @@ func TestUserStoreGetProfiles(t *testing.T) { } } - if r2 := <-store.User().GetProfiles("123"); r2.Err != nil { + if r2 := <-store.User().GetProfiles(utils.T, "123"); r2.Err != nil { t.Fatal(r2.Err) } else { if len(r2.Data.(map[string]*model.User)) != 0 { @@ -284,14 +284,14 @@ func TestUserStoreGetSystemAdminProfiles(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) u2 := model.User{} u2.TeamId = u1.TeamId u2.Email = model.NewId() - Must(store.User().Save(&u2)) + Must(store.User().Save(utils.T, &u2)) - if r1 := <-store.User().GetSystemAdminProfiles(); r1.Err != nil { + if r1 := <-store.User().GetSystemAdminProfiles(utils.T); r1.Err != nil { t.Fatal(r1.Err) } else { users := r1.Data.(map[string]*model.User) @@ -307,13 +307,13 @@ func TestUserStoreGetByEmail(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) - if err := (<-store.User().GetByEmail(u1.TeamId, u1.Email)).Err; err != nil { + if err := (<-store.User().GetByEmail(utils.T, u1.TeamId, u1.Email)).Err; err != nil { t.Fatal(err) } - if err := (<-store.User().GetByEmail("", "")).Err; err == nil { + if err := (<-store.User().GetByEmail(utils.T, "", "")).Err; err == nil { t.Fatal("Should have failed because of missing email") } } @@ -326,13 +326,13 @@ func TestUserStoreGetByAuthData(t *testing.T) { u1.Email = model.NewId() u1.AuthData = "123" u1.AuthService = "service" - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) - if err := (<-store.User().GetByAuth(u1.TeamId, u1.AuthData, u1.AuthService)).Err; err != nil { + if err := (<-store.User().GetByAuth(utils.T, u1.TeamId, u1.AuthData, u1.AuthService)).Err; err != nil { t.Fatal(err) } - if err := (<-store.User().GetByAuth("", "", "")).Err; err == nil { + if err := (<-store.User().GetByAuth(utils.T, "", "", "")).Err; err == nil { t.Fatal("Should have failed because of missing auth data") } } @@ -344,13 +344,13 @@ func TestUserStoreGetByUsername(t *testing.T) { u1.TeamId = model.NewId() u1.Email = model.NewId() u1.Username = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) - if err := (<-store.User().GetByUsername(u1.TeamId, u1.Username)).Err; err != nil { + if err := (<-store.User().GetByUsername(utils.T, u1.TeamId, u1.Username)).Err; err != nil { t.Fatal(err) } - if err := (<-store.User().GetByUsername("", "")).Err; err == nil { + if err := (<-store.User().GetByUsername(utils.T, "", "")).Err; err == nil { t.Fatal("Should have failed because of missing username") } } @@ -361,15 +361,15 @@ func TestUserStoreUpdatePassword(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) hashedPassword := model.HashPassword("newpwd") - if err := (<-store.User().UpdatePassword(u1.Id, hashedPassword)).Err; err != nil { + if err := (<-store.User().UpdatePassword(utils.T, u1.Id, hashedPassword)).Err; err != nil { t.Fatal(err) } - if r1 := <-store.User().GetByEmail(u1.TeamId, u1.Email); r1.Err != nil { + if r1 := <-store.User().GetByEmail(utils.T, u1.TeamId, u1.Email); r1.Err != nil { t.Fatal(r1.Err) } else { user := r1.Data.(*model.User) @@ -385,9 +385,9 @@ func TestUserStoreDelete(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) - if err := (<-store.User().PermanentDelete(u1.Id)).Err; err != nil { + if err := (<-store.User().PermanentDelete(utils.T, u1.Id)).Err; err != nil { t.Fatal(err) } } @@ -398,16 +398,16 @@ func TestUserStoreUpdateAuthData(t *testing.T) { u1 := model.User{} u1.TeamId = model.NewId() u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(utils.T, &u1)) service := "someservice" authData := "1" - if err := (<-store.User().UpdateAuthData(u1.Id, service, authData)).Err; err != nil { + if err := (<-store.User().UpdateAuthData(utils.T, u1.Id, service, authData)).Err; err != nil { t.Fatal(err) } - if r1 := <-store.User().GetByEmail(u1.TeamId, u1.Email); r1.Err != nil { + if r1 := <-store.User().GetByEmail(utils.T, u1.TeamId, u1.Email); r1.Err != nil { t.Fatal(r1.Err) } else { user := r1.Data.(*model.User) diff --git a/store/store.go b/store/store.go index bd840a87d..e50fc23bc 100644 --- a/store/store.go +++ b/store/store.go @@ -106,27 +106,27 @@ type PostStore interface { } type UserStore interface { - Save(user *model.User) StoreChannel - Update(user *model.User, allowRoleUpdate bool) StoreChannel - UpdateLastPictureUpdate(userId string) StoreChannel - UpdateLastPingAt(userId string, time int64) StoreChannel - UpdateLastActivityAt(userId string, time int64) StoreChannel - UpdateUserAndSessionActivity(userId string, sessionId string, time int64) StoreChannel - UpdatePassword(userId, newPassword string) StoreChannel - UpdateAuthData(userId, service, authData string) StoreChannel - Get(id string) StoreChannel - GetProfiles(teamId string) StoreChannel - GetByEmail(teamId string, email string) StoreChannel - GetByAuth(teamId string, authData string, authService string) StoreChannel - GetByUsername(teamId string, username string) StoreChannel - VerifyEmail(userId string) StoreChannel - GetEtagForProfiles(teamId string) StoreChannel - UpdateFailedPasswordAttempts(userId string, attempts int) StoreChannel - GetForExport(teamId string) StoreChannel - GetTotalUsersCount() StoreChannel - GetTotalActiveUsersCount() StoreChannel - GetSystemAdminProfiles() StoreChannel - PermanentDelete(userId string) StoreChannel + Save(T goi18n.TranslateFunc, user *model.User) StoreChannel + Update(T goi18n.TranslateFunc, user *model.User, allowRoleUpdate bool) StoreChannel + UpdateLastPictureUpdate(T goi18n.TranslateFunc, userId string) StoreChannel + UpdateLastPingAt(T goi18n.TranslateFunc, userId string, time int64) StoreChannel + UpdateLastActivityAt(T goi18n.TranslateFunc, userId string, time int64) StoreChannel + UpdateUserAndSessionActivity(T goi18n.TranslateFunc, userId string, sessionId string, time int64) StoreChannel + UpdatePassword(T goi18n.TranslateFunc, userId, newPassword string) StoreChannel + UpdateAuthData(T goi18n.TranslateFunc, userId, service, authData string) StoreChannel + Get(T goi18n.TranslateFunc, id string) StoreChannel + GetProfiles(T goi18n.TranslateFunc, teamId string) StoreChannel + GetByEmail(T goi18n.TranslateFunc, teamId string, email string) StoreChannel + GetByAuth(T goi18n.TranslateFunc, teamId string, authData string, authService string) StoreChannel + GetByUsername(T goi18n.TranslateFunc, teamId string, username string) StoreChannel + VerifyEmail(T goi18n.TranslateFunc, userId string) StoreChannel + GetEtagForProfiles(T goi18n.TranslateFunc, teamId string) StoreChannel + UpdateFailedPasswordAttempts(T goi18n.TranslateFunc, userId string, attempts int) StoreChannel + GetForExport(T goi18n.TranslateFunc, teamId string) StoreChannel + GetTotalUsersCount(T goi18n.TranslateFunc) StoreChannel + GetTotalActiveUsersCount(T goi18n.TranslateFunc) StoreChannel + GetSystemAdminProfiles(T goi18n.TranslateFunc) StoreChannel + PermanentDelete(T goi18n.TranslateFunc, userId string) StoreChannel } type SessionStore interface { diff --git a/web/web.go b/web/web.go index 7c39488f6..b21c87337 100644 --- a/web/web.go +++ b/web/web.go @@ -185,7 +185,7 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) { page.Render(c, w) } else { teamChan := api.Srv.Store.Team().Get(c.T, c.Session.TeamId) - userChan := api.Srv.Store.User().Get(c.Session.UserId) + userChan := api.Srv.Store.User().Get(c.T, c.Session.UserId) var team *model.Team if tr := <-teamChan; tr.Err != nil { @@ -510,7 +510,7 @@ func checkSessionSwitch(c *api.Context, w http.ResponseWriter, r *http.Request, } func doLoadChannel(c *api.Context, w http.ResponseWriter, r *http.Request, team *model.Team, channel *model.Channel, postid string) { - userChan := api.Srv.Store.User().Get(c.Session.UserId) + userChan := api.Srv.Store.User().Get(c.T, c.Session.UserId) var user *model.User if ur := <-userChan; ur.Err != nil { @@ -551,7 +551,7 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) { } if resend == "true" { - if result := <-api.Srv.Store.User().GetByEmail(team.Id, email); result.Err != nil { + if result := <-api.Srv.Store.User().GetByEmail(c.T, team.Id, email); result.Err != nil { c.Err = result.Err return } else { @@ -570,7 +570,7 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) { } if len(userId) == 26 && len(hashedId) != 0 && model.ComparePassword(hashedId, userId) { - if c.Err = (<-api.Srv.Store.User().VerifyEmail(userId)).Err; c.Err != nil { + if c.Err = (<-api.Srv.Store.User().VerifyEmail(c.T, userId)).Err; c.Err != nil { return } else { c.LogAudit("Email Verified") @@ -792,7 +792,7 @@ func adminConsole(c *api.Context, w http.ResponseWriter, r *http.Request) { } teamChan := api.Srv.Store.Team().Get(c.T, c.Session.TeamId) - userChan := api.Srv.Store.User().Get(c.Session.UserId) + userChan := api.Srv.Store.User().Get(c.T, c.Session.UserId) var team *model.Team if tr := <-teamChan; tr.Err != nil { @@ -920,7 +920,7 @@ func getAccessToken(c *api.Context, w http.ResponseWriter, r *http.Request) { return } - uchan := api.Srv.Store.User().Get(authData.UserId) + uchan := api.Srv.Store.User().Get(c.T, authData.UserId) if authData.IsExpired() { c.LogAudit("fail - auth code expired") @@ -1070,7 +1070,7 @@ func incomingWebhook(c *api.Context, w http.ResponseWriter, r *http.Request) { if len(channelName) != 0 { if channelName[0] == '@' { - if result := <-api.Srv.Store.User().GetByUsername(hook.TeamId, channelName[1:]); result.Err != nil { + if result := <-api.Srv.Store.User().GetByUsername(c.T, hook.TeamId, channelName[1:]); result.Err != nil { c.Err = model.NewAppError("incomingWebhook", "Couldn't find the user", "err="+result.Err.Message) return } else { @@ -1135,7 +1135,7 @@ func claimAccount(c *api.Context, w http.ResponseWriter, r *http.Request) { authType := "" if len(email) != 0 { - if uResult := <-api.Srv.Store.User().GetByEmail(team.Id, email); uResult.Err != nil { + if uResult := <-api.Srv.Store.User().GetByEmail(c.T, team.Id, email); uResult.Err != nil { l4g.Error("Couldn't find user teamid=%v, email=%v, err=%v", team.Id, email, uResult.Err.Message) http.Redirect(w, r, api.GetProtocol(r)+"://"+r.Host, http.StatusTemporaryRedirect) return diff --git a/web/web_test.go b/web/web_test.go index 8d40810b5..51dfc673e 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -62,7 +62,7 @@ func TestGetAccessToken(t *testing.T) { user := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey+test@test.com", Password: "pwd"} ruser := ApiClient.Must(ApiClient.CreateUser(&user, "")).Data.(*model.User) - store.Must(api.Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(api.Srv.Store.User().VerifyEmail(utils.T, ruser.Id)) app := &model.OAuthApp{Name: "TestApp" + model.NewId(), Homepage: "https://nowhere.com", Description: "test", CallbackUrls: []string{"https://nowhere.com"}} @@ -191,7 +191,7 @@ func TestIncomingWebhook(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey+test@test.com", Nickname: "Corey Hulen", Password: "pwd"} user = ApiClient.Must(ApiClient.CreateUser(user, "")).Data.(*model.User) - store.Must(api.Srv.Store.User().VerifyEmail(user.Id)) + store.Must(api.Srv.Store.User().VerifyEmail(utils.T, user.Id)) ApiClient.LoginByEmail(team.Name, user.Email, "pwd") |