MM-10570: Make permissions reset command clear custom role assignments. (#8976)

1 files changed, 15 insertions, 0 deletions

diff --git a/app/permissions.go b/app/permissions.go
index d86ceab5d..8b4df7c56 100644
--- a/app/permissions.go
+++ b/app/permissions.go
@@ -27,6 +27,21 @@ func (a *App) ResetPermissionsSystem() *model.AppError {
 		return result.Err
 	}
 
+	// Reset all Custom Role assignments to Users.
+	if result := <-a.Srv.Store.User().ClearAllCustomRoleAssignments(); result.Err != nil {
+		return result.Err
+	}
+
+	// Reset all Custom Role assignments to TeamMembers.
+	if result := <-a.Srv.Store.Team().ClearAllCustomRoleAssignments(); result.Err != nil {
+		return result.Err
+	}
+
+	// Reset all Custom Role assignments to ChannelMembers.
+	if result := <-a.Srv.Store.Channel().ClearAllCustomRoleAssignments(); result.Err != nil {
+		return result.Err
+	}
+
 	// Purge all schemes from the database.
 	if result := <-a.Srv.Store.Scheme().PermanentDeleteAll(); result.Err != nil {
 		return result.Err