MM-14412: Enables force removals of team/channel members base on group constraints. (#10490)

* MM-14412: Enables force removals of team/channel members base on group constraints.

* Renames some existing methods and variables.

* Change return types to ChannelMembers and TeamMembers for some existing methods.

* Adds option to change LDAP_DATA to either 'qa' or 'test' with env variable.

* Adds methods to retrieve ChannelMembers and TeamMembers that, based on group constraints, should be deleted.

* Adds helper functions to create GroupTeams and GroupChannels.

* MM-14412: Switches to helper methods for GroupSyncable creation in test files.

* MM-14412: Style fix.

* MM-14412: Switches remaining GroupSyncable instances to be created with helper functions.

* MM-14412: Typo fix.

* MM-11412: Build fixes.

* MM-14412: Checks if user is team member before re-adding.

* MM-14412: Update for change of GroupConstrained fields type.

app/syncables.go

@@ -7,15 +7,15 @@ import (
 	"github.com/mattermost/mattermost-server/mlog"
 )
 
-// PopulateSyncablesSince adds users to teams and channels based on their group memberships and how those groups are
+// CreateDefaultMemberships adds users to teams and channels based on their group memberships and how those groups are
 // configured to sync with teams and channels for group members on or after the given timestamp.
-func (a *App) PopulateSyncablesSince(groupMembersCreatedAfter int64) error {
-	userTeamIDs, appErr := a.PendingAutoAddTeamMembers(groupMembersCreatedAfter)
+func (a *App) CreateDefaultMemberships(since int64) error {
+	teamMembers, appErr := a.TeamMembersToAdd(since)
 	if appErr != nil {
 		return appErr
 	}
 
-	for _, userTeam := range userTeamIDs {
+	for _, userTeam := range teamMembers {
 		_, err := a.AddTeamMember(userTeam.TeamID, userTeam.UserID)
 		if err != nil {
 			return err
@@ -27,26 +27,33 @@ func (a *App) PopulateSyncablesSince(groupMembersCreatedAfter int64) error {
 		)
 	}
 
-	userChannelIDs, appErr := a.PendingAutoAddChannelMembers(groupMembersCreatedAfter)
+	channelMembers, appErr := a.ChannelMembersToAdd(since)
 	if appErr != nil {
 		return appErr
 	}
 
-	for _, userChannel := range userChannelIDs {
+	for _, userChannel := range channelMembers {
 		channel, err := a.GetChannel(userChannel.ChannelID)
 		if err != nil {
 			return err
 		}
 
-		// First add user to team
-		_, err = a.AddTeamMember(channel.TeamId, userChannel.UserID)
-		if err != nil {
+		tmem, err := a.GetTeamMember(channel.TeamId, userChannel.UserID)
+		if err != nil && err.Id != "store.sql_team.get_member.missing.app_error" {
 			return err
 		}
-		a.Log.Info("added teammember",
-			mlog.String("user_id", userChannel.UserID),
-			mlog.String("team_id", channel.TeamId),
-		)
+
+		// First add user to team
+		if tmem == nil {
+			_, err = a.AddTeamMember(channel.TeamId, userChannel.UserID)
+			if err != nil {
+				return err
+			}
+			a.Log.Info("added teammember",
+				mlog.String("user_id", userChannel.UserID),
+				mlog.String("team_id", channel.TeamId),
+			)
+		}
 
 		_, err = a.AddChannelMember(userChannel.UserID, channel, "", "", "")
 		if err != nil {
@@ -61,3 +68,48 @@ func (a *App) PopulateSyncablesSince(groupMembersCreatedAfter int64) error {
 
 	return nil
 }
+
+// DeleteGroupConstrainedMemberships deletes team and channel memberships of users who aren't members of the allowed
+// groups of all group-constrained teams and channels.
+func (a *App) DeleteGroupConstrainedMemberships() error {
+	channelMembers, appErr := a.ChannelMembersToRemove()
+	if appErr != nil {
+		return appErr
+	}
+
+	for _, userChannel := range channelMembers {
+		channel, err := a.GetChannel(userChannel.ChannelId)
+		if err != nil {
+			return err
+		}
+
+		err = a.RemoveUserFromChannel(userChannel.UserId, "", channel)
+		if err != nil {
+			return err
+		}
+
+		a.Log.Info("removed channelmember",
+			mlog.String("user_id", userChannel.UserId),
+			mlog.String("channel_id", channel.Id),
+		)
+	}
+
+	teamMembers, appErr := a.TeamMembersToRemove()
+	if appErr != nil {
+		return appErr
+	}
+
+	for _, userTeam := range teamMembers {
+		err := a.RemoveUserFromTeam(userTeam.TeamId, userTeam.UserId, "")
+		if err != nil {
+			return err
+		}
+
+		a.Log.Info("removed teammember",
+			mlog.String("user_id", userTeam.UserId),
+			mlog.String("team_id", userTeam.TeamId),
+		)
+	}
+
+	return nil
+}