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, 42 insertions, 27 deletions

diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go
index 2213aa795..1b3ea6fe5 100644
--- a/store/sql_channel_store_test.go
+++ b/store/sql_channel_store_test.go
@@ -67,17 +67,17 @@ func TestChannelStoreSaveDirectChannel(t *testing.T) {
 	o1.Name = "a" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_DIRECT
 
-	u1 := model.User{}
-	u1.TeamId = model.NewId()
+	u1 := &model.User{}
 	u1.Email = model.NewId()
 	u1.Nickname = model.NewId()
-	Must(store.User().Save(&u1))
+	Must(store.User().Save(u1))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}))
 
-	u2 := model.User{}
-	u2.TeamId = model.NewId()
+	u2 := &model.User{}
 	u2.Email = model.NewId()
 	u2.Nickname = model.NewId()
-	Must(store.User().Save(&u2))
+	Must(store.User().Save(u2))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}))
 
 	m1 := model.ChannelMember{}
 	m1.ChannelId = o1.Id
@@ -163,17 +163,17 @@ func TestChannelStoreGet(t *testing.T) {
 		t.Fatal("Missing id should have failed")
 	}
 
-	u1 := model.User{}
-	u1.TeamId = model.NewId()
+	u1 := &model.User{}
 	u1.Email = model.NewId()
 	u1.Nickname = model.NewId()
-	Must(store.User().Save(&u1))
+	Must(store.User().Save(u1))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}))
 
 	u2 := model.User{}
-	u2.TeamId = model.NewId()
 	u2.Email = model.NewId()
 	u2.Nickname = model.NewId()
 	Must(store.User().Save(&u2))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}))
 
 	o2 := model.Channel{}
 	o2.TeamId = model.NewId()
@@ -309,16 +309,16 @@ func TestChannelMemberStore(t *testing.T) {
 	t1 := c1t1.ExtraUpdateAt
 
 	u1 := model.User{}
-	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
 	u1.Nickname = model.NewId()
 	Must(store.User().Save(&u1))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}))
 
 	u2 := model.User{}
-	u2.TeamId = model.NewId()
 	u2.Email = model.NewId()
 	u2.Nickname = model.NewId()
 	Must(store.User().Save(&u2))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}))
 
 	o1 := model.ChannelMember{}
 	o1.ChannelId = c1.Id
@@ -405,16 +405,16 @@ func TestChannelDeleteMemberStore(t *testing.T) {
 	t1 := c1t1.ExtraUpdateAt
 
 	u1 := model.User{}
-	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
 	u1.Nickname = model.NewId()
 	Must(store.User().Save(&u1))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}))
 
 	u2 := model.User{}
-	u2.TeamId = model.NewId()
 	u2.Email = model.NewId()
 	u2.Nickname = model.NewId()
 	Must(store.User().Save(&u2))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}))
 
 	o1 := model.ChannelMember{}
 	o1.ChannelId = c1.Id
@@ -469,6 +469,11 @@ func TestChannelStorePermissionsTo(t *testing.T) {
 		t.Fatal("should have permissions")
 	}
 
+	count = (<-store.Channel().CheckPermissionsToNoTeam(o1.Id, m1.UserId)).Data.(int64)
+	if count != 1 {
+		t.Fatal("should have permissions")
+	}
+
 	count = (<-store.Channel().CheckPermissionsTo("junk", o1.Id, m1.UserId)).Data.(int64)
 	if count != 0 {
 		t.Fatal("shouldn't have permissions")
@@ -479,11 +484,21 @@ func TestChannelStorePermissionsTo(t *testing.T) {
 		t.Fatal("shouldn't have permissions")
 	}
 
+	count = (<-store.Channel().CheckPermissionsToNoTeam("junk", m1.UserId)).Data.(int64)
+	if count != 0 {
+		t.Fatal("shouldn't have permissions")
+	}
+
 	count = (<-store.Channel().CheckPermissionsTo(o1.TeamId, o1.Id, "junk")).Data.(int64)
 	if count != 0 {
 		t.Fatal("shouldn't have permissions")
 	}
 
+	count = (<-store.Channel().CheckPermissionsToNoTeam(o1.Id, "junk")).Data.(int64)
+	if count != 0 {
+		t.Fatal("shouldn't have permissions")
+	}
+
 	channelId := (<-store.Channel().CheckPermissionsToByName(o1.TeamId, o1.Name, m1.UserId)).Data.(string)
 	if channelId != o1.Id {
 		t.Fatal("should have permissions")
@@ -786,12 +801,12 @@ func TestGetMemberCount(t *testing.T) {
 
 	t.Logf("c1.Id = %v", c1.Id)
 
-	u1 := model.User{
-		TeamId:   teamId,
+	u1 := &model.User{
 		Email:    model.NewId(),
 		DeleteAt: 0,
 	}
-	Must(store.User().Save(&u1))
+	Must(store.User().Save(u1))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}))
 
 	m1 := model.ChannelMember{
 		ChannelId:   c1.Id,
@@ -807,11 +822,11 @@ func TestGetMemberCount(t *testing.T) {
 	}
 
 	u2 := model.User{
-		TeamId:   teamId,
 		Email:    model.NewId(),
 		DeleteAt: 0,
 	}
 	Must(store.User().Save(&u2))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}))
 
 	m2 := model.ChannelMember{
 		ChannelId:   c1.Id,
@@ -828,11 +843,11 @@ func TestGetMemberCount(t *testing.T) {
 
 	// make sure members of other channels aren't counted
 	u3 := model.User{
-		TeamId:   teamId,
 		Email:    model.NewId(),
 		DeleteAt: 0,
 	}
 	Must(store.User().Save(&u3))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}))
 
 	m3 := model.ChannelMember{
 		ChannelId:   c2.Id,
@@ -848,12 +863,12 @@ func TestGetMemberCount(t *testing.T) {
 	}
 
 	// make sure inactive users aren't counted
-	u4 := model.User{
-		TeamId:   teamId,
+	u4 := &model.User{
 		Email:    model.NewId(),
 		DeleteAt: 10000,
 	}
-	Must(store.User().Save(&u4))
+	Must(store.User().Save(u4))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}))
 
 	m4 := model.ChannelMember{
 		ChannelId:   c1.Id,
@@ -892,12 +907,12 @@ func TestUpdateExtrasByUser(t *testing.T) {
 
 	t.Logf("c1.Id = %v", c1.Id)
 
-	u1 := model.User{
-		TeamId:   teamId,
+	u1 := &model.User{
 		Email:    model.NewId(),
 		DeleteAt: 0,
 	}
-	Must(store.User().Save(&u1))
+	Must(store.User().Save(u1))
+	Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}))
 
 	m1 := model.ChannelMember{
 		ChannelId:   c1.Id,
@@ -907,7 +922,7 @@ func TestUpdateExtrasByUser(t *testing.T) {
 	Must(store.Channel().SaveMember(&m1))
 
 	u1.DeleteAt = model.GetMillis()
-	Must(store.User().Update(&u1, true))
+	Must(store.User().Update(u1, true))
 
 	if result := <-store.Channel().ExtraUpdateByUser(u1.Id, u1.DeleteAt); result.Err != nil {
 		t.Fatal("failed to update extras by user: %v", result.Err)
@@ -920,7 +935,7 @@ func TestUpdateExtrasByUser(t *testing.T) {
 	}
 
 	u1.DeleteAt = 0
-	Must(store.User().Update(&u1, true))
+	Must(store.User().Update(u1, true))
 
 	if result := <-store.Channel().ExtraUpdateByUser(u1.Id, u1.DeleteAt); result.Err != nil {
 		t.Fatal("failed to update extras by user: %v", result.Err)