Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into chor…

…e/startup-performance

.github/workflows/build_and_test.yml

@@ -16,7 +16,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
 
@@ -186,7 +186,7 @@ jobs:
         path: /tmp/build
 
   test:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     needs: build
 
     strategy:
@@ -260,7 +260,7 @@ jobs:
         for i in $(seq 1 5); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && npm run testci && s=0 && break || s=$? && sleep 1; done; (exit $s)
 
 #   notification:
-#     runs-on: ubuntu-latest
+#     runs-on: ubuntu-20.04
 #     needs: test
 
 #     steps:
@@ -274,7 +274,7 @@ jobs:
 #         token: ${{ secrets.GITHUB_TOKEN }}
 
   build-image-pr:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     if: github.event.pull_request.head.repo.full_name == github.repository
 
     strategy:
@@ -401,7 +401,7 @@ jobs:
         docker push $IMAGE_NAME
 
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     if: github.event_name == 'release' || github.ref == 'refs/heads/develop'
     needs: test
 
@@ -479,7 +479,7 @@ jobs:
         fi
 
   image-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: deploy
 
     strategy:
@@ -556,7 +556,7 @@ jobs:
         docker push ${IMAGE}:develop
 
   services-image-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: deploy
 
     strategy:

app/action-links/client/lib/actionLinks.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { handleError } from '../../../utils/client';
+import { handleError } from '../../../../client/lib/utils/handleError';
 import { Messages, Subscriptions } from '../../../models/client';
 
 // Action Links namespace creation.

app/api/server/v1/emoji-custom.js

@@ -6,25 +6,6 @@ import { getUploadFormData } from '../lib/getUploadFormData';
 import { findEmojisCustom } from '../lib/emoji-custom';
 import { Media } from '../../../../server/sdk';
 
-// DEPRECATED
-// Will be removed after v3.0.0
-API.v1.addRoute('emoji-custom', { authRequired: true }, {
-	get() {
-		const warningMessage = 'The endpoint "emoji-custom" is deprecated and will be removed after version v3.0.0';
-		console.warn(warningMessage);
-		const { query } = this.parseJsonQuery();
-		const emojis = Meteor.call('listEmojiCustom', query);
-
-		return API.v1.success(this.deprecationWarning({
-			endpoint: 'emoji-custom',
-			versionWillBeRemoved: '3.0.0',
-			response: {
-				emojis,
-			},
-		}));
-	},
-});
-
 API.v1.addRoute('emoji-custom.list', { authRequired: true }, {
 	get() {
 		const { query } = this.parseJsonQuery();

app/api/server/v1/misc.js

@@ -7,47 +7,15 @@ import { EJSON } from 'meteor/ejson';
 import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
 import { escapeHTML } from '@rocket.chat/string-helpers';
 
-import { hasRole, hasPermission } from '../../../authorization/server';
-import { Info } from '../../../utils/server';
+import { hasPermission } from '../../../authorization/server';
 import { Users } from '../../../models/server';
 import { settings } from '../../../settings/server';
 import { API } from '../api';
 import { getDefaultUserFields } from '../../../utils/server/functions/getDefaultUserFields';
 import { getURL } from '../../../utils/lib/getURL';
-import { StdOut } from '../../../logger/server/streamer';
+import { getLogs } from '../../../../server/stream/stdout';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 
-
-// DEPRECATED
-// Will be removed after v3.0.0
-API.v1.addRoute('info', { authRequired: false }, {
-	get() {
-		const warningMessage = 'The endpoint "/v1/info" is deprecated and will be removed after version v3.0.0';
-		console.warn(warningMessage);
-		const user = this.getLoggedInUser();
-
-		if (user && hasRole(user._id, 'admin')) {
-			return API.v1.success(this.deprecationWarning({
-				endpoint: 'info',
-				versionWillBeRemoved: '3.0.0',
-				response: {
-					info: Info,
-				},
-			}));
-		}
-
-		return API.v1.success(this.deprecationWarning({
-			endpoint: 'info',
-			versionWillBeRemoved: '3.0.0',
-			response: {
-				info: {
-					version: Info.version,
-				},
-			},
-		}));
-	},
-});
-
 API.v1.addRoute('me', { authRequired: true }, {
 	get() {
 		const fields = getDefaultUserFields();
@@ -227,7 +195,7 @@ API.v1.addRoute('stdout.queue', { authRequired: true }, {
 		if (!hasPermission(this.userId, 'view-logs')) {
 			return API.v1.unauthorized();
 		}
-		return API.v1.success({ queue: StdOut.queue });
+		return API.v1.success({ queue: getLogs() });
 	},
 });
 

app/api/server/v1/permissions.js

@@ -5,40 +5,6 @@ import { hasPermission } from '../../../authorization';
 import { Permissions, Roles } from '../../../models/server';
 import { API } from '../api';
 
-/**
-	This API returns all permissions that exists
-	on the server, with respective roles.
-
-	Method: GET
-	Route: api/v1/permissions
- */
-API.v1.addRoute('permissions', { authRequired: true }, {
-	get() {
-		const warningMessage = 'The endpoint "permissions" is deprecated and will be removed after version v0.69';
-		console.warn(warningMessage);
-
-		const result = Meteor.runAsUser(this.userId, () => Meteor.call('permissions/get'));
-
-		return API.v1.success(result);
-	},
-});
-
-// DEPRECATED
-// TODO: Remove this after three versions have been released. That means at 0.85 this should be gone.
-API.v1.addRoute('permissions.list', { authRequired: true }, {
-	get() {
-		const result = Meteor.runAsUser(this.userId, () => Meteor.call('permissions/get'));
-
-		return API.v1.success(this.deprecationWarning({
-			endpoint: 'permissions.list',
-			versionWillBeRemoved: '0.85',
-			response: {
-				permissions: result,
-			},
-		}));
-	},
-});
-
 API.v1.addRoute('permissions.listAll', { authRequired: true }, {
 	get() {
 		const { updatedSince } = this.queryParams;

app/apps/client/RealAppsEngineUIHost.js

@@ -4,8 +4,8 @@ import { AppsEngineUIHost } from '@rocket.chat/apps-engine/client/AppsEngineUIHo
 
 import { Rooms } from '../../models/client';
 import { APIClient } from '../../utils/client';
-import { baseURI } from '../../utils/client/lib/baseuri';
 import { getUserAvatarURL } from '../../utils/lib/getUserAvatarURL';
+import { baseURI } from '../../../client/lib/baseURI';
 
 export class RealAppsEngineUIHost extends AppsEngineUIHost {
 	constructor() {

app/apps/client/gameCenter/gameCenter.js

@@ -2,8 +2,9 @@ import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 
 import { modal } from '../../../ui-utils/client';
-import { APIClient, t, handleError } from '../../../utils/client';
+import { APIClient, t } from '../../../utils/client';
 import './gameCenter.html';
+import { handleError } from '../../../../client/lib/utils/handleError';
 
 const getExternalComponents = async (instance) => {
 	try {

app/apps/client/gameCenter/invitePlayers.js

@@ -10,7 +10,8 @@ import { Session } from 'meteor/session';
 import { AutoComplete } from '../../../meteor-autocomplete/client';
 import { roomTypes } from '../../../utils/client';
 import { ChatRoom } from '../../../models/client';
-import { call, modal } from '../../../ui-utils/client';
+import { modal } from '../../../ui-utils/client';
+import { callWithErrorHandling } from '../../../../client/lib/utils/callWithErrorHandling';
 
 import './invitePlayers.html';
 
@@ -77,7 +78,7 @@ Template.InvitePlayers.events({
 		const privateGroupName = `${ name.replace(/\s/g, '-') }-${ Random.id(10) }`;
 
 		try {
-			const result = await call('createPrivateGroup', privateGroupName, users);
+			const result = await callWithErrorHandling('createPrivateGroup', privateGroupName, users);
 
 			roomTypes.openRouteLink(result.t, result);
 
@@ -90,7 +91,7 @@ Template.InvitePlayers.events({
 					return;
 				}
 
-				call('sendMessage', {
+				callWithErrorHandling('sendMessage', {
 					_id: Random.id(),
 					rid: result.rid,
 					msg: TAPi18n.__('Apps_Game_Center_Play_Game_Together', { name }),

app/apps/server/converters/users.js

@@ -42,6 +42,7 @@ export class AppUsersConverter {
 			updatedAt: user._updatedAt,
 			lastLoginAt: user.lastLogin,
 			appId: user.appId,
+			customFields: user.customFields,
 		};
 	}