Remove dependency of RC namespace in rc-oauth2-server and message-star

packages/rocketchat-message-star/client/actionButton.js

@@ -1,12 +1,14 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { RoomHistoryManager } from 'meteor/rocketchat:ui';
+import { handleError } from 'meteor/rocketchat:utils';
+import { Subscriptions } from 'meteor/rocketchat:models';
+import { settings } from 'meteor/rocketchat:settings';
+import { RoomHistoryManager, MessageAction } from 'meteor/rocketchat:ui-utils';
 import toastr from 'toastr';
 
 Meteor.startup(function() {
-	RocketChat.MessageAction.addButton({
+	MessageAction.addButton({
 		id: 'star-message',
 		icon: 'star',
 		label: 'Star_Message',
@@ -21,7 +23,7 @@ Meteor.startup(function() {
 			});
 		},
 		condition(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null && RocketChat.settings.get('Message_AllowStarring')) {
+			if (Subscriptions.findOne({ rid: message.rid }) == null && settings.get('Message_AllowStarring')) {
 				return false;
 			}
 
@@ -31,7 +33,7 @@ Meteor.startup(function() {
 		group: 'menu',
 	});
 
-	RocketChat.MessageAction.addButton({
+	MessageAction.addButton({
 		id: 'unstar-message',
 		icon: 'star',
 		label: 'Unstar_Message',
@@ -46,7 +48,7 @@ Meteor.startup(function() {
 			});
 		},
 		condition(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null && RocketChat.settings.get('Message_AllowStarring')) {
+			if (Subscriptions.findOne({ rid: message.rid }) == null && settings.get('Message_AllowStarring')) {
 				return false;
 			}
 
@@ -56,7 +58,7 @@ Meteor.startup(function() {
 		group: 'menu',
 	});
 
-	RocketChat.MessageAction.addButton({
+	MessageAction.addButton({
 		id: 'jump-to-star-message',
 		icon: 'jump',
 		label: 'Jump_to_message',
@@ -69,7 +71,7 @@ Meteor.startup(function() {
 			RoomHistoryManager.getSurroundingMessages(message, 50);
 		},
 		condition(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
+			if (Subscriptions.findOne({ rid: message.rid }) == null) {
 				return false;
 			}
 			return true;
@@ -78,19 +80,19 @@ Meteor.startup(function() {
 		group: 'menu',
 	});
 
-	RocketChat.MessageAction.addButton({
+	MessageAction.addButton({
 		id: 'permalink-star',
 		icon: 'permalink',
 		label: 'Permalink',
 		classes: 'clipboard',
 		context: ['starred'],
 		async action(event) {
 			const message = this._arguments[1];
-			$(event.currentTarget).attr('data-clipboard-text', await RocketChat.MessageAction.getPermaLink(message._id));
+			$(event.currentTarget).attr('data-clipboard-text', await MessageAction.getPermaLink(message._id));
 			toastr.success(TAPi18n.__('Copied'));
 		},
 		condition(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
+			if (Subscriptions.findOne({ rid: message.rid }) == null) {
 				return false;
 			}
 			return true;

packages/rocketchat-message-star/client/starMessage.js

@@ -1,16 +1,16 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
-import { ChatMessage } from 'meteor/rocketchat:ui';
+import { settings } from 'meteor/rocketchat:settings';
+import { ChatMessage, Subscriptions } from 'meteor/rocketchat:models';
 
 Meteor.methods({
 	starMessage(message) {
 		if (!Meteor.userId()) {
 			return false;
 		}
-		if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
+		if (Subscriptions.findOne({ rid: message.rid }) == null) {
 			return false;
 		}
-		if (!RocketChat.settings.get('Message_AllowStarring')) {
+		if (!settings.get('Message_AllowStarring')) {
 			return false;
 		}
 		return ChatMessage.update({

packages/rocketchat-message-star/client/tabBar.js

@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { TabBar } from 'meteor/rocketchat:ui-utils';
 
 Meteor.startup(function() {
-	RocketChat.TabBar.addButton({
+	TabBar.addButton({
 		groups: ['channel', 'group', 'direct'],
 		id: 'starred-messages',
 		i18nTitle: 'Starred_Messages',

packages/rocketchat-message-star/package.js

@@ -10,6 +10,10 @@ Package.onUse(function(api) {
 		'mongo',
 		'ecmascript',
 		'rocketchat:lib',
+		'rocketchat:utils',
+		'rocketchat:models',
+		'rocketchat:settings',
+		'rocketchat:ui-utils',
 		'templating',
 	]);
 	api.addFiles('client/views/stylesheets/messagestar.css', 'client');

packages/rocketchat-message-star/server/index.js

@@ -1,4 +1,3 @@
-import './models/Rooms';
 import './settings';
 import './starMessage';
 import './publications/starredMessages';

packages/rocketchat-message-star/server/publications/starredMessages.js

@@ -1,19 +1,19 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Messages } from 'meteor/rocketchat:models';
 
 Meteor.publish('starredMessages', function(rid, limit = 50) {
 	if (!this.userId) {
 		return this.ready();
 	}
 	const publication = this;
-	const user = RocketChat.models.Users.findOneById(this.userId);
+	const user = Users.findOneById(this.userId);
 	if (!user) {
 		return this.ready();
 	}
 	if (!Meteor.call('canAccessRoom', rid, this.userId)) {
 		return this.ready();
 	}
-	const cursorHandle = RocketChat.models.Messages.findStarredByUserAtRoom(this.userId, rid, {
+	const cursorHandle = Messages.findStarredByUserAtRoom(this.userId, rid, {
 		sort: {
 			ts: -1,
 		},

packages/rocketchat-message-star/server/settings.js

@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 
 Meteor.startup(function() {
-	return RocketChat.settings.add('Message_AllowStarring', true, {
+	return settings.add('Message_AllowStarring', true, {
 		type: 'boolean',
 		group: 'Message',
 		public: true,

packages/rocketchat-message-star/server/starMessage.js

@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
+import { isTheLastMessage } from 'meteor/rocketchat:lib';
+import { Subscriptions, Rooms, Messages } from 'meteor/rocketchat:models';
 
 Meteor.methods({
 	starMessage(message) {
@@ -9,22 +11,22 @@ Meteor.methods({
 			});
 		}
 
-		if (!RocketChat.settings.get('Message_AllowStarring')) {
+		if (!settings.get('Message_AllowStarring')) {
 			throw new Meteor.Error('error-action-not-allowed', 'Message starring not allowed', {
 				method: 'pinMessage',
 				action: 'Message_starring',
 			});
 		}
 
-		const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(message.rid, Meteor.userId(), { fields: { _id: 1 } });
+		const subscription = Subscriptions.findOneByRoomIdAndUserId(message.rid, Meteor.userId(), { fields: { _id: 1 } });
 		if (!subscription) {
 			return false;
 		}
 		const room = Meteor.call('canAccessRoom', message.rid, Meteor.userId());
-		if (RocketChat.isTheLastMessage(room, message)) {
-			RocketChat.models.Rooms.updateLastMessageStar(room._id, Meteor.userId(), message.starred);
+		if (isTheLastMessage(room, message)) {
+			Rooms.updateLastMessageStar(room._id, Meteor.userId(), message.starred);
 		}
 
-		return RocketChat.models.Messages.updateUserStarById(message._id, Meteor.userId(), message.starred);
+		return Messages.updateUserStarById(message._id, Meteor.userId(), message.starred);
 	},
 });

packages/rocketchat-message-star/server/startup/indexes.js

@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Messages } from 'meteor/rocketchat:models';
 
 Meteor.startup(function() {
 	return Meteor.defer(function() {
-		return RocketChat.models.Messages.tryEnsureIndex({
+		return Messages.tryEnsureIndex({
 			'starred._id': 1,
 		}, {
 			sparse: 1,

packages/rocketchat-models/server/index.js

@@ -19,6 +19,7 @@ import Integrations from './models/Integrations';
 import IntegrationHistory from './models/IntegrationHistory';
 import CredentialTokens from './models/CredentialTokens';
 import EmojiCustom from './models/EmojiCustom';
+import OAuthApps from './models/OAuthApps';
 
 export {
 	Base,
@@ -42,4 +43,5 @@ export {
 	IntegrationHistory,
 	CredentialTokens,
 	EmojiCustom,
+	OAuthApps,
 };

packages/rocketchat-models/server/models/OAuthApps.js

@@ -0,0 +1,9 @@
+import { Base } from './_Base';
+
+export class OAuthApps extends Base {
+	constructor() {
+		super('oauth_apps');
+	}
+}
+
+export default new OAuthApps();

packages/rocketchat-models/server/models/Rooms.js

@@ -26,6 +26,27 @@ export class Rooms extends Base {
 		return this.findOne(query, options);
 	}
 
+	updateLastMessageStar(roomId, userId, starred) {
+		let update;
+		const query = { _id: roomId };
+
+		if (starred) {
+			update = {
+				$addToSet: {
+					'lastMessage.starred': { _id: userId },
+				},
+			};
+		} else {
+			update = {
+				$pull: {
+					'lastMessage.starred': { _id: userId },
+				},
+			};
+		}
+
+		return this.update(query, update);
+	}
+
 	setLastMessageSnippeted(roomId, message, snippetName, snippetedBy, snippeted, snippetedAt) {
 		const query =	{ _id: roomId };
 

packages/rocketchat-oauth2-server-config/client/admin/startup.js

@@ -1,10 +1,11 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { AdminBox } from 'meteor/rocketchat:ui-utils';
+import { hasAllPermission } from 'meteor/rocketchat:authorization';
 
-RocketChat.AdminBox.addOption({
+AdminBox.addOption({
 	href: 'admin-oauth-apps',
 	i18nLabel: 'OAuth Apps',
 	icon: 'discover',
 	permissionGranted() {
-		return RocketChat.authz.hasAllPermission('manage-oauth-apps');
+		return hasAllPermission('manage-oauth-apps');
 	},
 });

packages/rocketchat-oauth2-server-config/client/admin/views/oauthApp.js

@@ -3,9 +3,9 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { modal } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
+import { hasAllPermission } from 'meteor/rocketchat:authorization';
+import { modal } from 'meteor/rocketchat:ui-utils';
+import { t, handleError } from 'meteor/rocketchat:utils';
 import { ChatOAuthApps } from '../collection';
 import toastr from 'toastr';
 
@@ -18,7 +18,7 @@ Template.oauthApp.onCreated(function() {
 
 Template.oauthApp.helpers({
 	hasPermission() {
-		return RocketChat.authz.hasAllPermission('manage-oauth-apps');
+		return hasAllPermission('manage-oauth-apps');
 	},
 	data() {
 		const instance = Template.instance();

packages/rocketchat-oauth2-server-config/client/admin/views/oauthApps.js

@@ -1,5 +1,5 @@
 import { Template } from 'meteor/templating';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { hasAllPermission } from 'meteor/rocketchat:authorization';
 import { ChatOAuthApps } from '../collection';
 import moment from 'moment';
 
@@ -9,7 +9,7 @@ Template.oauthApps.onCreated(function() {
 
 Template.oauthApps.helpers({
 	hasPermission() {
-		return RocketChat.authz.hasAllPermission('manage-oauth-apps');
+		return hasAllPermission('manage-oauth-apps');
 	},
 	applications() {
 		return ChatOAuthApps.find();

packages/rocketchat-oauth2-server-config/package.js

@@ -10,7 +10,9 @@ Package.onUse(function(api) {
 		'webapp',
 		'mongo',
 		'rocketchat:utils',
-		'rocketchat:lib',
+		'rocketchat:models',
+		'rocketchat:ui-utils',
+		'rocketchat:authorization',
 		'rocketchat:api',
 		'rocketchat:theme',
 		'rocketchat:oauth2-server',

packages/rocketchat-oauth2-server-config/server/admin/methods/addOAuthApp.js

@@ -1,11 +1,12 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { hasPermission } from 'meteor/rocketchat:authorization';
+import { Users, OAuthApps } from 'meteor/rocketchat:models';
 import _ from 'underscore';
 
 Meteor.methods({
 	addOAuthApp(application) {
-		if (!RocketChat.authz.hasPermission(this.userId, 'manage-oauth-apps')) {
+		if (!hasPermission(this.userId, 'manage-oauth-apps')) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'addOAuthApp' });
 		}
 		if (!_.isString(application.name) || application.name.trim() === '') {
@@ -20,8 +21,8 @@ Meteor.methods({
 		application.clientId = Random.id();
 		application.clientSecret = Random.secret();
 		application._createdAt = new Date;
-		application._createdBy = RocketChat.models.Users.findOne(this.userId, { fields: { username: 1 } });
-		application._id = RocketChat.models.OAuthApps.insert(application);
+		application._createdBy = Users.findOne(this.userId, { fields: { username: 1 } });
+		application._id = OAuthApps.insert(application);
 		return application;
 	},
 });