Merge pull request RocketChat#533 from WideChat/develop_pwa-catchup-6…

…2aa68d

[Upstream Catchup] Merge RC:master to develop_pwa

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 3.10.5
+ENV RC_VERSION 3.11.0
 
 MAINTAINER [email protected]
 

.eslintrc

@@ -83,7 +83,9 @@
         "indent": "off",
         "no-extra-parens": "off",
         "no-spaced-func": "off",
+        "no-unused-vars": "off",
         "no-useless-constructor": "off",
+        "no-use-before-define": "off",
         "react/jsx-uses-react": "error",
         "react/jsx-uses-vars": "error",
         "react/jsx-no-undef": "error",
@@ -99,6 +101,10 @@
             "SwitchCase": 1
           }
         ],
+        "@typescript-eslint/interface-name-prefix": [
+          "error",
+          "always"
+        ],
         "@typescript-eslint/no-extra-parens": [
           "error",
           "all",
@@ -111,10 +117,9 @@
           }
         ],
         "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/interface-name-prefix": [
-          "error",
-          "always"
-        ]
+        "@typescript-eslint/no-unused-vars": ["error", {
+          "argsIgnorePattern": "^_"
+        }]
       },
       "env": {
         "browser": true,

.snapcraft/resources/prepareRocketChat

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/3.10.5/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/3.11.0/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 

.snapcraft/snap/snapcraft.yaml

@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 3.10.5
+version: 3.11.0
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict

KNOWN_ISSUES.md

@@ -0,0 +1,6 @@
+## `registerFieldTemplate` is deprecated
+    hmm it's true :(, we don't encourage this type of customization anymore, it ends up opening some security holes, we prefer the use of UIKit. If you feel any difficulty let us know
+## `attachment.actions` is deprecated
+    same reason above
+## `attachment PDF preview` is no longer being rendered
+    it is temporarily disabled, nowadays is huge effort render the previews and requires the download of the entire file on the client. We are working to improve this :)

app/action-links/client/index.js

@@ -1,6 +1,4 @@
 import { actionLinks } from './lib/actionLinks';
-import './init';
-import './stylesheets/actionLinks.css';
 
 export {
 	actionLinks,

app/api/server/index.js

@@ -38,5 +38,7 @@ import './v1/oauthapps';
 import './v1/custom-sounds';
 import './v1/custom-user-status';
 import './v1/instances';
+import './v1/banners';
+import './v1/email-inbox';
 
 export { API, APIClass, defaultRateLimiterOptions } from './api';

app/api/server/lib/emailInbox.js

@@ -0,0 +1,79 @@
+import { EmailInbox } from '../../../models/server/raw';
+import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
+import { Users } from '../../../models';
+
+export async function findEmailInboxes({ userId, query = {}, pagination: { offset, count, sort } }) {
+	if (!await hasPermissionAsync(userId, 'manage-email-inbox')) {
+		throw new Error('error-not-allowed');
+	}
+	const cursor = EmailInbox.find(query, {
+		sort: sort || { name: 1 },
+		skip: offset,
+		limit: count,
+	});
+
+	const total = await cursor.count();
+
+	const emailInboxes = await cursor.toArray();
+
+	return {
+		emailInboxes,
+		count: emailInboxes.length,
+		offset,
+		total,
+	};
+}
+
+export async function findOneEmailInbox({ userId, _id }) {
+	if (!await hasPermissionAsync(userId, 'manage-email-inbox')) {
+		throw new Error('error-not-allowed');
+	}
+	return EmailInbox.findOneById(_id);
+}
+
+export async function insertOneOrUpdateEmailInbox(userId, emailInboxParams) {
+	const { _id, active, name, email, description, senderInfo, department, smtp, imap } = emailInboxParams;
+
+	if (!_id) {
+		emailInboxParams._createdAt = new Date();
+		emailInboxParams._updatedAt = new Date();
+		emailInboxParams._createdBy = Users.findOne(userId, { fields: { username: 1 } });
+		return EmailInbox.insertOne(emailInboxParams);
+	}
+
+	const emailInbox = await findOneEmailInbox({ userId, id: _id });
+
+	if (!emailInbox) {
+		throw new Error('error-invalid-email-inbox');
+	}
+
+	const updateEmailInbox = {
+		$set: {
+			active,
+			name,
+			email,
+			description,
+			senderInfo,
+			smtp,
+			imap,
+			_updatedAt: new Date(),
+		},
+	};
+
+	if (department === 'All') {
+		updateEmailInbox.$unset = {
+			department: 1,
+		};
+	} else {
+		updateEmailInbox.$set.department = department;
+	}
+
+	return EmailInbox.updateOne({ _id }, updateEmailInbox);
+}
+
+export async function findOneEmailInboxByEmail({ userId, email }) {
+	if (!await hasPermissionAsync(userId, 'manage-email-inbox')) {
+		throw new Error('error-not-allowed');
+	}
+	return EmailInbox.findOne({ email });
+}

app/api/server/v1/banners.ts

@@ -0,0 +1,50 @@
+import { Promise } from 'meteor/promise';
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+
+import { API } from '../api';
+import { Banner } from '../../../../server/sdk';
+import { BannerPlatform } from '../../../../definition/IBanner';
+
+API.v1.addRoute('banners.getNew', { authRequired: true }, {
+	get() {
+		check(this.queryParams, Match.ObjectIncluding({
+			platform: String,
+			bid: Match.Maybe(String),
+		}));
+
+		const { platform, bid: bannerId } = this.queryParams;
+		if (!platform) {
+			throw new Meteor.Error('error-missing-param', 'The required "platform" param is missing.');
+		}
+
+		if (!Object.values(BannerPlatform).includes(platform)) {
+			throw new Meteor.Error('error-unknown-platform', 'Platform is unknown.');
+		}
+
+		const banners = Promise.await(Banner.getNewBannersForUser(this.userId, platform, bannerId));
+
+		return API.v1.success({ banners });
+	},
+});
+
+API.v1.addRoute('banners.dismiss', { authRequired: true }, {
+	post() {
+		check(this.bodyParams, Match.ObjectIncluding({
+			bannerId: String,
+		}));
+
+		const { bannerId } = this.bodyParams;
+
+		if (!bannerId || !bannerId.trim()) {
+			throw new Meteor.Error('error-missing-param', 'The required "bannerId" param is missing.');
+		}
+
+		try {
+			Promise.await(Banner.dismiss(this.userId, bannerId));
+			return API.v1.success();
+		} catch (e) {
+			return API.v1.failure();
+		}
+	},
+});

app/api/server/v1/chat.js

@@ -671,6 +671,9 @@ API.v1.addRoute('chat.getStarredMessages', { authRequired: true }, {
 				sort,
 			},
 		}));
+
+		messages.messages = normalizeMessagesForUser(messages.messages, this.userId);
+
 		return API.v1.success(messages);
 	},
 });