RocketChat · rodrigok · Nov 1, 2018 · Oct 19, 2018 · Oct 19, 2018 · Oct 19, 2018
diff --git a/packages/rocketchat-api/package.js b/packages/rocketchat-api/package.js
@@ -8,45 +8,11 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'rocketchat:lib',
 		'nimble:restivus',
+		'rocketchat:lib',
+		'rocketchat:integrations',
+		'rocketchat:file-upload',
 	]);
 
-	api.addFiles('server/api.js', 'server');
-	api.addFiles('server/settings.js', 'server');
-
-	// Register helpers
-	api.addFiles('server/helpers/composeRoomWithLastMessage.js', 'server');
-	api.addFiles('server/helpers/requestParams.js', 'server');
-	api.addFiles('server/helpers/getPaginationItems.js', 'server');
-	api.addFiles('server/helpers/getUserFromParams.js', 'server');
-	api.addFiles('server/helpers/getUserInfo.js', 'server');
-	api.addFiles('server/helpers/isUserFromParams.js', 'server');
-	api.addFiles('server/helpers/parseJsonQuery.js', 'server');
-	api.addFiles('server/helpers/deprecationWarning.js', 'server');
-	api.addFiles('server/helpers/getLoggedInUser.js', 'server');
-	api.addFiles('server/helpers/insertUserObject.js', 'server');
-
-	// Add default routes
-	api.addFiles('server/default/info.js', 'server');
-
-	// Add v1 routes
-	api.addFiles('server/v1/channels.js', 'server');
-	api.addFiles('server/v1/roles.js', 'server');
-	api.addFiles('server/v1/rooms.js', 'server');
-	api.addFiles('server/v1/subscriptions.js', 'server');
-	api.addFiles('server/v1/chat.js', 'server');
-	api.addFiles('server/v1/commands.js', 'server');
-	api.addFiles('server/v1/emoji-custom.js', 'server');
-	api.addFiles('server/v1/groups.js', 'server');
-	api.addFiles('server/v1/im.js', 'server');
-	api.addFiles('server/v1/integrations.js', 'server');
-	api.addFiles('server/v1/misc.js', 'server');
-	api.addFiles('server/v1/permissions.js', 'server');
-	api.addFiles('server/v1/push.js', 'server');
-	api.addFiles('server/v1/settings.js', 'server');
-	api.addFiles('server/v1/stats.js', 'server');
-	api.addFiles('server/v1/users.js', 'server');
-	api.addFiles('server/v1/assets.js', 'server');
-	api.addFiles('server/v1/e2e.js', 'server');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js
@@ -1,8 +1,12 @@
-/* global Restivus, DDP, DDPCommon */
 import { Meteor } from 'meteor/meteor';
+import { DDPCommon } from 'meteor/ddp-common';
+import { DDP } from 'meteor/ddp';
 import { Accounts } from 'meteor/accounts-base';
-
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { Restivus } from 'meteor/nimble:restivus';
+import { Logger } from 'meteor/rocketchat:logger';
 import _ from 'underscore';
+
 const logger = new Logger('API', {});
 
 class API extends Restivus {

diff --git a/packages/rocketchat-api/server/default/info.js b/packages/rocketchat-api/server/default/info.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.API.default.addRoute('info', { authRequired: false }, {
 	get() {
 		const user = this.getLoggedInUser();

diff --git a/packages/rocketchat-api/server/helpers/composeRoomWithLastMessage.js b/packages/rocketchat-api/server/helpers/composeRoomWithLastMessage.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.API.helperMethods.set('composeRoomWithLastMessage', function _composeRoomWithLastMessage(room, userId) {
 	if (room.lastMessage) {
 		room.lastMessage = RocketChat.composeMessageObjectWithUser(room.lastMessage, userId);

diff --git a/packages/rocketchat-api/server/helpers/deprecationWarning.js b/packages/rocketchat-api/server/helpers/deprecationWarning.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.API.helperMethods.set('deprecationWarning', function _deprecationWarning({ endpoint, versionWillBeRemove, response }) {
 	const warningMessage = `The endpoint "${ endpoint }" is deprecated and will be removed after version ${ versionWillBeRemove }`;
 	console.warn(warningMessage);

diff --git a/packages/rocketchat-api/server/helpers/getLoggedInUser.js b/packages/rocketchat-api/server/helpers/getLoggedInUser.js
@@ -1,4 +1,5 @@
 import { Accounts } from 'meteor/accounts-base';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.API.helperMethods.set('getLoggedInUser', function _getLoggedInUser() {
 	let user;

diff --git a/packages/rocketchat-api/server/helpers/getPaginationItems.js b/packages/rocketchat-api/server/helpers/getPaginationItems.js
@@ -1,6 +1,7 @@
 // If the count query param is higher than the "API_Upper_Count_Limit" setting, then we limit that
 // If the count query param isn't defined, then we set it to the "API_Default_Count" setting
 // If the count is zero, then that means unlimited and is only allowed if the setting "API_Allow_Infinite_Count" is true
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.API.helperMethods.set('getPaginationItems', function _getPaginationItems() {
 	const hardUpperLimit = RocketChat.settings.get('API_Upper_Count_Limit') <= 0 ? 100 : RocketChat.settings.get('API_Upper_Count_Limit');

diff --git a/packages/rocketchat-api/server/helpers/getUserFromParams.js b/packages/rocketchat-api/server/helpers/getUserFromParams.js
@@ -1,5 +1,6 @@
 // Convenience method, almost need to turn it into a middleware of sorts
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.API.helperMethods.set('getUserFromParams', function _getUserFromParams() {
 	const doesntExist = { _doesntExist: true };

diff --git a/packages/rocketchat-api/server/helpers/getUserInfo.js b/packages/rocketchat-api/server/helpers/getUserInfo.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 const getInfoFromUserObject = (user) => {
 	const {
 		_id,

diff --git a/packages/rocketchat-api/server/helpers/insertUserObject.js b/packages/rocketchat-api/server/helpers/insertUserObject.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.API.helperMethods.set('insertUserObject', function _addUserToObject({ object, userId }) {
 	const user = RocketChat.models.Users.findOneById(userId);
 	object.user = { };

diff --git a/packages/rocketchat-api/server/helpers/isUserFromParams.js b/packages/rocketchat-api/server/helpers/isUserFromParams.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.API.helperMethods.set('isUserFromParams', function _isUserFromParams() {
 	const params = this.requestParams();
 

diff --git a/packages/rocketchat-api/server/helpers/parseJsonQuery.js b/packages/rocketchat-api/server/helpers/parseJsonQuery.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.API.helperMethods.set('parseJsonQuery', function _parseJsonQuery() {
 	let sort;

diff --git a/packages/rocketchat-api/server/helpers/requestParams.js b/packages/rocketchat-api/server/helpers/requestParams.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.API.helperMethods.set('requestParams', function _requestParams() {
 	return ['POST', 'PUT'].includes(this.request.method) ? this.bodyParams : this.queryParams;
 });
diff --git a/packages/rocketchat-api/server/index.js b/packages/rocketchat-api/server/index.js
@@ -0,0 +1,31 @@
+import './settings';
+import './api';
+import './helpers/composeRoomWithLastMessage';
+import './helpers/deprecationWarning';
+import './helpers/getLoggedInUser';
+import './helpers/getPaginationItems';
+import './helpers/getUserFromParams';
+import './helpers/getUserInfo';
+import './helpers/insertUserObject';
+import './helpers/isUserFromParams';
+import './helpers/parseJsonQuery';
+import './helpers/requestParams';
+import './default/info';
+import './v1/assets';
+import './v1/channels';
+import './v1/chat';
+import './v1/commands';
+import './v1/e2e';
+import './v1/emoji-custom';
+import './v1/groups';
+import './v1/im';
+import './v1/integrations';
+import './v1/misc';
+import './v1/permissions';
+import './v1/push';
+import './v1/roles';
+import './v1/rooms';
+import './v1/settings';
+import './v1/stats';
+import './v1/subscriptions';
+import './v1/users';
diff --git a/packages/rocketchat-api/server/settings.js b/packages/rocketchat-api/server/settings.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.settings.addGroup('General', function() {
 	this.section('REST API', function() {
 		this.add('API_Upper_Count_Limit', 100, { type: 'int', public: false });

diff --git a/packages/rocketchat-api/server/v1/assets.js b/packages/rocketchat-api/server/v1/assets.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import Busboy from 'busboy';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.API.v1.addRoute('assets.setAsset', { authRequired: true }, {
 	post() {

diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
 
 // Returns the channel IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property

diff --git a/packages/rocketchat-api/server/v1/chat.js b/packages/rocketchat-api/server/v1/chat.js
@@ -1,6 +1,7 @@
-/* global processWebhookMessage */
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import { Match, check } from 'meteor/check';
+import { processWebhookMessage } from 'meteor/rocketchat:integrations';
 
 RocketChat.API.v1.addRoute('chat.delete', { authRequired: true }, {
 	post() {

diff --git a/packages/rocketchat-api/server/v1/commands.js b/packages/rocketchat-api/server/v1/commands.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.API.v1.addRoute('commands.get', { authRequired: true }, {
 	get() {

diff --git a/packages/rocketchat-api/server/v1/e2e.js b/packages/rocketchat-api/server/v1/e2e.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.API.v1.addRoute('e2e.fetchMyKeys', { authRequired: true }, {
 	get() {

diff --git a/packages/rocketchat-api/server/v1/emoji-custom.js b/packages/rocketchat-api/server/v1/emoji-custom.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.API.v1.addRoute('emoji-custom', { authRequired: true }, {
 	get() {
 		const emojis = Meteor.call('listEmojiCustom');

diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
 
 // Returns the private group subscription IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property

diff --git a/packages/rocketchat-api/server/v1/im.js b/packages/rocketchat-api/server/v1/im.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 function findDirectMessageRoom(params, user) {
 	if ((!params.roomId || !params.roomId.trim()) && (!params.username || !params.username.trim())) {

diff --git a/packages/rocketchat-api/server/v1/integrations.js b/packages/rocketchat-api/server/v1/integrations.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.API.v1.addRoute('integrations.create', { authRequired: true }, {
 	post() {

diff --git a/packages/rocketchat-api/server/v1/misc.js b/packages/rocketchat-api/server/v1/misc.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.API.v1.addRoute('info', { authRequired: false }, {
 	get() {

diff --git a/packages/rocketchat-api/server/v1/permissions.js b/packages/rocketchat-api/server/v1/permissions.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 /**
 	This API returns all permissions that exists

diff --git a/packages/rocketchat-api/server/v1/push.js b/packages/rocketchat-api/server/v1/push.js
@@ -1,6 +1,7 @@
-/* globals Push */
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { Push } from 'meteor/rocketchat:push';
 
 RocketChat.API.v1.addRoute('push.token', { authRequired: true }, {
 	post() {

diff --git a/packages/rocketchat-api/server/v1/roles.js b/packages/rocketchat-api/server/v1/roles.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.API.v1.addRoute('roles.list', { authRequired: true }, {
 	get() {

diff --git a/packages/rocketchat-api/server/v1/rooms.js b/packages/rocketchat-api/server/v1/rooms.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { FileUpload } from 'meteor/rocketchat:file-upload';
 import Busboy from 'busboy';
 
 function findRoomByIdOrName({ params, checkedArchived = true }) {

diff --git a/packages/rocketchat-api/server/v1/settings.js b/packages/rocketchat-api/server/v1/settings.js
@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { ServiceConfiguration } from 'meteor/service-configuration';
 import _ from 'underscore';
 
 // settings endpoints

diff --git a/packages/rocketchat-api/server/v1/stats.js b/packages/rocketchat-api/server/v1/stats.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.API.v1.addRoute('statistics', { authRequired: true }, {
 	get() {

diff --git a/packages/rocketchat-api/server/v1/subscriptions.js b/packages/rocketchat-api/server/v1/subscriptions.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.API.v1.addRoute('subscriptions.get', { authRequired: true }, {
 	get() {

diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
 import Busboy from 'busboy';
 

diff --git a/packages/rocketchat-integrations/package.js b/packages/rocketchat-integrations/package.js
@@ -12,7 +12,6 @@ Package.onUse(function(api) {
 	api.use('babel-compiler');
 	api.use('rocketchat:lib');
 	api.use('rocketchat:authorization');
-	api.use('rocketchat:api');
 	api.use('rocketchat:theme');
 	api.use('rocketchat:logger');
 
@@ -70,4 +69,5 @@ Package.onUse(function(api) {
 	api.addFiles('server/triggers.js', 'server');
 
 	api.addFiles('server/processWebhookMessage.js', 'server');
+	api.export('processWebhookMessage', 'server');
 });
diff --git a/packages/rocketchat-integrations/server/processWebhookMessage.js b/packages/rocketchat-integrations/server/processWebhookMessage.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 import s from 'underscore.string';
 
-this.processWebhookMessage = function(messageObj, user, defaultValues = { channel: '', alias: '', avatar: '', emoji: '' }, mustBeJoined = false) {
+processWebhookMessage = function(messageObj, user, defaultValues = { channel: '', alias: '', avatar: '', emoji: '' }, mustBeJoined = false) { //eslint-disable-line
 	const sentData = [];
 	const channels = [].concat(messageObj.channel || messageObj.roomId || defaultValues.channel);