Remove some dependencies inside rocketchat-lib/server/methods (#13218)

* Move integrations models to rc-models * Move composeMessage function to rc-utils * Move PushNotifications class to push-notifications package * Import variables to remove dependency of RC namespace * Import variables to remove RC namespace dependency inside rc-lib/server/lib * Import variables to remove RC namespace inside rc-lib/server/methods
RocketChat · Jan 22, 2019 · 3f1451f · 3f1451f
1 parent 2bf63fb
commit 3f1451f
Show file tree

Hide file tree

Showing 40 changed files with 215 additions and 140 deletions.
diff --git a/packages/rocketchat-lib/server/methods/addOAuthService.js b/packages/rocketchat-lib/server/methods/addOAuthService.js
diff --git a/packages/rocketchat-lib/server/methods/addUsersToRoom.js b/packages/rocketchat-lib/server/methods/addUsersToRoom.js
@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { Rooms, Subscriptions, Users } from 'meteor/rocketchat:models';
+import { hasPermission } from 'meteor/rocketchat:authorization';
 
 Meteor.methods({
 	addUsersToRoom(data = {}) {
@@ -17,9 +19,9 @@ Meteor.methods({
 		}
 
 		// Get user and room details
-		const room = RocketChat.models.Rooms.findOneById(data.rid);
+		const room = Rooms.findOneById(data.rid);
 		const userId = Meteor.userId();
-		const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(data.rid, userId, { fields: { _id: 1 } });
+		const subscription = Subscriptions.findOneByRoomIdAndUserId(data.rid, userId, { fields: { _id: 1 } });
 		const userInRoom = subscription != null;
 
 		// Can't add to direct room ever
@@ -31,11 +33,11 @@ Meteor.methods({
 
 		// Can add to any room you're in, with permission, otherwise need specific room type permission
 		let canAddUser = false;
-		if (userInRoom && RocketChat.authz.hasPermission(userId, 'add-user-to-joined-room', room._id)) {
+		if (userInRoom && hasPermission(userId, 'add-user-to-joined-room', room._id)) {
 			canAddUser = true;
-		} else if (room.t === 'c' && RocketChat.authz.hasPermission(userId, 'add-user-to-any-c-room')) {
+		} else if (room.t === 'c' && hasPermission(userId, 'add-user-to-any-c-room')) {
 			canAddUser = true;
-		} else if (room.t === 'p' && RocketChat.authz.hasPermission(userId, 'add-user-to-any-p-room')) {
+		} else if (room.t === 'p' && hasPermission(userId, 'add-user-to-any-p-room')) {
 			canAddUser = true;
 		}
 
@@ -56,7 +58,7 @@ Meteor.methods({
 		// Validate each user, then add to room
 		const user = Meteor.user();
 		data.users.forEach((username) => {
-			const newUser = RocketChat.models.Users.findOneByUsername(username);
+			const newUser = Users.findOneByUsername(username);
 			if (!newUser) {
 				throw new Meteor.Error('error-invalid-username', 'Invalid username', {
 					method: 'addUsersToRoom',

diff --git a/packages/rocketchat-lib/server/methods/archiveRoom.js b/packages/rocketchat-lib/server/methods/archiveRoom.js
@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
+import { Rooms } from 'meteor/rocketchat:models';
+import { hasPermission } from 'meteor/rocketchat:authorization';
 
 Meteor.methods({
 	archiveRoom(rid) {
@@ -10,13 +12,13 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'archiveRoom' });
 		}
 
-		const room = RocketChat.models.Rooms.findOneById(rid);
+		const room = Rooms.findOneById(rid);
 
 		if (!room) {
 			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'archiveRoom' });
 		}
 
-		if (!RocketChat.authz.hasPermission(Meteor.userId(), 'archive-room', room._id)) {
+		if (!hasPermission(Meteor.userId(), 'archive-room', room._id)) {
 			throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'archiveRoom' });
 		}
 

diff --git a/packages/rocketchat-lib/server/methods/blockUser.js b/packages/rocketchat-lib/server/methods/blockUser.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
+import { Subscriptions } from 'meteor/rocketchat:models';
 
 Meteor.methods({
 	blockUser({ rid, blocked }) {
@@ -11,14 +12,14 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'blockUser' });
 		}
 
-		const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(rid, Meteor.userId());
-		const subscription2 = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(rid, blocked);
+		const subscription = Subscriptions.findOneByRoomIdAndUserId(rid, Meteor.userId());
+		const subscription2 = Subscriptions.findOneByRoomIdAndUserId(rid, blocked);
 
 		if (!subscription || !subscription2) {
 			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'blockUser' });
 		}
 
-		RocketChat.models.Subscriptions.setBlockedByRoomId(rid, blocked, Meteor.userId());
+		Subscriptions.setBlockedByRoomId(rid, blocked, Meteor.userId());
 
 		return true;
 	},

diff --git a/packages/rocketchat-lib/server/methods/checkRegistrationSecretURL.js b/packages/rocketchat-lib/server/methods/checkRegistrationSecretURL.js
@@ -1,11 +1,12 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
+import { settings } from 'meteor/rocketchat:settings';
 
 Meteor.methods({
 	checkRegistrationSecretURL(hash) {
 
 		check(hash, String);
 
-		return hash === RocketChat.settings.get('Accounts_RegistrationForm_SecretURL');
+		return hash === settings.get('Accounts_RegistrationForm_SecretURL');
 	},
 });
diff --git a/packages/rocketchat-lib/server/methods/checkUsernameAvailability.js b/packages/rocketchat-lib/server/methods/checkUsernameAvailability.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
+import { settings } from 'meteor/rocketchat:settings';
 
 Meteor.methods({
 	checkUsernameAvailability(username) {
@@ -11,7 +12,7 @@ Meteor.methods({
 
 		const user = Meteor.user();
 
-		if (user.username && !RocketChat.settings.get('Accounts_AllowUsernameChange')) {
+		if (user.username && !settings.get('Accounts_AllowUsernameChange')) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setUsername' });
 		}
 

diff --git a/packages/rocketchat-lib/server/methods/cleanRoomHistory.js b/packages/rocketchat-lib/server/methods/cleanRoomHistory.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
+import { hasPermission } from 'meteor/rocketchat:authorization';
 
 Meteor.methods({
 	cleanRoomHistory({ roomId, latest, oldest, inclusive = true, limit, excludePinned = false, filesOnly = false, fromUsers = [] }) {
@@ -18,7 +19,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'cleanRoomHistory' });
 		}
 
-		if (!RocketChat.authz.hasPermission(userId, 'clean-channel-history', roomId)) {
+		if (!hasPermission(userId, 'clean-channel-history', roomId)) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'cleanRoomHistory' });
 		}
 

diff --git a/packages/rocketchat-lib/server/methods/createChannel.js b/packages/rocketchat-lib/server/methods/createChannel.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
+import { hasPermission } from 'meteor/rocketchat:authorization';
 
 Meteor.methods({
 	createChannel(name, members, readOnly = false, customFields = {}, extraData = {}) {
@@ -10,7 +11,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'createChannel' });
 		}
 
-		if (!RocketChat.authz.hasPermission(Meteor.userId(), 'create-c')) {
+		if (!hasPermission(Meteor.userId(), 'create-c')) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'createChannel' });
 		}
 		return RocketChat.createRoom('c', name, Meteor.user() && Meteor.user().username, members, readOnly, { customFields, ...extraData });

diff --git a/packages/rocketchat-lib/server/methods/createPrivateGroup.js b/packages/rocketchat-lib/server/methods/createPrivateGroup.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
+import { hasPermission } from 'meteor/rocketchat:authorization';
 
 Meteor.methods({
 	createPrivateGroup(name, members, readOnly = false, customFields = {}, extraData = {}) {
@@ -10,7 +11,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'createPrivateGroup' });
 		}
 
-		if (!RocketChat.authz.hasPermission(Meteor.userId(), 'create-p')) {
+		if (!hasPermission(Meteor.userId(), 'create-p')) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'createPrivateGroup' });
 		}
 

diff --git a/packages/rocketchat-lib/server/methods/createToken.js b/packages/rocketchat-lib/server/methods/createToken.js
@@ -1,9 +1,10 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
+import { hasPermission } from 'meteor/rocketchat:authorization';
 
 Meteor.methods({
 	createToken(userId) {
-		if (Meteor.userId() !== userId && !RocketChat.authz.hasPermission(Meteor.userId(), 'user-generate-access-token')) {
+		if (Meteor.userId() !== userId && !hasPermission(Meteor.userId(), 'user-generate-access-token')) {
 			throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'createToken' });
 		}
 		const token = Accounts._generateStampedLoginToken();

diff --git a/packages/rocketchat-lib/server/methods/deleteMessage.js b/packages/rocketchat-lib/server/methods/deleteMessage.js
@@ -1,5 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
+import { hasPermission } from 'meteor/rocketchat:authorization';
+import { settings } from 'meteor/rocketchat:settings';
+import { Messages } from 'meteor/rocketchat:models';
 import moment from 'moment';
 
 Meteor.methods({
@@ -12,7 +15,7 @@ Meteor.methods({
 				method: 'deleteMessage',
 			});
 		}
-		const originalMessage = RocketChat.models.Messages.findOneById(message._id, {
+		const originalMessage = Messages.findOneById(message._id, {
 			fields: {
 				u: 1,
 				rid: 1,
@@ -26,17 +29,17 @@ Meteor.methods({
 				action: 'Delete_message',
 			});
 		}
-		const forceDelete = RocketChat.authz.hasPermission(Meteor.userId(), 'force-delete-message', originalMessage.rid);
-		const hasPermission = RocketChat.authz.hasPermission(Meteor.userId(), 'delete-message', originalMessage.rid);
-		const deleteAllowed = RocketChat.settings.get('Message_AllowDeleting');
+		const forceDelete = hasPermission(Meteor.userId(), 'force-delete-message', originalMessage.rid);
+		const _hasPermission = hasPermission(Meteor.userId(), 'delete-message', originalMessage.rid);
+		const deleteAllowed = settings.get('Message_AllowDeleting');
 		const deleteOwn = originalMessage && originalMessage.u && originalMessage.u._id === Meteor.userId();
-		if (!(hasPermission || (deleteAllowed && deleteOwn)) && !(forceDelete)) {
+		if (!(_hasPermission || (deleteAllowed && deleteOwn)) && !(forceDelete)) {
 			throw new Meteor.Error('error-action-not-allowed', 'Not allowed', {
 				method: 'deleteMessage',
 				action: 'Delete_message',
 			});
 		}
-		const blockDeleteInMinutes = RocketChat.settings.get('Message_AllowDeleting_BlockDeleteInMinutes');
+		const blockDeleteInMinutes = settings.get('Message_AllowDeleting_BlockDeleteInMinutes');
 		if (blockDeleteInMinutes != null && blockDeleteInMinutes !== 0 && !forceDelete) {
 			if (originalMessage.ts == null) {
 				return;

diff --git a/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js b/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js
@@ -1,6 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
+import { settings } from 'meteor/rocketchat:settings';
+import { Users } from 'meteor/rocketchat:models';
 import s from 'underscore.string';
 
 Meteor.methods({
@@ -12,12 +14,12 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'deleteUserOwnAccount' });
 		}
 
-		if (!RocketChat.settings.get('Accounts_AllowDeleteOwnAccount')) {
+		if (!settings.get('Accounts_AllowDeleteOwnAccount')) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'deleteUserOwnAccount' });
 		}
 
 		const userId = Meteor.userId();
-		const user = RocketChat.models.Users.findOneById(userId);
+		const user = Users.findOneById(userId);
 
 		if (!user) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'deleteUserOwnAccount' });