RocketChat · sampaiodiego · May 20, 2020 · May 11, 2020
diff --git a/app/api/index.js b/app/api/index.js
diff --git a/app/bigbluebutton/index.js b/app/bigbluebutton/index.js
diff --git a/app/bigbluebutton/server/index.js b/app/bigbluebutton/server/index.js
@@ -0,0 +1 @@
+export { default } from './bigbluebutton-api';
diff --git a/app/bot-helpers/index.js b/app/bot-helpers/index.js
diff --git a/app/integrations/server/api/api.js b/app/integrations/server/api/api.js
@@ -12,7 +12,7 @@ import moment from 'moment';
 
 import { logger } from '../logger';
 import { processWebhookMessage } from '../../../lib';
-import { API, APIClass, defaultRateLimiterOptions } from '../../../api';
+import { API, APIClass, defaultRateLimiterOptions } from '../../../api/server';
 import * as Models from '../../../models';
 import { settings } from '../../../settings/server';
 

diff --git a/app/livechat/imports/server/rest/agent.js b/app/livechat/imports/server/rest/agent.js
@@ -1,6 +1,6 @@
 import { Match, check } from 'meteor/check';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findAgentDepartments } from '../../../server/api/lib/agents';
 
 API.v1.addRoute('livechat/agents/:agentId/departments', { authRequired: true }, {

diff --git a/app/livechat/imports/server/rest/appearance.js b/app/livechat/imports/server/rest/appearance.js
@@ -1,4 +1,4 @@
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findAppearance } from '../../../server/api/lib/appearance';
 
 API.v1.addRoute('livechat/appearance', { authRequired: true }, {

diff --git a/app/livechat/imports/server/rest/dashboards.js b/app/livechat/imports/server/rest/dashboards.js
@@ -1,6 +1,6 @@
 import { Match, check } from 'meteor/check';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { hasPermission } from '../../../../authorization/server';
 import {
 	findAllChatsStatus,

diff --git a/app/livechat/imports/server/rest/departments.js b/app/livechat/imports/server/rest/departments.js
@@ -1,6 +1,6 @@
 import { Match, check } from 'meteor/check';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { hasPermission } from '../../../../authorization';
 import { LivechatDepartment, LivechatDepartmentAgents } from '../../../../models';
 import { Livechat } from '../../../server/lib/Livechat';

diff --git a/app/livechat/imports/server/rest/facebook.js b/app/livechat/imports/server/rest/facebook.js
@@ -2,7 +2,7 @@ import crypto from 'crypto';
 
 import { Random } from 'meteor/random';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { LivechatRooms, LivechatVisitors } from '../../../../models';
 import { settings } from '../../../../settings';
 import { Livechat } from '../../../server/lib/Livechat';

diff --git a/app/livechat/imports/server/rest/inquiries.js b/app/livechat/imports/server/rest/inquiries.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { hasPermission } from '../../../../authorization';
 import { Users, LivechatDepartment, LivechatInquiry } from '../../../../models';
 import { findInquiries, findOneInquiryByRoomId } from '../../../server/api/lib/inquiries';

diff --git a/app/livechat/imports/server/rest/integrations.js b/app/livechat/imports/server/rest/integrations.js
@@ -1,4 +1,4 @@
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findIntegrationSettings } from '../../../server/api/lib/integrations';
 
 API.v1.addRoute('livechat/integrations.settings', { authRequired: true }, {

diff --git a/app/livechat/imports/server/rest/messages.js b/app/livechat/imports/server/rest/messages.js
@@ -1,7 +1,7 @@
 
 import { check } from 'meteor/check';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findExternalMessages } from '../../../server/api/lib/messages';
 
 API.v1.addRoute('livechat/messages.external/:roomId', { authRequired: true }, {

diff --git a/app/livechat/imports/server/rest/officeHour.js b/app/livechat/imports/server/rest/officeHour.js
@@ -1,4 +1,4 @@
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findLivechatOfficeHours } from '../../../server/api/lib/officeHour';
 
 API.v1.addRoute('livechat/office-hours', { authRequired: true }, {

diff --git a/app/livechat/imports/server/rest/queue.js b/app/livechat/imports/server/rest/queue.js
@@ -1,4 +1,4 @@
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findQueueMetrics } from '../../../server/api/lib/queue';
 
 API.v1.addRoute('livechat/queue', { authRequired: true }, {

diff --git a/app/livechat/imports/server/rest/rooms.js b/app/livechat/imports/server/rest/rooms.js
@@ -1,7 +1,7 @@
 import { Match, check } from 'meteor/check';
 
 import { hasPermission } from '../../../../authorization/server';
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findRooms } from '../../../server/api/lib/rooms';
 
 const validateDateParams = (property, date) => {

diff --git a/app/livechat/imports/server/rest/sms.js b/app/livechat/imports/server/rest/sms.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 
 import { LivechatRooms, LivechatVisitors, LivechatDepartment } from '../../../../models';
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { SMS } from '../../../../sms';
 import { Livechat } from '../../../server/lib/Livechat';
 

diff --git a/app/livechat/imports/server/rest/triggers.js b/app/livechat/imports/server/rest/triggers.js
@@ -1,6 +1,6 @@
 import { check } from 'meteor/check';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findTriggers, findTriggerById } from '../../../server/api/lib/triggers';
 
 API.v1.addRoute('livechat/triggers', { authRequired: true }, {

diff --git a/app/livechat/imports/server/rest/upload.js b/app/livechat/imports/server/rest/upload.js
@@ -6,7 +6,7 @@ import { settings } from '../../../../settings';
 import { Settings, LivechatRooms, LivechatVisitors } from '../../../../models';
 import { fileUploadIsValidContentType } from '../../../../utils';
 import { FileUpload } from '../../../../file-upload';
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 
 let maxFileSize;
 

diff --git a/app/livechat/imports/server/rest/users.js b/app/livechat/imports/server/rest/users.js
@@ -2,7 +2,7 @@ import { check } from 'meteor/check';
 import _ from 'underscore';
 
 import { hasPermission } from '../../../../authorization';
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { Users } from '../../../../models';
 import { Livechat } from '../../../server/lib/Livechat';
 import { findAgents, findManagers } from '../../../server/api/lib/users';

diff --git a/app/livechat/imports/server/rest/visitors.js b/app/livechat/imports/server/rest/visitors.js
@@ -1,7 +1,7 @@
 
 import { check } from 'meteor/check';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findVisitorInfo, findVisitedPages, findChatHistory } from '../../../server/api/lib/visitors';
 
 API.v1.addRoute('livechat/visitors.info', { authRequired: true }, {

diff --git a/app/livechat/server/api/v1/agent.js b/app/livechat/server/api/v1/agent.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findRoom, findGuest, findAgent, findOpenRoom } from '../lib/livechat';
 import { Livechat } from '../../lib/Livechat';
 

diff --git a/app/livechat/server/api/v1/config.js b/app/livechat/server/api/v1/config.js
@@ -1,6 +1,6 @@
 import { Match, check } from 'meteor/check';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findGuest, settings, online, findOpenRoom, getExtraConfigInfo, findAgent } from '../lib/livechat';
 
 API.v1.addRoute('livechat/config', {

diff --git a/app/livechat/server/api/v1/customField.js b/app/livechat/server/api/v1/customField.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findGuest } from '../lib/livechat';
 import { Livechat } from '../../lib/Livechat';
 import { findLivechatCustomFields, findCustomFieldById } from '../lib/customFields';

diff --git a/app/livechat/server/api/v1/message.js b/app/livechat/server/api/v1/message.js
@@ -4,7 +4,7 @@ import { Random } from 'meteor/random';
 
 import { Messages, LivechatRooms, LivechatVisitors } from '../../../../models';
 import { hasPermission } from '../../../../authorization';
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { loadMessageHistory } from '../../../../lib';
 import { findGuest, findRoom, normalizeHttpHeaderData } from '../lib/livechat';
 import { Livechat } from '../../lib/Livechat';

diff --git a/app/livechat/server/api/v1/offlineMessage.js b/app/livechat/server/api/v1/offlineMessage.js
@@ -1,7 +1,7 @@
 import { Match, check } from 'meteor/check';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { Livechat } from '../../lib/Livechat';
 
 API.v1.addRoute('livechat/offline.message', {

diff --git a/app/livechat/server/api/v1/pageVisited.js b/app/livechat/server/api/v1/pageVisited.js
@@ -1,7 +1,7 @@
 import { Match, check } from 'meteor/check';
 import _ from 'underscore';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { Livechat } from '../../lib/Livechat';
 
 API.v1.addRoute('livechat/page.visited', {

diff --git a/app/livechat/server/api/v1/room.js b/app/livechat/server/api/v1/room.js
@@ -5,7 +5,7 @@ import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { settings as rcSettings } from '../../../../settings';
 import { Messages, LivechatRooms } from '../../../../models';
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findGuest, findRoom, getRoom, settings, findAgent, onCheckRoomParams } from '../lib/livechat';
 import { Livechat } from '../../lib/Livechat';
 import { normalizeTransferredByData } from '../../lib/Helper';

diff --git a/app/livechat/server/api/v1/transcript.js b/app/livechat/server/api/v1/transcript.js
@@ -1,7 +1,7 @@
 import { check } from 'meteor/check';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { Livechat } from '../../lib/Livechat';
 
 API.v1.addRoute('livechat/transcript', {

diff --git a/app/livechat/server/api/v1/videoCall.js b/app/livechat/server/api/v1/videoCall.js
@@ -4,7 +4,7 @@ import { Random } from 'meteor/random';
 
 import { Messages } from '../../../../models';
 import { settings as rcSettings } from '../../../../settings';
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findGuest, getRoom, settings } from '../lib/livechat';
 
 API.v1.addRoute('livechat/video.call/:token', {

diff --git a/app/livechat/server/api/v1/visitor.js b/app/livechat/server/api/v1/visitor.js
@@ -3,7 +3,7 @@ import { Match, check } from 'meteor/check';
 
 import { LivechatRooms, LivechatVisitors, LivechatCustomField } from '../../../../models';
 import { hasPermission } from '../../../../authorization';
-import { API } from '../../../../api';
+import { API } from '../../../../api/server';
 import { findGuest, normalizeHttpHeaderData } from '../lib/livechat';
 import { Livechat } from '../../lib/Livechat';
 

diff --git a/app/livestream/server/routes.js b/app/livestream/server/routes.js
@@ -3,7 +3,7 @@ import google from 'googleapis';
 
 import { settings } from '../../settings';
 import { Users } from '../../models';
-import { API } from '../../api';
+import { API } from '../../api/server';
 
 const { OAuth2 } = google.auth;
 

diff --git a/app/oauth2-server-config/server/oauth/oauth2-server.js b/app/oauth2-server-config/server/oauth/oauth2-server.js
@@ -3,7 +3,7 @@ import { WebApp } from 'meteor/webapp';
 import { OAuth2Server } from 'meteor/rocketchat:oauth2-server';
 
 import { OAuthApps, Users } from '../../../models';
-import { API } from '../../../api';
+import { API } from '../../../api/server';
 
 const oauth2server = new OAuth2Server({
 	accessTokensCollectionName: 'rocketchat_oauth_access_tokens',

diff --git a/app/videobridge/server/methods/bbb.js b/app/videobridge/server/methods/bbb.js
@@ -2,11 +2,11 @@ import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
 import xml2js from 'xml2js';
 
-import BigBlueButtonApi from '../../../bigbluebutton';
+import BigBlueButtonApi from '../../../bigbluebutton/server';
 import { settings } from '../../../settings';
 import { Rooms, Users } from '../../../models';
 import { saveStreamingOptions } from '../../../channel-settings';
-import { API } from '../../../api';
+import { API } from '../../../api/server';
 
 const parser = new xml2js.Parser({
 	explicitRoot: true,

diff --git a/ee/app/api-enterprise/server/canned-responses.js b/ee/app/api-enterprise/server/canned-responses.js
@@ -1,4 +1,4 @@
-import { API } from '../../../../app/api';
+import { API } from '../../../../app/api/server';
 import { findAllCannedResponses } from './lib/canned-responses';
 
 API.v1.addRoute('canned-responses.get', { authRequired: true }, {

diff --git a/ee/app/engagement-dashboard/server/api/channels.js b/ee/app/engagement-dashboard/server/api/channels.js
@@ -1,6 +1,6 @@
 import { check } from 'meteor/check';
 
-import { API } from '../../../../../app/api';
+import { API } from '../../../../../app/api/server';
 import { findAllChannelsWithNumberOfMessages } from '../lib/channels';
 import { transformDatesForAPI } from './helpers/date';
 

diff --git a/ee/app/engagement-dashboard/server/api/messages.js b/ee/app/engagement-dashboard/server/api/messages.js
@@ -1,6 +1,6 @@
 import { check } from 'meteor/check';
 
-import { API } from '../../../../../app/api';
+import { API } from '../../../../../app/api/server';
 import { findWeeklyMessagesSentData, findMessagesSentOrigin, findTopFivePopularChannelsByMessageSentQuantity } from '../lib/messages';
 import { transformDatesForAPI } from './helpers/date';
 

diff --git a/ee/app/engagement-dashboard/server/api/users.js b/ee/app/engagement-dashboard/server/api/users.js
@@ -1,6 +1,6 @@
 import { check } from 'meteor/check';
 
-import { API } from '../../../../../app/api';
+import { API } from '../../../../../app/api/server';
 import {
 	findWeeklyUsersRegisteredData,
 	findActiveUsersMonthlyData,

diff --git a/ee/app/livechat/imports/server/rest/departments.js b/ee/app/livechat/imports/server/rest/departments.js
@@ -1,4 +1,4 @@
-import { API } from '../../../../../../app/api';
+import { API } from '../../../../../../app/api/server';
 import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
 
 const endpointsToRunAsUser = {

diff --git a/ee/app/livechat/imports/server/rest/inquiries.js b/ee/app/livechat/imports/server/rest/inquiries.js
@@ -1,4 +1,4 @@
-import { API } from '../../../../../../app/api';
+import { API } from '../../../../../../app/api/server';
 import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
 
 const endpointsToRunAsUser = {

diff --git a/ee/app/livechat/imports/server/rest/rooms.js b/ee/app/livechat/imports/server/rest/rooms.js
@@ -1,4 +1,4 @@
-import { API } from '../../../../../../app/api';
+import { API } from '../../../../../../app/api/server';
 import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
 
 const endpointsToRunAsUser = {

diff --git a/ee/app/livechat/imports/server/rest/sms.js b/ee/app/livechat/imports/server/rest/sms.js
@@ -1,4 +1,4 @@
-import { API } from '../../../../../../app/api';
+import { API } from '../../../../../../app/api/server';
 import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
 
 const endpointsToRunAsUser = {

diff --git a/ee/app/livechat/imports/server/rest/upload.js b/ee/app/livechat/imports/server/rest/upload.js
@@ -1,4 +1,4 @@
-import { API } from '../../../../../../app/api';
+import { API } from '../../../../../../app/api/server';
 import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
 
 const endpointsToRunAsUser = {

diff --git a/server/importPackages.js b/server/importPackages.js
@@ -3,12 +3,12 @@ import '../app/sms';
 import '../app/2fa/server';
 import '../app/accounts/server';
 import '../app/analytics/server';
-import '../app/api';
+import '../app/api/server';
 import '../app/assets/server';
 import '../app/authorization';
 import '../app/autolinker/server';
 import '../app/autotranslate/server';
-import '../app/bot-helpers';
+import '../app/bot-helpers/server';
 import '../app/cas/server';
 import '../app/channel-settings';
 import '../app/channel-settings-mail-messages/server';
@@ -98,7 +98,7 @@ import '../app/version-check/server';
 import '../app/search/server';
 import '../app/chatpal-search/server';
 import '../app/discussion/server';
-import '../app/bigbluebutton';
+import '../app/bigbluebutton/server';
 import '../app/mail-messages/server';
 import '../app/user-status';
 import '../app/utils';