From 2e5617c29be69637acd384e85f795a0b343bec8d Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Thu, 21 Apr 2016 22:37:01 -0700 Subject: PLT-2057 User as a first class object (#2648) * Adding TeamMember to system * Fixing all unit tests on the backend * Fixing merge conflicts * Fixing merge conflict * Adding javascript unit tests * Adding TeamMember to system * Fixing all unit tests on the backend * Fixing merge conflicts * Fixing merge conflict * Adding javascript unit tests * Adding client side unit test * Cleaning up the clint side tests * Fixing msg * Adding more client side unit tests * Adding more using tests * Adding last bit of client side unit tests and adding make cmd * Fixing bad merge * Fixing libraries * Updating to new client side API * Fixing borken unit test * Fixing unit tests * ugg...trying to beat gofmt * ugg...trying to beat gofmt * Cleaning up remainder of the server side routes * Adding inital load api * Increased coverage of webhook unit tests (#2660) * Adding loading ... to root html * Fixing bad merge * Removing explicit content type so superagent will guess corectly (#2685) * Fixing merge and unit tests * Adding create team UI * Fixing signup flows * Adding LDAP unit tests and enterprise unit test helper (#2702) * Add the ability to reset MFA from the commandline (#2706) * Fixing compliance unit tests * Fixing client side tests * Adding open server to system console * Moving websocket connection * Fixing unit test * Fixing unit tests * Fixing unit tests * Adding nickname and more LDAP unit tests (#2717) * Adding join open teams * Cleaning up all TODOs in the code * Fixing web sockets * Removing unused webockets file * PLT-2533 Add the ability to reset a user's MFA from the system console (#2715) * Add the ability to reset a user's MFA from the system console * Add client side unit test for adminResetMfa * Reorganizing authentication to fix LDAP error message (#2723) * Fixing failing unit test * Initial upgrade db code * Adding upgrade script * Fixing upgrade script after running on core * Update OAuth and Claim routes to work with user model changes (#2739) * Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740) * Fixing team invite ldap login call (#2741) * Fixing bluebar and some img stuff * Fix all the different file upload web utils (#2743) * Fixing invalid session redirect (#2744) * Redirect on bad channel name (#2746) * Fixing a bunch of issue and removing dead code * Patch to fix error message on leave channel (#2747) * Setting EnableOpenServer to false by default * Fixing config * Fixing upgrade * Fixing reported bugs * Bug fixes for PLT-2057 * PLT-2563 Redo password recovery to use a database table (#2745) * Redo password recovery to use a database table * Update reset password audits * Split out admin and user reset password APIs to be separate * Delete password recovery when user is permanently deleted * Consolidate password resetting into a single function * Removed private channels as an option for outgoing webhooks (#2752) * PLT-2577/PLT-2552 Fixes for backstage (#2753) * Added URL to incoming webhook list * Fixed client functions for adding/removing integrations * Disallowed slash commands without trigger words * Fixed clientside handling of errors on AddCommand page * Minor auth cleanup (#2758) * Changed EditPostModal to just close if you save without making any changes (#2759) * Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756) * Fixed url in channel info modal (#2755) * Fixing reported issues * Moving to version 3 of the apis * Fixing command unit tests (#2760) * Adding team admins * Fixing DM issue * Fixing eslint error * Properly set EditPostModal's originalText state in all cases (#2762) * Update client config check to assume features is defined if server is licensed (#2772) * Fixing url link * Fixing issue with websocket crashing when sending messages to different teams --- store/sql_user_store_test.go | 272 ++++++++++++++++++++++++++++++------------- 1 file changed, 189 insertions(+), 83 deletions(-) (limited to 'store/sql_user_store_test.go') diff --git a/store/sql_user_store_test.go b/store/sql_user_store_test.go index dcd2440ac..2d17c5888 100644 --- a/store/sql_user_store_test.go +++ b/store/sql_user_store_test.go @@ -13,15 +13,18 @@ import ( func TestUserStoreSave(t *testing.T) { Setup() + teamId := model.NewId() + u1 := model.User{} u1.Email = model.NewId() u1.Username = model.NewId() - u1.TeamId = model.NewId() if err := (<-store.User().Save(&u1)).Err; err != nil { t.Fatal("couldn't save user", err) } + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) + if err := (<-store.User().Save(&u1)).Err; err == nil { t.Fatal("shouldn't be able to update user from save") } @@ -49,37 +52,44 @@ func TestUserStoreSave(t *testing.T) { if err := (<-store.User().Save(&u1)).Err; err != nil { t.Fatal("couldn't save item", err) } + + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) } u1.Id = "" u1.Email = model.NewId() u1.Username = model.NewId() - if err := (<-store.User().Save(&u1)).Err; err == nil { - t.Fatal("should be the limit", err) + if err := (<-store.User().Save(&u1)).Err; err != nil { + t.Fatal("couldn't save item", err) } + + if err := (<-store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})).Err; err == nil { + t.Fatal("should be the limit") + } + } func TestUserStoreUpdate(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) time.Sleep(100 * time.Millisecond) - if err := (<-store.User().Update(&u1, false)).Err; err != nil { + if err := (<-store.User().Update(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(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(u1, false)).Err; err == nil { t.Fatal("Update should have faile because id change") } } @@ -87,10 +97,10 @@ func TestUserStoreUpdate(t *testing.T) { func TestUserStoreUpdateLastPingAt(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) if err := (<-store.User().UpdateLastPingAt(u1.Id, 1234567890)).Err; err != nil { t.Fatal(err) @@ -109,10 +119,10 @@ func TestUserStoreUpdateLastPingAt(t *testing.T) { func TestUserStoreUpdateLastActivityAt(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) if err := (<-store.User().UpdateLastActivityAt(u1.Id, 1234567890)).Err; err != nil { t.Fatal(err) @@ -131,10 +141,10 @@ func TestUserStoreUpdateLastActivityAt(t *testing.T) { func TestUserStoreUpdateFailedPasswordAttempts(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) if err := (<-store.User().UpdateFailedPasswordAttempts(u1.Id, 3)).Err; err != nil { t.Fatal(err) @@ -153,14 +163,13 @@ func TestUserStoreUpdateFailedPasswordAttempts(t *testing.T) { func TestUserStoreUpdateUserAndSessionActivity(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) s1 := model.Session{} s1.UserId = u1.Id - s1.TeamId = u1.TeamId Must(store.Session().Save(&s1)) if err := (<-store.User().UpdateUserAndSessionActivity(u1.Id, s1.Id, 1234567890)).Err; err != nil { @@ -188,10 +197,10 @@ func TestUserStoreUpdateUserAndSessionActivity(t *testing.T) { func TestUserStoreGet(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) if r1 := <-store.User().Get(u1.Id); r1.Err != nil { t.Fatal(r1.Err) @@ -209,10 +218,10 @@ func TestUserStoreGet(t *testing.T) { func TestUserCount(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) if result := <-store.User().GetTotalUsersCount(); result.Err != nil { t.Fatal(result.Err) @@ -227,10 +236,11 @@ func TestUserCount(t *testing.T) { func TestActiveUserCount(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) + <-store.User().UpdateLastActivityAt(u1.Id, model.GetMillis()) if result := <-store.User().GetTotalActiveUsersCount(); result.Err != nil { t.Fatal(result.Err) @@ -245,17 +255,89 @@ func TestActiveUserCount(t *testing.T) { func TestUserStoreGetProfiles(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + teamId := model.NewId() + + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) + + u2 := &model.User{} + u2.Email = model.NewId() + Must(store.User().Save(u2)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id})) + + if r1 := <-store.User().GetProfiles(teamId); r1.Err != nil { + t.Fatal(r1.Err) + } else { + users := r1.Data.(map[string]*model.User) + if len(users) != 2 { + t.Fatal("invalid returned users") + } + + if users[u1.Id].Id != u1.Id { + t.Fatal("invalid returned user") + } + } + + if r2 := <-store.User().GetProfiles("123"); r2.Err != nil { + t.Fatal(r2.Err) + } else { + if len(r2.Data.(map[string]*model.User)) != 0 { + t.Fatal("should have returned empty map") + } + } +} + +func TestUserStoreGetDirectProfiles(t *testing.T) { + Setup() + + teamId := model.NewId() + + u1 := &model.User{} + u1.Email = model.NewId() + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) + + u2 := &model.User{} + u2.Email = model.NewId() + Must(store.User().Save(u2)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id})) + + if r1 := <-store.User().GetDirectProfiles(u1.Id); r1.Err != nil { + t.Fatal(r1.Err) + } else { + users := r1.Data.(map[string]*model.User) + if len(users) != 0 { + t.Fatal("invalid returned users") + } + } + + if r2 := <-store.User().GetDirectProfiles("123"); r2.Err != nil { + t.Fatal(r2.Err) + } else { + if len(r2.Data.(map[string]*model.User)) != 0 { + t.Fatal("should have returned empty map") + } + } +} + +func TestUserStoreGetProfilesByIds(t *testing.T) { + Setup() + + teamId := model.NewId() + + u1 := &model.User{} + u1.Email = model.NewId() + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) - u2 := model.User{} - u2.TeamId = u1.TeamId + u2 := &model.User{} u2.Email = model.NewId() - Must(store.User().Save(&u2)) + Must(store.User().Save(u2)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id})) - if r1 := <-store.User().GetProfiles(u1.TeamId); r1.Err != nil { + if r1 := <-store.User().GetProfileByIds([]string{u1.Id, u2.Id}); r1.Err != nil { t.Fatal(r1.Err) } else { users := r1.Data.(map[string]*model.User) @@ -268,6 +350,19 @@ func TestUserStoreGetProfiles(t *testing.T) { } } + if r1 := <-store.User().GetProfileByIds([]string{u1.Id}); r1.Err != nil { + t.Fatal(r1.Err) + } else { + users := r1.Data.(map[string]*model.User) + if len(users) != 1 { + t.Fatal("invalid returned users") + } + + if users[u1.Id].Id != u1.Id { + t.Fatal("invalid returned user") + } + } + if r2 := <-store.User().GetProfiles("123"); r2.Err != nil { t.Fatal(r2.Err) } else { @@ -280,15 +375,18 @@ func TestUserStoreGetProfiles(t *testing.T) { func TestUserStoreGetSystemAdminProfiles(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + teamId := model.NewId() + + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + u1.Roles = model.ROLE_SYSTEM_ADMIN + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) - u2 := model.User{} - u2.TeamId = u1.TeamId + u2 := &model.User{} u2.Email = model.NewId() - Must(store.User().Save(&u2)) + Must(store.User().Save(u2)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id})) if r1 := <-store.User().GetSystemAdminProfiles(); r1.Err != nil { t.Fatal(r1.Err) @@ -303,16 +401,18 @@ func TestUserStoreGetSystemAdminProfiles(t *testing.T) { func TestUserStoreGetByEmail(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + teamid := model.NewId() + + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamid, UserId: u1.Id})) - if err := (<-store.User().GetByEmail(u1.TeamId, u1.Email)).Err; err != nil { + if err := (<-store.User().GetByEmail(u1.Email)).Err; err != nil { t.Fatal(err) } - if err := (<-store.User().GetByEmail("", "")).Err; err == nil { + if err := (<-store.User().GetByEmail("")).Err; err == nil { t.Fatal("Should have failed because of missing email") } } @@ -320,18 +420,20 @@ func TestUserStoreGetByEmail(t *testing.T) { func TestUserStoreGetByAuthData(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + teamId := model.NewId() + + u1 := &model.User{} u1.Email = model.NewId() - u1.AuthData = "123" + u1.AuthData = "123" + model.NewId() u1.AuthService = "service" - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) - if err := (<-store.User().GetByAuth(u1.TeamId, u1.AuthData, u1.AuthService)).Err; err != nil { + if err := (<-store.User().GetByAuth(u1.AuthData, u1.AuthService)).Err; err != nil { t.Fatal(err) } - if err := (<-store.User().GetByAuth("", "", "")).Err; err == nil { + if err := (<-store.User().GetByAuth("", "")).Err; err == nil { t.Fatal("Should have failed because of missing auth data") } } @@ -339,17 +441,19 @@ func TestUserStoreGetByAuthData(t *testing.T) { func TestUserStoreGetByUsername(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + teamId := model.NewId() + + u1 := &model.User{} u1.Email = model.NewId() u1.Username = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) - if err := (<-store.User().GetByUsername(u1.TeamId, u1.Username)).Err; err != nil { + if err := (<-store.User().GetByUsername(u1.Username)).Err; err != nil { t.Fatal(err) } - if err := (<-store.User().GetByUsername("", "")).Err; err == nil { + if err := (<-store.User().GetByUsername("")).Err; err == nil { t.Fatal("Should have failed because of missing username") } } @@ -357,10 +461,12 @@ func TestUserStoreGetByUsername(t *testing.T) { func TestUserStoreUpdatePassword(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + teamId := model.NewId() + + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) hashedPassword := model.HashPassword("newpwd") @@ -368,7 +474,7 @@ func TestUserStoreUpdatePassword(t *testing.T) { t.Fatal(err) } - if r1 := <-store.User().GetByEmail(u1.TeamId, u1.Email); r1.Err != nil { + if r1 := <-store.User().GetByEmail(u1.Email); r1.Err != nil { t.Fatal(r1.Err) } else { user := r1.Data.(*model.User) @@ -381,10 +487,10 @@ func TestUserStoreUpdatePassword(t *testing.T) { func TestUserStoreDelete(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) if err := (<-store.User().PermanentDelete(u1.Id)).Err; err != nil { t.Fatal(err) @@ -394,10 +500,12 @@ func TestUserStoreDelete(t *testing.T) { func TestUserStoreUpdateAuthData(t *testing.T) { Setup() - u1 := model.User{} - u1.TeamId = model.NewId() + teamId := model.NewId() + + u1 := &model.User{} u1.Email = model.NewId() - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) service := "someservice" authData := "1" @@ -406,7 +514,7 @@ func TestUserStoreUpdateAuthData(t *testing.T) { t.Fatal(err) } - if r1 := <-store.User().GetByEmail(u1.TeamId, u1.Email); r1.Err != nil { + if r1 := <-store.User().GetByEmail(u1.Email); r1.Err != nil { t.Fatal(r1.Err) } else { user := r1.Data.(*model.User) @@ -430,26 +538,26 @@ func TestUserUnreadCount(t *testing.T) { c1 := model.Channel{} c1.TeamId = teamId c1.DisplayName = "Unread Messages" - c1.Name = "unread-messages" + c1.Name = "unread-messages-" + model.NewId() c1.Type = model.CHANNEL_OPEN c2 := model.Channel{} c2.TeamId = teamId c2.DisplayName = "Unread Direct" - c2.Name = "unread-direct" + c2.Name = "unread-direct-" + model.NewId() c2.Type = model.CHANNEL_DIRECT - u1 := model.User{} + u1 := &model.User{} + u1.Username = "user1" + model.NewId() u1.Email = model.NewId() - u1.Username = "user1" - u1.TeamId = teamId - Must(store.User().Save(&u1)) + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) - u2 := model.User{} + u2 := &model.User{} u2.Email = model.NewId() - u2.Username = "user2" - u2.TeamId = teamId - Must(store.User().Save(&u2)) + u2.Username = "user2" + model.NewId() + Must(store.User().Save(u2)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id})) if err := (<-store.Channel().Save(&c1)).Err; err != nil { t.Fatal("couldn't save item", err) @@ -507,7 +615,6 @@ func TestUserStoreUpdateMfaSecret(t *testing.T) { Setup() u1 := model.User{} - u1.TeamId = model.NewId() u1.Email = model.NewId() Must(store.User().Save(&u1)) @@ -527,7 +634,6 @@ func TestUserStoreUpdateMfaActive(t *testing.T) { Setup() u1 := model.User{} - u1.TeamId = model.NewId() u1.Email = model.NewId() Must(store.User().Save(&u1)) -- cgit v1.2.3-1-g7c22