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, 2 insertions, 22 deletions

diff --git a/store/sql_session_store_test.go b/store/sql_session_store_test.go
index 506695f0e..d7f07254d 100644
--- a/store/sql_session_store_test.go
+++ b/store/sql_session_store_test.go
@@ -13,7 +13,6 @@ func TestSessionStoreSave(t *testing.T) {
 
 	s1 := model.Session{}
 	s1.UserId = model.NewId()
-	s1.TeamId = model.NewId()
 
 	if err := (<-store.Session().Save(&s1)).Err; err != nil {
 		t.Fatal(err)
@@ -25,17 +24,14 @@ func TestSessionGet(t *testing.T) {
 
 	s1 := model.Session{}
 	s1.UserId = model.NewId()
-	s1.TeamId = model.NewId()
 	Must(store.Session().Save(&s1))
 
 	s2 := model.Session{}
 	s2.UserId = s1.UserId
-	s2.TeamId = s1.TeamId
 	Must(store.Session().Save(&s2))
 
 	s3 := model.Session{}
 	s3.UserId = s1.UserId
-	s3.TeamId = s1.TeamId
 	s3.ExpiresAt = 1
 	Must(store.Session().Save(&s3))
 
@@ -62,7 +58,6 @@ func TestSessionRemove(t *testing.T) {
 
 	s1 := model.Session{}
 	s1.UserId = model.NewId()
-	s1.TeamId = model.NewId()
 	Must(store.Session().Save(&s1))
 
 	if rs1 := (<-store.Session().Get(s1.Id)); rs1.Err != nil {
@@ -85,7 +80,6 @@ func TestSessionRemoveAll(t *testing.T) {
 
 	s1 := model.Session{}
 	s1.UserId = model.NewId()
-	s1.TeamId = model.NewId()
 	Must(store.Session().Save(&s1))
 
 	if rs1 := (<-store.Session().Get(s1.Id)); rs1.Err != nil {
@@ -96,7 +90,7 @@ func TestSessionRemoveAll(t *testing.T) {
 		}
 	}
 
-	Must(store.Session().RemoveAllSessionsForTeam(s1.TeamId))
+	Must(store.Session().RemoveAllSessions())
 
 	if rs2 := (<-store.Session().Get(s1.Id)); rs2.Err == nil {
 		t.Fatal("should have been removed")
@@ -108,7 +102,6 @@ func TestSessionRemoveByUser(t *testing.T) {
 
 	s1 := model.Session{}
 	s1.UserId = model.NewId()
-	s1.TeamId = model.NewId()
 	Must(store.Session().Save(&s1))
 
 	if rs1 := (<-store.Session().Get(s1.Id)); rs1.Err != nil {
@@ -131,7 +124,6 @@ func TestSessionRemoveToken(t *testing.T) {
 
 	s1 := model.Session{}
 	s1.UserId = model.NewId()
-	s1.TeamId = model.NewId()
 	Must(store.Session().Save(&s1))
 
 	if rs1 := (<-store.Session().Get(s1.Id)); rs1.Err != nil {
@@ -162,7 +154,6 @@ func TestSessionUpdateDeviceId(t *testing.T) {
 
 	s1 := model.Session{}
 	s1.UserId = model.NewId()
-	s1.TeamId = model.NewId()
 	Must(store.Session().Save(&s1))
 
 	if rs1 := (<-store.Session().UpdateDeviceId(s1.Id, model.PUSH_NOTIFY_APPLE+":1234567890")); rs1.Err != nil {
@@ -171,7 +162,6 @@ func TestSessionUpdateDeviceId(t *testing.T) {
 
 	s2 := model.Session{}
 	s2.UserId = model.NewId()
-	s2.TeamId = model.NewId()
 	Must(store.Session().Save(&s2))
 
 	if rs2 := (<-store.Session().UpdateDeviceId(s2.Id, model.PUSH_NOTIFY_APPLE+":1234567890")); rs2.Err != nil {
@@ -184,7 +174,6 @@ func TestSessionStoreUpdateLastActivityAt(t *testing.T) {
 
 	s1 := model.Session{}
 	s1.UserId = model.NewId()
-	s1.TeamId = model.NewId()
 	Must(store.Session().Save(&s1))
 
 	if err := (<-store.Session().UpdateLastActivityAt(s1.Id, 1234567890)).Err; err != nil {
@@ -206,23 +195,14 @@ func TestSessionCount(t *testing.T) {
 
 	s1 := model.Session{}
 	s1.UserId = model.NewId()
-	s1.TeamId = model.NewId()
 	s1.ExpiresAt = model.GetMillis() + 100000
 	Must(store.Session().Save(&s1))
 
-	if r1 := <-store.Session().AnalyticsSessionCount(""); r1.Err != nil {
+	if r1 := <-store.Session().AnalyticsSessionCount(); r1.Err != nil {
 		t.Fatal(r1.Err)
 	} else {
 		if r1.Data.(int64) == 0 {
 			t.Fatal("should have at least 1 session")
 		}
 	}
-
-	if r2 := <-store.Session().AnalyticsSessionCount(s1.TeamId); r2.Err != nil {
-		t.Fatal(r2.Err)
-	} else {
-		if r2.Data.(int64) != 1 {
-			t.Fatal("should have 1 session")
-		}
-	}
 }