From f448cccddb8a2a0a3be0bd73bb307c533f1293b3 Mon Sep 17 00:00:00 2001
From: Luciano Marcos Pierdona Junior
 <64279791+LucianoPierdona@users.noreply.github.com>
Date: Wed, 29 Jun 2022 18:10:41 -0300
Subject: [PATCH] [FIX] Update subscription on update team member (#25855)

<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->

<!-- Your Pull Request name should start with one of the following tags
  [NEW] For new features
  [IMPROVE] For an improvement (performance or little improvements) in existing features
  [FIX] For bug fixes that affect the end-user
  [BREAK] For pull requests including breaking changes
  Chore: For small tasks
  Doc: For documentation
-->

<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
  - I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
  - I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
  - Lint and unit tests pass locally with my changes
  - I have added tests that prove my fix is effective or that my feature works (if applicable)
  - I have added necessary documentation (if applicable)
  - Any dependent changes have been merged and published in downstream modules
-->

## Proposed changes (including videos or screenshots)
<!-- CHANGELOG -->
<!--
  Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
  If it fixes a bug or resolves a feature request, be sure to link to that issue below.
  This description will appear in the release notes if we accept the contribution.
-->

Added update to subscription when a team member is updated on `teams.updateMember`

<!-- END CHANGELOG -->

## Issue(s)
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->

## Steps to test or reproduce
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->

## Further comments
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
---
 apps/meteor/server/services/team/service.ts | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/apps/meteor/server/services/team/service.ts b/apps/meteor/server/services/team/service.ts
index 5a82ca83452..5ef21aadb50 100644
--- a/apps/meteor/server/services/team/service.ts
+++ b/apps/meteor/server/services/team/service.ts
@@ -701,7 +701,24 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 			roles: member.roles ? member.roles : [],
 		};
 
-		await TeamMember.updateOneByUserIdAndTeamId(member.userId, teamId, memberUpdate);
+		const team = await Team.findOneById(teamId);
+
+		if (!team) {
+			throw new Error('invalid-team');
+		}
+
+		await Promise.all([
+			TeamMember.updateOneByUserIdAndTeamId(member.userId, teamId, memberUpdate),
+			Subscriptions.updateOne(
+				{
+					'rid': team?.roomId,
+					'u._id': member.userId,
+				},
+				{
+					$set: memberUpdate,
+				},
+			),
+		]);
 	}
 
 	async removeMember(teamId: string, userId: string): Promise<void> {