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

1 files changed, 147 insertions, 25 deletions

diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go
index 743ef053f..d5ee15bc6 100644
--- a/store/sql_team_store_test.go
+++ b/store/sql_team_store_test.go
@@ -14,7 +14,7 @@ func TestTeamStoreSave(t *testing.T) {
 
 	o1 := model.Team{}
 	o1.DisplayName = "DisplayName"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "z-z-z" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 
@@ -37,7 +37,7 @@ func TestTeamStoreUpdate(t *testing.T) {
 
 	o1 := model.Team{}
 	o1.DisplayName = "DisplayName"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "z-z-z" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 	if err := (<-store.Team().Save(&o1)).Err; err != nil {
@@ -66,7 +66,7 @@ func TestTeamStoreUpdateDisplayName(t *testing.T) {
 
 	o1 := &model.Team{}
 	o1.DisplayName = "Display Name"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "z-z-z" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 	o1 = (<-store.Team().Save(o1)).Data.(*model.Team)
@@ -88,7 +88,7 @@ func TestTeamStoreGet(t *testing.T) {
 
 	o1 := model.Team{}
 	o1.DisplayName = "DisplayName"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "z-z-z" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 	Must(store.Team().Save(&o1))
@@ -111,7 +111,7 @@ func TestTeamStoreGetByName(t *testing.T) {
 
 	o1 := model.Team{}
 	o1.DisplayName = "DisplayName"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "z-z-z" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 
@@ -137,7 +137,7 @@ func TestTeamStoreGetByIniviteId(t *testing.T) {
 
 	o1 := model.Team{}
 	o1.DisplayName = "DisplayName"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "z-z-z" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 	o1.InviteId = model.NewId()
@@ -180,33 +180,32 @@ func TestTeamStoreGetByIniviteId(t *testing.T) {
 	}
 }
 
-func TestTeamStoreGetForEmail(t *testing.T) {
+func TestTeamStoreByUserId(t *testing.T) {
 	Setup()
 
-	o1 := model.Team{}
+	o1 := &model.Team{}
 	o1.DisplayName = "DisplayName"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "z-z-z" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
-	Must(store.Team().Save(&o1))
+	o1.InviteId = model.NewId()
+	o1 = Must(store.Team().Save(o1)).(*model.Team)
 
-	u1 := model.User{}
-	u1.TeamId = o1.Id
-	u1.Email = model.NewId()
-	Must(store.User().Save(&u1))
+	m1 := &model.TeamMember{TeamId: o1.Id, UserId: model.NewId()}
+	Must(store.Team().SaveMember(m1))
 
-	if r1 := <-store.Team().GetTeamsForEmail(u1.Email); r1.Err != nil {
+	if r1 := <-store.Team().GetTeamsByUserId(m1.UserId); r1.Err != nil {
 		t.Fatal(r1.Err)
 	} else {
 		teams := r1.Data.([]*model.Team)
+		if len(teams) == 0 {
+			t.Fatal("Should return a team")
+		}
 
 		if teams[0].Id != o1.Id {
-			t.Fatal("failed to lookup by email")
+			t.Fatal("should be a member")
 		}
-	}
 
-	if r1 := <-store.Team().GetTeamsForEmail("missing"); r1.Err != nil {
-		t.Fatal(r1.Err)
 	}
 }
 
@@ -215,10 +214,10 @@ func TestAllTeamListing(t *testing.T) {
 
 	o1 := model.Team{}
 	o1.DisplayName = "DisplayName"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "z-z-z" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
-	o1.AllowTeamListing = true
+	o1.AllowOpenInvite = true
 	Must(store.Team().Save(&o1))
 
 	o2 := model.Team{}
@@ -244,10 +243,10 @@ func TestDelete(t *testing.T) {
 
 	o1 := model.Team{}
 	o1.DisplayName = "DisplayName"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "z-z-z" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
-	o1.AllowTeamListing = true
+	o1.AllowOpenInvite = true
 	Must(store.Team().Save(&o1))
 
 	o2 := model.Team{}
@@ -267,10 +266,10 @@ func TestTeamCount(t *testing.T) {
 
 	o1 := model.Team{}
 	o1.DisplayName = "DisplayName"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "z-z-z" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
-	o1.AllowTeamListing = true
+	o1.AllowOpenInvite = true
 	Must(store.Team().Save(&o1))
 
 	if r1 := <-store.Team().AnalyticsTeamCount(); r1.Err != nil {
@@ -281,3 +280,126 @@ func TestTeamCount(t *testing.T) {
 		}
 	}
 }
+
+func TestTeamMembers(t *testing.T) {
+	Setup()
+
+	teamId1 := model.NewId()
+	teamId2 := model.NewId()
+
+	m1 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()}
+	m2 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()}
+	m3 := &model.TeamMember{TeamId: teamId2, UserId: model.NewId()}
+
+	if r1 := <-store.Team().SaveMember(m1); r1.Err != nil {
+		t.Fatal(r1.Err)
+	}
+
+	Must(store.Team().SaveMember(m2))
+	Must(store.Team().SaveMember(m3))
+
+	if r1 := <-store.Team().GetMembers(teamId1); r1.Err != nil {
+		t.Fatal(r1.Err)
+	} else {
+		ms := r1.Data.([]*model.TeamMember)
+
+		if len(ms) != 2 {
+			t.Fatal()
+		}
+	}
+
+	if r1 := <-store.Team().GetMembers(teamId2); r1.Err != nil {
+		t.Fatal(r1.Err)
+	} else {
+		ms := r1.Data.([]*model.TeamMember)
+
+		if len(ms) != 1 {
+			t.Fatal()
+		}
+
+		if ms[0].UserId != m3.UserId {
+			t.Fatal()
+
+		}
+	}
+
+	if r1 := <-store.Team().GetTeamsForUser(m1.UserId); r1.Err != nil {
+		t.Fatal(r1.Err)
+	} else {
+		ms := r1.Data.([]*model.TeamMember)
+
+		if len(ms) != 1 {
+			t.Fatal()
+		}
+
+		if ms[0].TeamId != m1.TeamId {
+			t.Fatal()
+
+		}
+	}
+
+	if r1 := <-store.Team().RemoveMember(teamId1, m1.UserId); r1.Err != nil {
+		t.Fatal(r1.Err)
+	}
+
+	if r1 := <-store.Team().GetMembers(teamId1); r1.Err != nil {
+		t.Fatal(r1.Err)
+	} else {
+		ms := r1.Data.([]*model.TeamMember)
+
+		if len(ms) != 1 {
+			t.Fatal()
+		}
+
+		if ms[0].UserId != m2.UserId {
+			t.Fatal()
+
+		}
+	}
+
+	Must(store.Team().SaveMember(m1))
+
+	if r1 := <-store.Team().RemoveAllMembersByTeam(teamId1); r1.Err != nil {
+		t.Fatal(r1.Err)
+	}
+
+	if r1 := <-store.Team().GetMembers(teamId1); r1.Err != nil {
+		t.Fatal(r1.Err)
+	} else {
+		ms := r1.Data.([]*model.TeamMember)
+
+		if len(ms) != 0 {
+			t.Fatal()
+		}
+	}
+
+	uid := model.NewId()
+	m4 := &model.TeamMember{TeamId: teamId1, UserId: uid}
+	m5 := &model.TeamMember{TeamId: teamId2, UserId: uid}
+	Must(store.Team().SaveMember(m4))
+	Must(store.Team().SaveMember(m5))
+
+	if r1 := <-store.Team().GetTeamsForUser(uid); r1.Err != nil {
+		t.Fatal(r1.Err)
+	} else {
+		ms := r1.Data.([]*model.TeamMember)
+
+		if len(ms) != 2 {
+			t.Fatal()
+		}
+	}
+
+	if r1 := <-store.Team().RemoveAllMembersByUser(uid); r1.Err != nil {
+		t.Fatal(r1.Err)
+	}
+
+	if r1 := <-store.Team().GetTeamsForUser(m1.UserId); r1.Err != nil {
+		t.Fatal(r1.Err)
+	} else {
+		ms := r1.Data.([]*model.TeamMember)
+
+		if len(ms) != 0 {
+			t.Fatal()
+		}
+	}
+}