From f6820d7017d2754af52baea56d29c29548863a10 Mon Sep 17 00:00:00 2001
From: Alan Sikora <alansikora@gmail.com>
Date: Thu, 29 Jul 2021 10:10:27 -0300
Subject: [PATCH 1/8] Small UI changes

---
 .../components/FederationModal/DNSRecordItem.tsx          | 4 ++--
 .../components/FederationModal/DNSRecords.tsx             | 6 +++---
 .../components/FederationModal/FederationModal.tsx        | 1 +
 .../FederationCard/components/FederationModal/styles.css  | 8 ++++++++
 4 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 client/views/admin/info/FederationCard/components/FederationModal/styles.css

diff --git a/client/views/admin/info/FederationCard/components/FederationModal/DNSRecordItem.tsx b/client/views/admin/info/FederationCard/components/FederationModal/DNSRecordItem.tsx
index d685079ad022..78faf6d3d6eb 100644
--- a/client/views/admin/info/FederationCard/components/FederationModal/DNSRecordItem.tsx
+++ b/client/views/admin/info/FederationCard/components/FederationModal/DNSRecordItem.tsx
@@ -10,8 +10,8 @@ export const DNSRecordItem: FC<{
 }> = ({ record: { status, title, expectedValue, value, hideErrorString } }) => (
 	<Box display='flex' alignItems='flex-start'>
 		{getStatusIcon(status)}
-		<Box flexDirection='column' style={{ marginTop: -2, fontWeight: 'bold', fontSize: '85%' }}>
-			{title}: {expectedValue}{' '}
+		<Box flexDirection='column' style={{ marginTop: -2, fontSize: '90%' }}>
+			<b>{title}</b>: {expectedValue}{' '}
 			{!hideErrorString && status === SectionStatus.FAILED ? `(${value || '?'})` : ''}
 		</Box>
 	</Box>
diff --git a/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx b/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx
index 3f94aca5a0d4..1816538fa1b3 100644
--- a/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx
+++ b/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx
@@ -169,7 +169,7 @@ export const DNSRecords: FC<{
 		<>
 			<DNSText text='You must add the following DNS records on your server:' />
 			<DNSText text='SRV Record (2.0.0 or newer)' />
-			<Box style={{ marginTop: 10 }}>
+			<Box style={{ marginTop: 10, marginBottom: 15 }}>
 				{srvDNSRecords.map((record: DNSRecord) => (
 					<DNSRecordItem key={record.title} record={record} />
 				))}
@@ -181,14 +181,14 @@ export const DNSRecords: FC<{
 				))}
 			</Box>
 			{legacy && (
-				<>
+				<Box style={{ marginTop: 15 }}>
 					<DNSText text='Protocol TXT Record' />
 					<Box style={{ marginTop: 10 }}>
 						{legacyTxtDNSRecords.map((record: DNSRecord) => (
 							<DNSRecordItem key={record.title} record={record} />
 						))}
 					</Box>
-				</>
+				</Box>
 			)}
 		</>
 	);
diff --git a/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx b/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
index 6ec0f24c25f5..487ec93c6be3 100644
--- a/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
+++ b/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
@@ -20,6 +20,7 @@ import { useForm } from '../../../../../../hooks/useForm';
 import { DNSRecords } from './DNSRecords';
 import InviteUsers from './InviteUsers';
 import { DNSRecordName, ResolvedDNS, TXTRecordValue } from './Types';
+import './styles.css';
 
 export const FederationModal: FC<{ onClose: () => void }> = ({
 	onClose,
diff --git a/client/views/admin/info/FederationCard/components/FederationModal/styles.css b/client/views/admin/info/FederationCard/components/FederationModal/styles.css
new file mode 100644
index 000000000000..6b794e0bc4bb
--- /dev/null
+++ b/client/views/admin/info/FederationCard/components/FederationModal/styles.css
@@ -0,0 +1,8 @@
+.rcx-tabs,
+.rcx-tabs__wrapper {
+	margin: 0 !important;
+}
+
+.rcx-tabs__item:first-child {
+	margin-left: 0 !important;
+}

From 427cb9b60d1a8d617cc738aa1c6c04737a4c6f18 Mon Sep 17 00:00:00 2001
From: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
Date: Fri, 30 Jul 2021 03:07:59 +0530
Subject: [PATCH 2/8] [FIX] Quote message not working for Livechat visitors
 (#22586)

* Fix quote message not working for livechat visitors

(cherry picked from commit 4fa4f66663d83ea57cb492b11ea0a71d6cd137b2)

* Apply suggestions from code review

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
Co-authored-by: Kevin Aleman <kevin.aleman@rocket.chat>
---
 app/oembed/server/jumpToMessage.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/oembed/server/jumpToMessage.js b/app/oembed/server/jumpToMessage.js
index 961fbb656aaf..dce3a907a271 100644
--- a/app/oembed/server/jumpToMessage.js
+++ b/app/oembed/server/jumpToMessage.js
@@ -56,7 +56,8 @@ callbacks.add('beforeSaveMessage', (msg) => {
 		// validates if user can see the message
 		// user has to belong to the room the message was first wrote in
 		const room = Rooms.findOneById(jumpToMessage.rid);
-		const canAccessRoomForUser = canAccessRoom(room, currentUser);
+		const isLiveChatRoomVisitor = !!msg.token && !!room.v?.token && msg.token === room.v.token;
+		const canAccessRoomForUser = isLiveChatRoomVisitor || canAccessRoom(room, currentUser);
 		if (!canAccessRoomForUser) {
 			return;
 		}

From 74ce6dda0ef4eadaf6888ded49c6b979488450cd Mon Sep 17 00:00:00 2001
From: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date: Thu, 29 Jul 2021 19:10:42 -0300
Subject: [PATCH 3/8] Regression: Text wrap in MarkdownTextEditor and
 PreviewText (#22798)

* fix text wrap + preview

* remove console.log

* fix

Co-authored-by: Kevin Aleman <kevin.aleman@rocket.chat>
---
 client/components/MarkdownText.tsx            |  4 +--
 .../CannedResponse/TextEditor/Textarea.tsx    |  1 +
 .../CreateCannedResponse/PreviewText.tsx      | 32 +++++++++++--------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/client/components/MarkdownText.tsx b/client/components/MarkdownText.tsx
index c567c2b343a5..d89000c6db82 100644
--- a/client/components/MarkdownText.tsx
+++ b/client/components/MarkdownText.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import dompurify from 'dompurify';
 import marked from 'marked';
-import React, { FC, useMemo } from 'react';
+import React, { ComponentProps, FC, useMemo } from 'react';
 
 import { renderMessageEmoji } from '../lib/renderMessageEmoji';
 
@@ -11,7 +11,7 @@ type MarkdownTextParams = {
 	preserveHtml: boolean;
 	parseEmoji: boolean;
 	withTruncatedText: boolean;
-};
+} & ComponentProps<typeof Box>;
 
 const documentRenderer = new marked.Renderer();
 const inlineRenderer = new marked.Renderer();
diff --git a/ee/client/omnichannel/components/CannedResponse/TextEditor/Textarea.tsx b/ee/client/omnichannel/components/CannedResponse/TextEditor/Textarea.tsx
index bcd222419a67..6307c1bf8c55 100644
--- a/ee/client/omnichannel/components/CannedResponse/TextEditor/Textarea.tsx
+++ b/ee/client/omnichannel/components/CannedResponse/TextEditor/Textarea.tsx
@@ -9,6 +9,7 @@ const Textarea = forwardRef<Element, TextareaProps>(function Textarea(props, ref
 			is='textarea'
 			ref={ref}
 			w='full'
+			style={{ wordBreak: 'normal' }}
 			rcx-box--animated
 			rcx-input-box--type={'textarea'}
 			rcx-input-box--undecorated
diff --git a/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/PreviewText.tsx b/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/PreviewText.tsx
index 7d54c3f6725b..38d1d9916376 100644
--- a/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/PreviewText.tsx
+++ b/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/PreviewText.tsx
@@ -3,19 +3,23 @@ import React, { FC, memo } from 'react';
 
 import MarkdownText from '../../../../../../../client/components/MarkdownText';
 
-const PreviewText: FC<{ text: string }> = ({ text }) => (
-	<Box
-		rows={10}
-		display='flex'
-		flexDirection='column'
-		pbs='12px'
-		pi='16px'
-		pbe='16px'
-		rcx-box--animated
-		rcx-input-box__wrapper
-	>
-		<MarkdownText content={text} parseEmoji={true} />
-	</Box>
-);
+const PreviewText: FC<{ text: string }> = ({ text }) => {
+	const textM = text.split(/\n/).join('  \n');
+
+	return (
+		<Box
+			style={{ wordBreak: 'normal' }}
+			display='flex'
+			flexDirection='column'
+			pbs='12px'
+			pi='16px'
+			pbe='16px'
+			rcx-box--animated
+			rcx-input-box__wrapper
+		>
+			<MarkdownText w='full' flexGrow={1} content={textM} parseEmoji={true} />
+		</Box>
+	);
+};
 
 export default memo(PreviewText);

From 96dfa518f224f11a1cb0d85e6c5a8bacfd47809b Mon Sep 17 00:00:00 2001
From: Alan Sikora <alansikora@gmail.com>
Date: Thu, 29 Jul 2021 19:41:46 -0300
Subject: [PATCH 4/8] Regression: Added missing translate keys for Federation
 (#22810)

---
 .../components/FederationModal/DNSRecords.tsx   | 17 +++++++++++++----
 .../FederationModal/FederationModal.tsx         | 16 +++++++++-------
 packages/rocketchat-i18n/i18n/en.i18n.json      | 11 +++++++++++
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx b/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx
index 1816538fa1b3..3324271370f7 100644
--- a/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx
+++ b/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx
@@ -2,6 +2,7 @@ import { Box } from '@rocket.chat/fuselage';
 import _ from 'lodash';
 import React, { FC } from 'react';
 
+import { useTranslation } from '../../../../../../contexts/TranslationContext';
 import { SectionStatus } from '../Section';
 import { DNSRecordItem } from './DNSRecordItem';
 import { DNSText } from './DNSText';
@@ -24,6 +25,8 @@ export const DNSRecords: FC<{
 	resolvedEntries,
 	legacy,
 }) => {
+	const t = useTranslation();
+
 	function buildDNSRecord(
 		type: DNSRecordType,
 		name: DNSRecordName | TXTRecordValue,
@@ -167,22 +170,28 @@ export const DNSRecords: FC<{
 
 	return (
 		<>
-			<DNSText text='You must add the following DNS records on your server:' />
-			<DNSText text='SRV Record (2.0.0 or newer)' />
+			<DNSText text={t('Federation_Must_add_records')} />
+			<DNSText text={t('Federation_SRV_records_2.0.0')} />
 			<Box style={{ marginTop: 10, marginBottom: 15 }}>
 				{srvDNSRecords.map((record: DNSRecord) => (
 					<DNSRecordItem key={record.title} record={record} />
 				))}
 			</Box>
-			<DNSText text='Public Key TXT Record' />
+			<DNSText text={t('Federation_Public_key_TXT_record')} />
 			<Box style={{ marginTop: 10 }}>
 				{txtDNSRecords.map((record: DNSRecord) => (
 					<DNSRecordItem key={record.title} record={record} />
 				))}
 			</Box>
+			{!legacy && (
+				<Box style={{ marginTop: 20, padding: 10, backgroundColor: '#F2F3F5' }}>
+					<p style={{ fontWeight: 'bold' }}>{t('Federation_HTTP_instead_HTTPS')}</p>
+					{t('Federation_HTTP_instead_HTTPS_details')}
+				</Box>
+			)}
 			{legacy && (
 				<Box style={{ marginTop: 15 }}>
-					<DNSText text='Protocol TXT Record' />
+					<DNSText text={t('Federation_Protocol_TXT_record')} />
 					<Box style={{ marginTop: 10 }}>
 						{legacyTxtDNSRecords.map((record: DNSRecord) => (
 							<DNSRecordItem key={record.title} record={record} />
diff --git a/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx b/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
index 487ec93c6be3..6f529c9e43ef 100644
--- a/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
+++ b/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
@@ -163,10 +163,10 @@ export const FederationModal: FC<{ onClose: () => void }> = ({
 					<Modal.Content>
 						<Tabs>
 							<Tabs.Item selected={currentTab === 1} onClick={(): void => setCurrentTab(1)}>
-								Configure DNS
+								{t('Federation_Configure_DNS')}
 							</Tabs.Item>
 							<Tabs.Item selected={currentTab === 2} onClick={(): void => setCurrentTab(2)}>
-								Legacy Support
+								{t('Federation_Legacy_support')}
 							</Tabs.Item>
 						</Tabs>
 						<Box style={{ marginTop: 30 }}>
@@ -183,11 +183,8 @@ export const FederationModal: FC<{ onClose: () => void }> = ({
 							{currentTab === 2 && (
 								<>
 									<Box style={{ marginBottom: 15 }}>
-										<b>If your DNS provider does not support SRV records with _http or _https</b>
-										<p style={{ marginTop: 8 }}>
-											Some DNS providers will not allow setting _https or _http on SRV records, so
-											we have support for those cases, using our old DNS record resolution method.
-										</p>
+										<b>{t('Federation_SRV_no_support')}</b>
+										<p style={{ marginTop: 8 }}>{t('Federation_SRV_no_support_details')}</p>
 									</Box>
 									<DNSRecords
 										federationSubdomain={federationSubdomain}
@@ -216,6 +213,11 @@ export const FederationModal: FC<{ onClose: () => void }> = ({
 				</>
 			)}
 			<Modal.Footer>
+				{currentStep === 2 && (
+					<Box style={{ color: '#6C727A', marginTop: 9, fontSize: 12, float: 'left' }}>
+						{t('Federation_DNS_info_update')}
+					</Box>
+				)}
 				<ButtonGroup align='end'>
 					<Button onClick={previousStep}>{currentStep === 1 ? t('Cancel') : t('Back')}</Button>
 					<Button primary onClick={nextStep}>
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 32b9551ae54a..f25df43ffcce 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1832,10 +1832,21 @@
   "Federation_Channels_Will_Be_Replicated": "Those channels are going to be replicated to the remote server, without the message history.",
   "Federation_Adding_users_from_another_server": "Adding users from another server",
   "Federation_Changes_needed": "Changes needed on your Server the Domain Name, Target and Port.",
+  "Federation_Configure_DNS": "Configure DNS",
   "Federation_Domain": "Domain",
   "Federation_Domain_details": "Add the domain name that this server should be linked to.",
   "Federation_Enable": "Enable Federation",
   "Federation_Fix_now": "Fix now!",
+  "Federation_SRV_no_support": "If your DNS provider does not support SRV records with _http or _https",
+  "Federation_SRV_no_support_details": "Some DNS providers will not allow setting _https or _http on SRV records, so we have support for those cases, using our old DNS record resolution method.",
+  "Federation_Must_add_records": "You must add the following DNS records on your server:",
+  "Federation_SRV_records_2.0.0": "SRV Record (2.0.0 or newer)",
+  "Federation_Public_key_TXT_record": "Public Key TXT Record",
+  "Federation_Protocol_TXT_record": "Protocol TXT Record",
+  "Federation_Legacy_support": "Legacy Support",
+  "Federation_HTTP_instead_HTTPS": "If you use HTTP protocol instead HTTPS",
+  "Federation_HTTP_instead_HTTPS_details": "We recommend to use HTTPS for all kinds of communications, but sometimes that is not possible. If you need, in the SRV DNS entry replace: the protocol: _http the port: 80",
+  "Federation_DNS_info_update": "This Info is updated every 1 minute",
   "Federation_Adding_Federated_Users": "Adding Federated Users",
   "Federation_Guide_adding_users": "We guide you on how to add your first federated user.",
   "Federation_Is_working_correctly": "Federation integration is working correctly.",

From d7307c0f227a2278880f676dc66dcac336d5ae4a Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Thu, 29 Jul 2021 19:42:14 -0300
Subject: [PATCH 5/8] Regression: Fix tooltip style in the "Busiest Chat Times"
 chart (#22813)

---
 .../components/UsersTab/BusiestChatTimesSection.js       | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js b/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js
index d1b884d3eb4d..34d22838cf25 100644
--- a/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js
@@ -104,11 +104,10 @@ const ContentForHours = ({ displacement, onPreviousDateClick, onNextDateClick, t
 									},
 								},
 								tooltip: {
-									container: {
-										backgroundColor: '#1F2329',
-										boxShadow: '0px 0px 12px rgba(47, 52, 61, 0.12), 0px 0px 2px rgba(47, 52, 61, 0.08)',
-										borderRadius: 2,
-									},
+									backgroundColor: '#1F2329',
+									boxShadow: '0px 0px 12px rgba(47, 52, 61, 0.12), 0px 0px 2px rgba(47, 52, 61, 0.08)',
+									borderRadius: 2,
+									padding: 4,
 								},
 							}}
 							tooltip={({ value }) => <Box fontScale='p2' color='alternative'>

From 7fa5fb0a92520a1c8cef9a52e10c007aed2cbff9 Mon Sep 17 00:00:00 2001
From: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Thu, 29 Jul 2021 19:46:50 -0300
Subject: [PATCH 6/8] Regression: roles.removeUserFromRole API not working with
 scoped roles. (#22799)

---
 app/api/server/v1/roles.js        | 14 ++++++++------
 app/models/server/models/Roles.js | 18 +++++++++++++-----
 app/models/server/raw/Roles.js    |  2 +-
 tests/end-to-end/api/13-roles.js  |  8 +++++---
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/app/api/server/v1/roles.js b/app/api/server/v1/roles.js
index c17e43107c6c..92895cb9f6a8 100644
--- a/app/api/server/v1/roles.js
+++ b/app/api/server/v1/roles.js
@@ -3,7 +3,7 @@ import { Match, check } from 'meteor/check';
 
 import { Roles, Users } from '../../../models';
 import { API } from '../api';
-import { getUsersInRole, hasPermission } from '../../../authorization/server';
+import { getUsersInRole, hasPermission, hasRole } from '../../../authorization/server';
 import { settings } from '../../../settings/server/index';
 import { api } from '../../../../server/sdk/api';
 
@@ -202,7 +202,7 @@ API.v1.addRoute('roles.delete', { authRequired: true }, {
 			throw new Meteor.Error('error-role-protected', 'Cannot delete a protected role');
 		}
 
-		const existingUsers = Roles.findUsersInRole(role._id, role.scope);
+		const existingUsers = Roles.findUsersInRole(role.name, role.scope);
 
 		if (existingUsers && existingUsers.count() > 0) {
 			throw new Meteor.Error('error-role-in-use', 'Cannot delete role because it\'s in use');
@@ -219,11 +219,13 @@ API.v1.addRoute('roles.removeUserFromRole', { authRequired: true }, {
 		check(this.bodyParams, {
 			roleName: String,
 			username: String,
+			scope: Match.Maybe(String),
 		});
 
 		const data = {
 			roleName: this.bodyParams.roleName,
 			username: this.bodyParams.username,
+			scope: this.bodyParams.scope,
 		};
 
 		if (!hasPermission(this.userId, 'access-permissions')) {
@@ -242,18 +244,18 @@ API.v1.addRoute('roles.removeUserFromRole', { authRequired: true }, {
 			throw new Meteor.Error('error-invalid-roleId', 'This role does not exist');
 		}
 
-		if (user.roles.indexOf(role.name) === -1) {
+		if (!hasRole(user._id, role.name, data.scope)) {
 			throw new Meteor.Error('error-user-not-in-role', 'User is not in this role');
 		}
 
 		if (role._id === 'admin') {
-			const adminCount = Roles.findUsersInRole('admin', role.scope).count();
+			const adminCount = Roles.findUsersInRole('admin').count();
 			if (adminCount === 1) {
 				throw new Meteor.Error('error-admin-required', 'You need to have at least one admin');
 			}
 		}
 
-		Roles.removeUserRoles(user._id, role.name, role.scope);
+		Roles.removeUserRoles(user._id, role.name, data.scope);
 
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
@@ -263,7 +265,7 @@ API.v1.addRoute('roles.removeUserFromRole', { authRequired: true }, {
 					_id: user._id,
 					username: user.username,
 				},
-				scope: role.scope,
+				scope: data.scope,
 			});
 		}
 
diff --git a/app/models/server/models/Roles.js b/app/models/server/models/Roles.js
index 531ab9462e27..d305c071d100 100644
--- a/app/models/server/models/Roles.js
+++ b/app/models/server/models/Roles.js
@@ -10,7 +10,7 @@ export class Roles extends Base {
 	}
 
 	findUsersInRole(name, scope, options) {
-		const role = this.findOne(name);
+		const role = this.findOneByName(name);
 		const roleScope = (role && role.scope) || 'Users';
 		const model = Models[roleScope];
 
@@ -20,7 +20,7 @@ export class Roles extends Base {
 	isUserInRoles(userId, roles, scope) {
 		roles = [].concat(roles);
 		return roles.some((roleName) => {
-			const role = this.findOne(roleName);
+			const role = this.findOneByName(roleName);
 			const roleScope = (role && role.scope) || 'Users';
 			const model = Models[roleScope];
 
@@ -70,7 +70,7 @@ export class Roles extends Base {
 	addUserRoles(userId, roles, scope) {
 		roles = [].concat(roles);
 		for (const roleName of roles) {
-			const role = this.findOne(roleName);
+			const role = this.findOneByName(roleName);
 			const roleScope = (role && role.scope) || 'Users';
 			const model = Models[roleScope];
 
@@ -82,7 +82,7 @@ export class Roles extends Base {
 	removeUserRoles(userId, roles, scope) {
 		roles = [].concat(roles);
 		for (const roleName of roles) {
-			const role = this.findOne(roleName);
+			const role = this.findOneByName(roleName);
 			const roleScope = (role && role.scope) || 'Users';
 			const model = Models[roleScope];
 
@@ -103,6 +103,14 @@ export class Roles extends Base {
 		return this.findOne(query, options);
 	}
 
+	findOneByName(name, options) {
+		const query = {
+			name,
+		};
+
+		return this.findOne(query, options);
+	}
+
 	findByUpdatedDate(updatedAfterDate, options) {
 		const query = {
 			_updatedAt: { $gte: new Date(updatedAfterDate) },
@@ -112,7 +120,7 @@ export class Roles extends Base {
 	}
 
 	canAddUserToRole(uid, roleName, scope) {
-		const role = this.findOne({ _id: roleName }, { fields: { scope: 1 } });
+		const role = this.findOne({ name: roleName }, { fields: { scope: 1 } });
 		if (!role) {
 			return false;
 		}
diff --git a/app/models/server/raw/Roles.js b/app/models/server/raw/Roles.js
index de771bcad9b0..7e06551fde56 100644
--- a/app/models/server/raw/Roles.js
+++ b/app/models/server/raw/Roles.js
@@ -16,7 +16,7 @@ export class RolesRaw extends BaseRaw {
 			const roleName = roles[i];
 
 			// eslint-disable-next-line no-await-in-loop
-			const role = await this.findOne({ _id: roleName }, { scope: 1 });
+			const role = await this.findOne({ name: roleName }, { scope: 1 });
 			const roleScope = (role && role.scope) || 'Users';
 			const model = this.models[roleScope];
 
diff --git a/tests/end-to-end/api/13-roles.js b/tests/end-to-end/api/13-roles.js
index f1ca6ea0591a..162152a07214 100644
--- a/tests/end-to-end/api/13-roles.js
+++ b/tests/end-to-end/api/13-roles.js
@@ -31,13 +31,14 @@ function createRole(name, scope, description) {
 	});
 }
 
-function addUserToRole(roleName, username) {
+function addUserToRole(roleName, username, scope) {
 	return new Promise((resolve) => {
 		request.post(api('roles.addUserToRole'))
 			.set(credentials)
 			.send({
 				roleName,
 				username,
+				roomId: scope,
 			})
 			.expect('Content-Type', 'application/json')
 			.expect(200)
@@ -337,7 +338,7 @@ describe('[Roles]', function() {
 			roleWithUser = await createRole(`roleWithUser-${ Date.now() }`, 'Users');
 			roleWithoutUser = await createRole(`roleWithoutUser-${ Date.now() }`, 'Users');
 
-			await addUserToRole(roleWithUser._id, login.user);
+			await addUserToRole(roleWithUser.name, login.user);
 		});
 
 		it('should delete a role that it is not being used', (done) => {
@@ -394,7 +395,7 @@ describe('[Roles]', function() {
 			subscriptionsScopedRole = await createRole(`subscriptionsScopedRole-${ Date.now() }`, 'Subscriptions');
 
 			await addUserToRole(usersScopedRole.name, login.user);
-			await addUserToRole(subscriptionsScopedRole.name, login.user);
+			await addUserToRole(subscriptionsScopedRole.name, login.user, 'GENERAL');
 		});
 
 		it('should unassign a role with User scope from an user', (done) => {
@@ -422,6 +423,7 @@ describe('[Roles]', function() {
 				.send({
 					roleName: subscriptionsScopedRole.name,
 					username: login.user,
+					scope: 'GENERAL',
 				})
 				.expect('Content-Type', 'application/json')
 				.expect(200)

From 6e27d9cd97d76073903255ae666e8ab15f88fa34 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 29 Jul 2021 21:34:38 -0300
Subject: [PATCH 7/8] [FIX] Content-Security-Policy ignoring CDN configuration
 (#22791)

Co-authored-by: ggazzo <guilhermegazzo@gmail.com>
Co-authored-by: Noach Magedman <noach@seekingalpha.com>
---
 app/cors/server/cors.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/cors/server/cors.js b/app/cors/server/cors.js
index 5909c76fb6c9..b14d6b5588bb 100644
--- a/app/cors/server/cors.js
+++ b/app/cors/server/cors.js
@@ -32,7 +32,24 @@ WebApp.rawConnectHandlers.use(function(req, res, next) {
 	}
 
 	if (settings.get('Enable_CSP')) {
-		res.setHeader('Content-Security-Policy', "default-src 'self'; script-src 'self' 'unsafe-eval'; connect-src * 'self' data:; img-src data: 'self' http://* https://*; style-src 'self' 'unsafe-inline'; media-src 'self' http://* https://*; frame-src 'self' http://* https://*; font-src 'self' data:;");
+		const cdn_prefixes = [
+			settings.get('CDN_PREFIX'),
+			settings.get('CDN_PREFIX_ALL') ? null : settings.get('CDN_JSCSS_PREFIX'),
+		].filter(Boolean).join(' ');
+
+		res.setHeader(
+			'Content-Security-Policy',
+			[
+				`default-src 'self' ${ cdn_prefixes }`,
+				'connect-src *',
+				`font-src 'self' ${ cdn_prefixes } data:`,
+				'frame-src *',
+				'img-src * data:',
+				'media-src * data:',
+				`script-src 'self' 'unsafe-eval' ${ cdn_prefixes }`,
+				`style-src 'self' 'unsafe-inline' ${ cdn_prefixes }`,
+			].join('; '),
+		);
 	}
 
 	// Deprecated behavior

From c704acf844d58ca888c6f4b8246202de5b16c49e Mon Sep 17 00:00:00 2001
From: Alan Sikora <alansikora@gmail.com>
Date: Fri, 30 Jul 2021 10:48:15 -0300
Subject: [PATCH 8/8] fixing styles

---
 .../FederationModal/DNSRecordItem.tsx         |  2 +-
 .../components/FederationModal/DNSRecords.tsx | 32 ++++++++-------
 .../components/FederationModal/DNSText.tsx    |  6 ++-
 .../FederationModal/FederationModal.tsx       | 14 ++++---
 .../FederationModal/InviteUsers.tsx           | 26 +++++++------
 .../FederationCard/components/InviteUsers.tsx | 39 -------------------
 .../FederationCard/components/Section.tsx     |  2 +-
 packages/rocketchat-i18n/i18n/en.i18n.json    |  2 +-
 8 files changed, 50 insertions(+), 73 deletions(-)
 delete mode 100644 client/views/admin/info/FederationCard/components/InviteUsers.tsx

diff --git a/client/views/admin/info/FederationCard/components/FederationModal/DNSRecordItem.tsx b/client/views/admin/info/FederationCard/components/FederationModal/DNSRecordItem.tsx
index 78faf6d3d6eb..61c6a08e4315 100644
--- a/client/views/admin/info/FederationCard/components/FederationModal/DNSRecordItem.tsx
+++ b/client/views/admin/info/FederationCard/components/FederationModal/DNSRecordItem.tsx
@@ -10,7 +10,7 @@ export const DNSRecordItem: FC<{
 }> = ({ record: { status, title, expectedValue, value, hideErrorString } }) => (
 	<Box display='flex' alignItems='flex-start'>
 		{getStatusIcon(status)}
-		<Box flexDirection='column' style={{ marginTop: -2, fontSize: '90%' }}>
+		<Box flexDirection='column' fontSize='x12'>
 			<b>{title}</b>: {expectedValue}{' '}
 			{!hideErrorString && status === SectionStatus.FAILED ? `(${value || '?'})` : ''}
 		</Box>
diff --git a/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx b/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx
index 3324271370f7..ee8507528301 100644
--- a/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx
+++ b/client/views/admin/info/FederationCard/components/FederationModal/DNSRecords.tsx
@@ -171,28 +171,32 @@ export const DNSRecords: FC<{
 	return (
 		<>
 			<DNSText text={t('Federation_Must_add_records')} />
-			<DNSText text={t('Federation_SRV_records_2.0.0')} />
-			<Box style={{ marginTop: 10, marginBottom: 15 }}>
-				{srvDNSRecords.map((record: DNSRecord) => (
-					<DNSRecordItem key={record.title} record={record} />
-				))}
+			<Box mbs='x16'>
+				<DNSText text={t('Federation_SRV_records_200')} />
+				<Box mbs='x8'>
+					{srvDNSRecords.map((record: DNSRecord) => (
+						<DNSRecordItem key={record.title} record={record} />
+					))}
+				</Box>
 			</Box>
-			<DNSText text={t('Federation_Public_key_TXT_record')} />
-			<Box style={{ marginTop: 10 }}>
-				{txtDNSRecords.map((record: DNSRecord) => (
-					<DNSRecordItem key={record.title} record={record} />
-				))}
+			<Box mbs='x16'>
+				<DNSText text={t('Federation_Public_key_TXT_record')} />
+				<Box mbs='x8'>
+					{txtDNSRecords.map((record: DNSRecord) => (
+						<DNSRecordItem key={record.title} record={record} />
+					))}
+				</Box>
 			</Box>
 			{!legacy && (
-				<Box style={{ marginTop: 20, padding: 10, backgroundColor: '#F2F3F5' }}>
-					<p style={{ fontWeight: 'bold' }}>{t('Federation_HTTP_instead_HTTPS')}</p>
+				<Box mbs='x16' p='x16' bg='disabled' fontSize='x12'>
+					<Box fontWeight='c2'>{t('Federation_HTTP_instead_HTTPS')}</Box>
 					{t('Federation_HTTP_instead_HTTPS_details')}
 				</Box>
 			)}
 			{legacy && (
-				<Box style={{ marginTop: 15 }}>
+				<Box mbs='x16'>
 					<DNSText text={t('Federation_Protocol_TXT_record')} />
-					<Box style={{ marginTop: 10 }}>
+					<Box mbs='x8'>
 						{legacyTxtDNSRecords.map((record: DNSRecord) => (
 							<DNSRecordItem key={record.title} record={record} />
 						))}
diff --git a/client/views/admin/info/FederationCard/components/FederationModal/DNSText.tsx b/client/views/admin/info/FederationCard/components/FederationModal/DNSText.tsx
index 7433c59edb1d..8e7847cc5de0 100644
--- a/client/views/admin/info/FederationCard/components/FederationModal/DNSText.tsx
+++ b/client/views/admin/info/FederationCard/components/FederationModal/DNSText.tsx
@@ -3,4 +3,8 @@ import React, { FC } from 'react';
 
 export const DNSText: FC<{
 	text: string;
-}> = ({ text }) => <Box style={{ marginTop: 8, fontWeight: 'bold', fontSize: '95%' }}>{text}</Box>;
+}> = ({ text }) => (
+	<Box mbs='x8' fontWeight='c2' fontSize='p1'>
+		{text}
+	</Box>
+);
diff --git a/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx b/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
index 6f529c9e43ef..60499af4fa0f 100644
--- a/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
+++ b/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
@@ -169,7 +169,7 @@ export const FederationModal: FC<{ onClose: () => void }> = ({
 								{t('Federation_Legacy_support')}
 							</Tabs.Item>
 						</Tabs>
-						<Box style={{ marginTop: 30 }}>
+						<Box mbs='x24'>
 							{currentTab === 1 && (
 								<DNSRecords
 									federationSubdomain={federationSubdomain}
@@ -182,9 +182,13 @@ export const FederationModal: FC<{ onClose: () => void }> = ({
 							)}
 							{currentTab === 2 && (
 								<>
-									<Box style={{ marginBottom: 15 }}>
-										<b>{t('Federation_SRV_no_support')}</b>
-										<p style={{ marginTop: 8 }}>{t('Federation_SRV_no_support_details')}</p>
+									<Box mbe='x16'>
+										<Box is='p' fontWeight='c2' fontSize='p1'>
+											{t('Federation_SRV_no_support')}
+										</Box>
+										<Box is='p' mbs='x8' fontSize='x12'>
+											{t('Federation_SRV_no_support_details')}
+										</Box>
 									</Box>
 									<DNSRecords
 										federationSubdomain={federationSubdomain}
@@ -214,7 +218,7 @@ export const FederationModal: FC<{ onClose: () => void }> = ({
 			)}
 			<Modal.Footer>
 				{currentStep === 2 && (
-					<Box style={{ color: '#6C727A', marginTop: 9, fontSize: 12, float: 'left' }}>
+					<Box mbs='x8' color='hint' fontSize='x12' position='absolute'>
 						{t('Federation_DNS_info_update')}
 					</Box>
 				)}
diff --git a/client/views/admin/info/FederationCard/components/FederationModal/InviteUsers.tsx b/client/views/admin/info/FederationCard/components/FederationModal/InviteUsers.tsx
index 60154926a31a..c7e618354575 100644
--- a/client/views/admin/info/FederationCard/components/FederationModal/InviteUsers.tsx
+++ b/client/views/admin/info/FederationCard/components/FederationModal/InviteUsers.tsx
@@ -15,24 +15,28 @@ const InviteUsers: FC<{ onClose: () => void }> = ({ onClose }): ReactElement =>
 
 	return (
 		<Box display='flex' flexDirection='column' alignItems='stretch' flexGrow={1}>
-			<Box style={{ fontWeight: 600 }}>{t('Federation_Inviting_users_from_another_server')}</Box>
-			<Box style={{ marginTop: 20 }}>{t('Federation_Search_users_you_want_to_connect')}</Box>
-			<Box style={{ marginTop: 20, paddingLeft: '1em' }}>
+			<Box fontWeight='c2' fontSize='p1'>
+				{t('Federation_Inviting_users_from_another_server')}
+			</Box>
+			<Box mbs='x16'>{t('Federation_Search_users_you_want_to_connect')}</Box>
+			<Box mbs='x16' pis='x16'>
 				<ul style={{ listStyle: 'disc', listStylePosition: 'inside' }}>
 					<li>{t('Federation_Username')}</li>
 					<li>{t('Federation_Email')}</li>
 				</ul>
 			</Box>
-			<Box style={{ marginTop: 20 }}>
+			<Box mbs='x16' mbe='x16'>
 				{t('Federation_You_will_invite_users_without_login_access')}
+				<ButtonGroup mbs='x20' align='start'>
+					<Button primary small onClick={handleDirectory}>
+						{t('Federation_Invite_User')}
+					</Button>
+				</ButtonGroup>
 			</Box>
-			<ButtonGroup align='start' style={{ marginTop: 20 }}>
-				<Button primary small onClick={handleDirectory}>
-					{t('Federation_Invite_User')}
-				</Button>
-			</ButtonGroup>
-			<Banner style={{ marginTop: 20 }}>
-				<h2 style={{ fontWeight: 600 }}>{t('Federation_Invite_Users_To_Private_Rooms')}</h2>
+			<Banner>
+				<Box is='h2' fontWeight='c2'>
+					{t('Federation_Invite_Users_To_Private_Rooms')}
+				</Box>
 				<p>{t('Federation_Channels_Will_Be_Replicated')}</p>
 			</Banner>
 		</Box>
diff --git a/client/views/admin/info/FederationCard/components/InviteUsers.tsx b/client/views/admin/info/FederationCard/components/InviteUsers.tsx
deleted file mode 100644
index c4e2dcbb391a..000000000000
--- a/client/views/admin/info/FederationCard/components/InviteUsers.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Box, ButtonGroup, Button, Banner } from '@rocket.chat/fuselage';
-import React, { FC, ReactElement } from 'react';
-
-import { useRoute } from '../../../../../contexts/RouterContext';
-import { useTranslation } from '../../../../../contexts/TranslationContext';
-
-const InviteUsers: FC = (): ReactElement => {
-	const t = useTranslation();
-
-	const directoryRoute = useRoute('directory');
-	const handleDirectory = (): void => directoryRoute.push({ tab: 'users' });
-
-	return (
-		<Box display='flex' flexDirection='column' alignItems='stretch' flexGrow={1}>
-			<Box style={{ fontWeight: 600 }}>{t('Federation_Inviting_users_from_another_server')}</Box>
-			<Box style={{ marginTop: 20 }}>{t('Federation_Search_users_you_want_to_connect')}</Box>
-			<Box style={{ marginTop: 20, paddingLeft: '1em' }}>
-				<ul style={{ listStyle: 'disc', listStylePosition: 'inside' }}>
-					<li>{t('Federation_Username')}</li>
-					<li>{t('Federation_Email')}</li>
-				</ul>
-			</Box>
-			<Box style={{ marginTop: 20 }}>
-				{t('Federation_You_will_invite_users_without_login_access')}
-			</Box>
-			<ButtonGroup align='start' style={{ marginTop: 20 }}>
-				<Button primary small onClick={handleDirectory}>
-					{t('Federation_Invite_User')}
-				</Button>
-			</ButtonGroup>
-			<Banner style={{ marginTop: 20 }}>
-				<h2 style={{ fontWeight: 600 }}>{t('Federation_Invite_Users_To_Private_Rooms')}</h2>
-				<p>{t('Federation_Channels_Will_Be_Replicated')}</p>
-			</Banner>
-		</Box>
-	);
-};
-
-export default InviteUsers;
diff --git a/client/views/admin/info/FederationCard/components/Section.tsx b/client/views/admin/info/FederationCard/components/Section.tsx
index 9b0353232443..2698e4c6cad6 100644
--- a/client/views/admin/info/FederationCard/components/Section.tsx
+++ b/client/views/admin/info/FederationCard/components/Section.tsx
@@ -20,7 +20,7 @@ const Section: FC<{
 		{getStatusIcon(status)}
 		<Box flexDirection='column'>
 			<Card.Col.Title>{title}</Card.Col.Title>
-			{subtitle && <Box style={{ marginTop: 3 }}>{subtitle}</Box>}
+			{subtitle && <Box mbs='x2'>{subtitle}</Box>}
 			{children}
 		</Box>
 	</Card.Col.Section>
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index f25df43ffcce..41d34111e046 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1840,7 +1840,7 @@
   "Federation_SRV_no_support": "If your DNS provider does not support SRV records with _http or _https",
   "Federation_SRV_no_support_details": "Some DNS providers will not allow setting _https or _http on SRV records, so we have support for those cases, using our old DNS record resolution method.",
   "Federation_Must_add_records": "You must add the following DNS records on your server:",
-  "Federation_SRV_records_2.0.0": "SRV Record (2.0.0 or newer)",
+  "Federation_SRV_records_200": "SRV Record (2.0.0 or newer)",
   "Federation_Public_key_TXT_record": "Public Key TXT Record",
   "Federation_Protocol_TXT_record": "Protocol TXT Record",
   "Federation_Legacy_support": "Legacy Support",