Marks the RemoteTeamId field of RemoteClusters as deprecated (#27364)

* Marks the RemoteTeamId field of RemoteClusters as deprecated The `RemoteTeamId` was used both in the `RemoteCluster` model and as part of remote invites. It existed so two different remotes could have multiple secure connections between them, and have each of those connections scoped to a team, sharing through each only the channels that belong to their corresponding team. The way that we're thinking on the feature currently only contemplates one secure connection between two servers, and shares all the channels through that secure connection, so this field is no longer needed. As we don't have a system in place for the user to choose in which team a channel should be created from an invite, this change adds a mechanism that checks the invite for a teamId, and if it's not present, fetches a team from the database to create the channel into. This makes the change backwards compatible for secure connections that already have an established behavior and allows us to move forward with the implementation of an alternative. * Mark invite teamId field as deprecated --------- Co-authored-by: Mattermost Build <build@mattermost.com>
2024-06-22 23:08:55 +02:00
--- a/server/channels/api4/shared_channel_test.go
+++ b/server/channels/api4/shared_channel_test.go
@@ -108,11 +108,10 @@ func TestGetRemoteClusterById(t *testing.T) {

 	// create a remote cluster
 	rc := &model.RemoteCluster{
-		RemoteId:     model.NewId(),
-		Name:         "Test1",
-		RemoteTeamId: model.NewId(),
-		SiteURL:      model.NewId(),
-		CreatorId:    model.NewId(),
+		RemoteId:  model.NewId(),
+		Name:      "Test1",
+		SiteURL:   model.NewId(),
+		CreatorId: model.NewId(),
 	}
 	rc, appErr := th.App.AddRemoteCluster(rc)
 	require.Nil(t, appErr)
--- a/server/channels/app/remote_cluster_test.go
+++ b/server/channels/app/remote_cluster_test.go
@@ -23,15 +23,14 @@ func TestAddRemoteCluster(t *testing.T) {
 	th := setupRemoteCluster(t).InitBasic()
 	defer th.TearDown()

-	t.Run("adding remote cluster with duplicate site url and remote team id", func(t *testing.T) {
+	t.Run("adding remote cluster with duplicate site url", func(t *testing.T) {
 		remoteCluster := &model.RemoteCluster{
-			RemoteTeamId: model.NewId(),
-			Name:         "test1",
-			SiteURL:      "http://www1.example.com:8065",
-			Token:        model.NewId(),
-			RemoteToken:  model.NewId(),
-			Topics:       "",
-			CreatorId:    th.BasicUser.Id,
+			Name:        "test1",
+			SiteURL:     "http://www1.example.com:8065",
+			Token:       model.NewId(),
+			RemoteToken: model.NewId(),
+			Topics:      "",
+			CreatorId:   th.BasicUser.Id,
 		}

 		_, err := th.App.AddRemoteCluster(remoteCluster)
@@ -42,60 +41,29 @@ func TestAddRemoteCluster(t *testing.T) {
 		require.NotNil(t, err, "Adding a duplicate remote cluster should error")
 		assert.Contains(t, err.Error(), i18n.T("api.remote_cluster.save_not_unique.app_error"))
 	})
-
-	t.Run("adding remote cluster with duplicate site url or remote team id is allowed", func(t *testing.T) {
-		remoteCluster := &model.RemoteCluster{
-			RemoteTeamId: model.NewId(),
-			Name:         "test2",
-			SiteURL:      "http://www2.example.com:8065",
-			Token:        model.NewId(),
-			RemoteToken:  model.NewId(),
-			Topics:       "",
-			CreatorId:    th.BasicUser.Id,
-		}
-
-		existingRemoteCluster, err := th.App.AddRemoteCluster(remoteCluster)
-		require.Nil(t, err, "Adding a remote cluster should not error")
-
-		// Same site url but different remote team id
-		remoteCluster.RemoteId = model.NewId()
-		remoteCluster.RemoteTeamId = model.NewId()
-		remoteCluster.SiteURL = existingRemoteCluster.SiteURL
-		_, err = th.App.AddRemoteCluster(remoteCluster)
-		assert.Nil(t, err, "Adding a remote cluster should not error")
-
-		// Same remote team id but different site url
-		remoteCluster.RemoteId = model.NewId()
-		remoteCluster.RemoteTeamId = existingRemoteCluster.RemoteTeamId
-		remoteCluster.SiteURL = existingRemoteCluster.SiteURL + "/new"
-		_, err = th.App.AddRemoteCluster(remoteCluster)
-		assert.Nil(t, err, "Adding a remote cluster should not error")
-	})
 }

 func TestUpdateRemoteCluster(t *testing.T) {
 	th := setupRemoteCluster(t).InitBasic()
 	defer th.TearDown()

-	t.Run("update remote cluster with an already existing site url and team id", func(t *testing.T) {
+	t.Run("update remote cluster with an already existing site url", func(t *testing.T) {
 		remoteCluster := &model.RemoteCluster{
-			RemoteTeamId: model.NewId(),
-			Name:         "test3",
-			SiteURL:      "http://www3.example.com:8065",
-			Token:        model.NewId(),
-			RemoteToken:  model.NewId(),
-			Topics:       "",
-			CreatorId:    th.BasicUser.Id,
+			Name:        "test3",
+			SiteURL:     "http://www3.example.com:8065",
+			Token:       model.NewId(),
+			RemoteToken: model.NewId(),
+			Topics:      "",
+			CreatorId:   th.BasicUser.Id,
 		}

 		otherRemoteCluster := &model.RemoteCluster{
-			RemoteTeamId: model.NewId(),
-			Name:         "test4",
-			SiteURL:      "http://www4.example.com:8066",
-			Token:        model.NewId(),
-			RemoteToken:  model.NewId(),
-			Topics:       "",
-			CreatorId:    th.BasicUser.Id,
+			Name:        "test4",
+			SiteURL:     "http://www4.example.com:8066",
+			Token:       model.NewId(),
+			RemoteToken: model.NewId(),
+			Topics:      "",
+			CreatorId:   th.BasicUser.Id,
 		}

 		_, err := th.App.AddRemoteCluster(remoteCluster)
@@ -105,31 +73,28 @@ func TestUpdateRemoteCluster(t *testing.T) {
 		require.Nil(t, err, "Adding a remote cluster should not error")

 		savedRemoteClustered.SiteURL = remoteCluster.SiteURL
-		savedRemoteClustered.RemoteTeamId = remoteCluster.RemoteTeamId
 		_, err = th.App.UpdateRemoteCluster(savedRemoteClustered)
 		require.NotNil(t, err, "Updating remote cluster with duplicate site url should error")
 		assert.Contains(t, err.Error(), i18n.T("api.remote_cluster.update_not_unique.app_error"))
 	})

-	t.Run("update remote cluster with an already existing site url or team id, is allowed", func(t *testing.T) {
+	t.Run("update remote cluster with an already existing site url, is not allowed", func(t *testing.T) {
 		remoteCluster := &model.RemoteCluster{
-			RemoteTeamId: model.NewId(),
-			Name:         "test5",
-			SiteURL:      "http://www5.example.com:8065",
-			Token:        model.NewId(),
-			RemoteToken:  model.NewId(),
-			Topics:       "",
-			CreatorId:    th.BasicUser.Id,
+			Name:        "test5",
+			SiteURL:     "http://www5.example.com:8065",
+			Token:       model.NewId(),
+			RemoteToken: model.NewId(),
+			Topics:      "",
+			CreatorId:   th.BasicUser.Id,
 		}

 		otherRemoteCluster := &model.RemoteCluster{
-			RemoteTeamId: model.NewId(),
-			Name:         "test6",
-			SiteURL:      "http://www6.example.com:8065",
-			Token:        model.NewId(),
-			RemoteToken:  model.NewId(),
-			Topics:       "",
-			CreatorId:    th.BasicUser.Id,
+			Name:        "test6",
+			SiteURL:     "http://www6.example.com:8065",
+			Token:       model.NewId(),
+			RemoteToken: model.NewId(),
+			Topics:      "",
+			CreatorId:   th.BasicUser.Id,
 		}

 		existingRemoteCluster, err := th.App.AddRemoteCluster(remoteCluster)
@@ -138,16 +103,10 @@ func TestUpdateRemoteCluster(t *testing.T) {
 		anotherExistingRemoteClustered, err := th.App.AddRemoteCluster(otherRemoteCluster)
 		require.Nil(t, err, "Adding a remote cluster should not error")

-		// Same site url but different remote team id
+		// Same site url
 		anotherExistingRemoteClustered.SiteURL = existingRemoteCluster.SiteURL
-		anotherExistingRemoteClustered.RemoteTeamId = model.NewId()
 		_, err = th.App.UpdateRemoteCluster(anotherExistingRemoteClustered)
-		assert.Nil(t, err, "Updating remote cluster should not error")
-
-		// Same remote team id but different site url
-		anotherExistingRemoteClustered.SiteURL = existingRemoteCluster.SiteURL + "/new"
-		anotherExistingRemoteClustered.RemoteTeamId = existingRemoteCluster.RemoteTeamId
-		_, err = th.App.UpdateRemoteCluster(anotherExistingRemoteClustered)
-		assert.Nil(t, err, "Updating remote cluster should not error")
+		require.NotNil(t, err, "Updating remote cluster should error")
+		assert.Contains(t, err.Error(), i18n.T("api.remote_cluster.update_not_unique.app_error"))
 	})
 }
--- a/server/channels/app/session_test.go
+++ b/server/channels/app/session_test.go
@@ -370,11 +370,10 @@ func TestGetRemoteClusterSession(t *testing.T) {
 	remoteID := model.NewId()

 	rc := model.RemoteCluster{
-		RemoteId:     remoteID,
-		RemoteTeamId: model.NewId(),
-		Name:         "test",
-		Token:        token,
-		CreatorId:    model.NewId(),
+		RemoteId:  remoteID,
+		Name:      "test",
+		Token:     token,
+		CreatorId: model.NewId(),
 	}

 	_, err := th.GetSqlStore().RemoteCluster().Save(&rc)
--- a/server/channels/app/slashcommands/command_remote.go
+++ b/server/channels/app/slashcommands/command_remote.go
@@ -145,10 +145,9 @@ func (rp *RemoteProvider) doCreate(a *app.App, args *model.CommandArgs, margs ma

 	// Display the encrypted invitation
 	invite := &model.RemoteClusterInvite{
-		RemoteId:     rcSaved.RemoteId,
-		RemoteTeamId: args.TeamId,
-		SiteURL:      url,
-		Token:        rcSaved.Token,
+		RemoteId: rcSaved.RemoteId,
+		SiteURL:  url,
+		Token:    rcSaved.Token,
 	}
 	encrypted, err := invite.Encrypt(password)
 	if err != nil {
--- a/server/channels/store/storetest/shared_channel_store.go
+++ b/server/channels/store/storetest/shared_channel_store.go
@@ -698,13 +698,12 @@ func testHasRemote(t *testing.T, rctx request.CTX, ss store.Store) {

 func testGetRemoteForUser(t *testing.T, rctx request.CTX, ss store.Store) {
 	// add remotes, and users to simulated shared channels.
-	teamId := model.NewId()
 	channel, err := createSharedTestChannel(ss, rctx, "share_test_channel", true, nil)
 	require.NoError(t, err)
 	remotes := []*model.RemoteCluster{
-		{RemoteId: model.NewId(), SiteURL: model.NewId(), CreatorId: model.NewId(), RemoteTeamId: teamId, Name: "Test_Remote_1"},
-		{RemoteId: model.NewId(), SiteURL: model.NewId(), CreatorId: model.NewId(), RemoteTeamId: teamId, Name: "Test_Remote_2"},
-		{RemoteId: model.NewId(), SiteURL: model.NewId(), CreatorId: model.NewId(), RemoteTeamId: teamId, Name: "Test_Remote_3"},
+		{RemoteId: model.NewId(), SiteURL: model.NewId(), CreatorId: model.NewId(), Name: "Test_Remote_1"},
+		{RemoteId: model.NewId(), SiteURL: model.NewId(), CreatorId: model.NewId(), Name: "Test_Remote_2"},
+		{RemoteId: model.NewId(), SiteURL: model.NewId(), CreatorId: model.NewId(), Name: "Test_Remote_3"},
 	}
 	for _, rc := range remotes {
 		_, err := ss.RemoteCluster().Save(rc)