Remove dependency of RC namespace in rc-livechat/server/publications

packages/rocketchat-livechat/imports/server/rest/departments.js

@@ -1,12 +1,12 @@
 import { check } from 'meteor/check';
-import { RocketChat } from 'meteor/rocketchat:lib';
 import { API } from 'meteor/rocketchat:api';
+import { hasPermission } from 'meteor/rocketchat:authorization';
 import { LivechatDepartment, LivechatDepartmentAgents } from '../../../server/models';
 import { Livechat } from '../../../server/lib/Livechat';
 
 API.v1.addRoute('livechat/department', { authRequired: true }, {
 	get() {
-		if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
 			return API.v1.unauthorized();
 		}
 
@@ -15,7 +15,7 @@ API.v1.addRoute('livechat/department', { authRequired: true }, {
 		});
 	},
 	post() {
-		if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
 			return API.v1.unauthorized();
 		}
 
@@ -43,7 +43,7 @@ API.v1.addRoute('livechat/department', { authRequired: true }, {
 
 API.v1.addRoute('livechat/department/:_id', { authRequired: true }, {
 	get() {
-		if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
 			return API.v1.unauthorized();
 		}
 
@@ -61,7 +61,7 @@ API.v1.addRoute('livechat/department/:_id', { authRequired: true }, {
 		}
 	},
 	put() {
-		if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
 			return API.v1.unauthorized();
 		}
 
@@ -88,7 +88,7 @@ API.v1.addRoute('livechat/department/:_id', { authRequired: true }, {
 		}
 	},
 	delete() {
-		if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
 			return API.v1.unauthorized();
 		}
 

packages/rocketchat-livechat/imports/server/rest/facebook.js

@@ -1,8 +1,8 @@
 import crypto from 'crypto';
 import { Random } from 'meteor/random';
-import { RocketChat } from 'meteor/rocketchat:lib';
 import { API } from 'meteor/rocketchat:api';
-
+import { Rooms, Users } from 'meteor/rocketchat:models';
+import { settings } from 'meteor/rocketchat:settings';
 import LivechatVisitors from '../../../server/models/LivechatVisitors';
 import { Livechat } from '../../../server/lib/Livechat';
 
@@ -33,15 +33,15 @@ API.v1.addRoute('livechat/facebook', {
 			};
 		}
 
-		if (!RocketChat.settings.get('Livechat_Facebook_Enabled')) {
+		if (!settings.get('Livechat_Facebook_Enabled')) {
 			return {
 				success: false,
 				error: 'Integration disabled',
 			};
 		}
 
 		// validate if request come from omni
-		const signature = crypto.createHmac('sha1', RocketChat.settings.get('Livechat_Facebook_API_Secret')).update(JSON.stringify(this.request.body)).digest('hex');
+		const signature = crypto.createHmac('sha1', settings.get('Livechat_Facebook_API_Secret')).update(JSON.stringify(this.request.body)).digest('hex');
 		if (this.request.headers['x-hub-signature'] !== `sha1=${ signature }`) {
 			return {
 				success: false,
@@ -61,7 +61,7 @@ API.v1.addRoute('livechat/facebook', {
 		};
 		let visitor = LivechatVisitors.getVisitorByToken(this.bodyParams.token);
 		if (visitor) {
-			const rooms = RocketChat.models.Rooms.findOpenByVisitorToken(visitor.token).fetch();
+			const rooms = Rooms.findOpenByVisitorToken(visitor.token).fetch();
 			if (rooms && rooms.length > 0) {
 				sendMessage.message.rid = rooms[0]._id;
 			} else {
@@ -77,7 +77,7 @@ API.v1.addRoute('livechat/facebook', {
 				name: `${ this.bodyParams.first_name } ${ this.bodyParams.last_name }`,
 			});
 
-			visitor = RocketChat.models.Users.findOneById(userId);
+			visitor = Users.findOneById(userId);
 		}
 
 		sendMessage.message.msg = this.bodyParams.text;

packages/rocketchat-livechat/imports/server/rest/sms.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Rooms } from 'meteor/rocketchat:models';
 import { API } from 'meteor/rocketchat:api';
 import { SMS } from 'meteor/rocketchat:sms';
 import LivechatVisitors from '../../../server/models/LivechatVisitors';
@@ -26,7 +26,7 @@ API.v1.addRoute('livechat/sms-incoming/:service', {
 		};
 
 		if (visitor) {
-			const rooms = RocketChat.models.Rooms.findOpenByVisitorToken(visitor.token).fetch();
+			const rooms = Rooms.findOpenByVisitorToken(visitor.token).fetch();
 
 			if (rooms && rooms.length > 0) {
 				sendMessage.message.rid = rooms[0]._id;

packages/rocketchat-livechat/imports/server/rest/upload.js

@@ -1,17 +1,19 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
+import { Settings, Rooms } from 'meteor/rocketchat:models';
+import { fileUploadIsValidContentType } from 'meteor/rocketchat:utils';
 import { FileUpload } from 'meteor/rocketchat:file-upload';
 import { API } from 'meteor/rocketchat:api';
 import Busboy from 'busboy';
 import filesize from 'filesize';
 import LivechatVisitors from '../../../server/models/LivechatVisitors';
 let maxFileSize;
 
-RocketChat.settings.get('FileUpload_MaxFileSize', function(key, value) {
+settings.get('FileUpload_MaxFileSize', function(key, value) {
 	try {
 		maxFileSize = parseInt(value);
 	} catch (e) {
-		maxFileSize = RocketChat.models.Settings.findOneById('FileUpload_MaxFileSize').packageValue;
+		maxFileSize = Settings.findOneById('FileUpload_MaxFileSize').packageValue;
 	}
 });
 
@@ -28,7 +30,7 @@ API.v1.addRoute('livechat/upload/:rid', {
 			return API.v1.unauthorized();
 		}
 
-		const room = RocketChat.models.Rooms.findOneOpenByRoomIdAndVisitorToken(this.urlParams.rid, visitorToken);
+		const room = Rooms.findOneOpenByRoomIdAndVisitorToken(this.urlParams.rid, visitorToken);
 		if (!room) {
 			return API.v1.unauthorized();
 		}
@@ -68,7 +70,7 @@ API.v1.addRoute('livechat/upload/:rid', {
 
 		const file = files[0];
 
-		if (!RocketChat.fileUploadIsValidContentType(file.mimetype)) {
+		if (!fileUploadIsValidContentType(file.mimetype)) {
 			return API.v1.failure({
 				reason: 'error-type-not-allowed',
 			});

packages/rocketchat-livechat/imports/server/rest/users.js

@@ -1,12 +1,13 @@
 import { check } from 'meteor/check';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { hasPermission, getUsersInRole } from 'meteor/rocketchat:authorization';
 import { API } from 'meteor/rocketchat:api';
+import { Users } from 'meteor/rocketchat:models';
 import { Livechat } from '../../../server/lib/Livechat';
 import _ from 'underscore';
 
 API.v1.addRoute('livechat/users/:type', { authRequired: true }, {
 	get() {
-		if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
 			return API.v1.unauthorized();
 		}
 
@@ -24,7 +25,7 @@ API.v1.addRoute('livechat/users/:type', { authRequired: true }, {
 				throw 'Invalid type';
 			}
 
-			const users = RocketChat.authz.getUsersInRole(role);
+			const users = getUsersInRole(role);
 
 			return API.v1.success({
 				users: users.fetch().map((user) => _.pick(user, '_id', 'username', 'name', 'status', 'statusLivechat')),
@@ -34,7 +35,7 @@ API.v1.addRoute('livechat/users/:type', { authRequired: true }, {
 		}
 	},
 	post() {
-		if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
 			return API.v1.unauthorized();
 		}
 		try {
@@ -69,7 +70,7 @@ API.v1.addRoute('livechat/users/:type', { authRequired: true }, {
 
 API.v1.addRoute('livechat/users/:type/:_id', { authRequired: true }, {
 	get() {
-		if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
 			return API.v1.unauthorized();
 		}
 
@@ -79,7 +80,7 @@ API.v1.addRoute('livechat/users/:type/:_id', { authRequired: true }, {
 				_id: String,
 			});
 
-			const user = RocketChat.models.Users.findOneById(this.urlParams._id);
+			const user = Users.findOneById(this.urlParams._id);
 
 			if (!user) {
 				return API.v1.failure('User not found');
@@ -109,7 +110,7 @@ API.v1.addRoute('livechat/users/:type/:_id', { authRequired: true }, {
 		}
 	},
 	delete() {
-		if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
 			return API.v1.unauthorized();
 		}
 
@@ -119,7 +120,7 @@ API.v1.addRoute('livechat/users/:type/:_id', { authRequired: true }, {
 				_id: String,
 			});
 
-			const user = RocketChat.models.Users.findOneById(this.urlParams._id);
+			const user = Users.findOneById(this.urlParams._id);
 
 			if (!user) {
 				return API.v1.failure();

packages/rocketchat-livechat/lib/LivechatRoomType.js

@@ -1,6 +1,9 @@
 import { Session } from 'meteor/session';
-import { ChatRoom } from 'meteor/rocketchat:ui';
-import { RocketChat, RoomSettingsEnum, RoomTypeConfig, RoomTypeRouteConfig, UiTextContext, openRoom } from 'meteor/rocketchat:lib';
+import { ChatRoom } from 'meteor/rocketchat:models';
+import { settings } from 'meteor/rocketchat:settings';
+import { hasPermission } from 'meteor/rocketchat:authorization';
+import { openRoom } from 'meteor/rocketchat:ui-utils';
+import { RoomSettingsEnum, UiTextContext, RoomTypeRouteConfig, RoomTypeConfig } from 'meteor/rocketchat:utils';
 import { LivechatInquiry } from './LivechatInquiry';
 
 class LivechatRoomRoute extends RoomTypeRouteConfig {
@@ -46,7 +49,7 @@ export default class LivechatRoomType extends RoomTypeConfig {
 	}
 
 	condition() {
-		return RocketChat.settings.get('Livechat_enabled') && RocketChat.authz.hasPermission('view-l-room');
+		return settings.get('Livechat_enabled') && hasPermission('view-l-room');
 	}
 
 	canSendMessage(roomId) {

packages/rocketchat-livechat/lib/messageTypes.js

@@ -1,9 +1,13 @@
 import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { MessageTypes } from 'meteor/rocketchat:ui-utils';
+import { actionLinks } from 'meteor/rocketchat:action-links';
+import { Notifications } from 'meteor/rocketchat:notifications';
+import { Messages, Rooms } from 'meteor/rocketchat:models';
+import { settings } from 'meteor/rocketchat:settings';
 import { Livechat } from 'meteor/rocketchat:livechat';
 
-RocketChat.MessageTypes.registerType({
+MessageTypes.registerType({
 	id: 'livechat_navigation_history',
 	system: true,
 	message: 'New_visitor_navigation',
@@ -17,34 +21,34 @@ RocketChat.MessageTypes.registerType({
 	},
 });
 
-RocketChat.MessageTypes.registerType({
+MessageTypes.registerType({
 	id: 'livechat_video_call',
 	system: true,
 	message: 'New_videocall_request',
 });
 
-RocketChat.actionLinks.register('createLivechatCall', function(message, params, instance) {
+actionLinks.register('createLivechatCall', function(message, params, instance) {
 	if (Meteor.isClient) {
 		instance.tabBar.open('video');
 	}
 });
 
-RocketChat.actionLinks.register('denyLivechatCall', function(message/* , params*/) {
+actionLinks.register('denyLivechatCall', function(message/* , params*/) {
 	if (Meteor.isServer) {
 		const user = Meteor.user();
 
-		RocketChat.models.Messages.createWithTypeRoomIdMessageAndUser('command', message.rid, 'endCall', user);
-		RocketChat.Notifications.notifyRoom(message.rid, 'deleteMessage', { _id: message._id });
+		Messages.createWithTypeRoomIdMessageAndUser('command', message.rid, 'endCall', user);
+		Notifications.notifyRoom(message.rid, 'deleteMessage', { _id: message._id });
 
-		const language = user.language || RocketChat.settings.get('Language') || 'en';
+		const language = user.language || settings.get('Language') || 'en';
 
 		Livechat.closeRoom({
 			user,
-			room: RocketChat.models.Rooms.findOneById(message.rid),
+			room: Rooms.findOneById(message.rid),
 			comment: TAPi18n.__('Videocall_declined', { lng: language }),
 		});
 		Meteor.defer(() => {
-			RocketChat.models.Messages.setHiddenById(message._id);
+			Messages.setHiddenById(message._id);
 		});
 	}
 });

packages/rocketchat-livechat/package.js

@@ -26,8 +26,10 @@ Package.onUse(function(api) {
 		'webapp',
 		'autoupdate',
 		'rocketchat:utils',
+		'rocketchat:action-links',
 		'rocketchat:ui-utils',
 		'rocketchat:settings',
+		'rocketchat:callbacks',
 		'rocketchat:models',
 		'rocketchat:lib',
 		'rocketchat:authorization',

packages/rocketchat-livechat/server/agentStatus.js

@@ -1,9 +1,9 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { hasRole } from 'meteor/rocketchat:authorization';
 import { UserPresenceMonitor } from 'meteor/konecty:user-presence';
 import { Livechat } from './lib/Livechat';
 
 UserPresenceMonitor.onSetUserStatus((user, status) => {
-	if (RocketChat.authz.hasRole(user._id, 'livechat-manager') || RocketChat.authz.hasRole(user._id, 'livechat-agent')) {
+	if (hasRole(user._id, 'livechat-manager') || hasRole(user._id, 'livechat-agent')) {
 		Livechat.notifyAgentStatusChanged(user._id, status);
 	}
 });

packages/rocketchat-livechat/server/api/lib/livechat.js

@@ -1,13 +1,13 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms } from 'meteor/rocketchat:models';
 import { LivechatDepartment, LivechatTrigger } from '../../models';
 import _ from 'underscore';
 import LivechatVisitors from '../../models/LivechatVisitors';
 import { Livechat } from '../../lib/Livechat';
 
 export function online() {
-	return RocketChat.models.Users.findOnlineAgents().count() > 0;
+	return Users.findOnlineAgents().count() > 0;
 }
 
 export function findTriggers() {
@@ -38,10 +38,10 @@ export function findRoom(token, rid) {
 	};
 
 	if (!rid) {
-		return RocketChat.models.Rooms.findLivechatByVisitorToken(token, fields);
+		return Rooms.findLivechatByVisitorToken(token, fields);
 	}
 
-	return RocketChat.models.Rooms.findLivechatByIdAndVisitorToken(rid, token, fields);
+	return Rooms.findLivechatByIdAndVisitorToken(rid, token, fields);
 }
 
 export function findOpenRoom(token, departmentId) {
@@ -54,7 +54,7 @@ export function findOpenRoom(token, departmentId) {
 	};
 
 	let room;
-	const rooms = departmentId ? RocketChat.models.Rooms.findOpenByVisitorTokenAndDepartmentId(token, departmentId, options).fetch() : RocketChat.models.Rooms.findOpenByVisitorToken(token, options).fetch();
+	const rooms = departmentId ? Rooms.findOpenByVisitorTokenAndDepartmentId(token, departmentId, options).fetch() : Rooms.findOpenByVisitorToken(token, options).fetch();
 	if (rooms && rooms.length > 0) {
 		room = rooms[0];
 	}
@@ -77,7 +77,7 @@ export function getRoom(guest, rid, roomInfo) {
 }
 
 export function findAgent(agentId) {
-	return RocketChat.models.Users.getAgentInfo(agentId);
+	return Users.getAgentInfo(agentId);
 }
 
 export function settings() {

packages/rocketchat-livechat/server/api/v1/config.js

@@ -1,4 +1,4 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users } from 'meteor/rocketchat:models';
 import { API } from 'meteor/rocketchat:api';
 import { findGuest, settings, online, findOpenRoom } from '../lib/livechat';
 import { Match, check } from 'meteor/check';
@@ -26,7 +26,7 @@ API.v1.addRoute('livechat/config', {
 			if (token) {
 				guest = findGuest(token);
 				room = findOpenRoom(token);
-				agent = room && room.servedBy && RocketChat.models.Users.getAgentInfo(room.servedBy._id);
+				agent = room && room.servedBy && Users.getAgentInfo(room.servedBy._id);
 			}
 
 			Object.assign(config, { online: status, guest, room, agent });