Remove dependency of RC namespace in rc-blockstack, bot-helpers and cas

packages/rocketchat-blockstack/package.js

@@ -6,9 +6,13 @@ Package.describe({
 });
 
 Package.onUse((api) => {
-	api.use('ecmascript');
-
+	api.use([
+		'ecmascript',
+		'rocketchat:settings',
+		'rocketchat:assets',
+		'rocketchat:models',
+		'rocketchat:lib',
+	]);
 	api.mainModule('server/main.js', 'server');
-
 	api.mainModule('client/main.js', 'client');
 });

packages/rocketchat-blockstack/server/loginHandler.js

@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
-import { RocketChat } from 'meteor/rocketchat:lib';
-
+import { settings } from 'meteor/rocketchat:settings';
+import { Users } from 'meteor/rocketchat:models';
+import { setUserAvatar } from 'meteor/rocketchat:lib';
 import { updateOrCreateUser } from './userHandler';
 import { handleAccessToken } from './tokenHandler';
 import { logger } from './logger';
@@ -12,7 +13,7 @@ Accounts.registerLoginHandler('blockstack', (loginRequest) => {
 		return;
 	}
 
-	if (!RocketChat.settings.get('Blockstack_Enable')) {
+	if (!settings.get('Blockstack_Enable')) {
 		return;
 	}
 
@@ -35,10 +36,10 @@ Accounts.registerLoginHandler('blockstack', (loginRequest) => {
 
 	if (result.isNew) {
 		try {
-			const user = RocketChat.models.Users.findOneById(result.userId, { fields: { 'services.blockstack.image': 1, username: 1 } });
+			const user = Users.findOneById(result.userId, { fields: { 'services.blockstack.image': 1, username: 1 } });
 			if (user && user.services && user.services.blockstack && user.services.blockstack.image) {
 				Meteor.runAsUser(user._id, () => {
-					RocketChat.setUserAvatar(user, user.services.blockstack.image, undefined, 'url');
+					setUserAvatar(user, user.services.blockstack.image, undefined, 'url');
 				});
 			}
 		} catch (e) {

packages/rocketchat-blockstack/server/routes.js

@@ -1,12 +1,13 @@
 import { Meteor } from 'meteor/meteor';
 import { WebApp } from 'meteor/webapp';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
+import { RocketChatAssets } from 'meteor/rocketchat:assets';
 
 WebApp.connectHandlers.use('/_blockstack/manifest', Meteor.bindEnvironment(function(req, res) {
-	const name = RocketChat.settings.get('Site_Name');
+	const name = settings.get('Site_Name');
 	const startUrl = Meteor.absoluteUrl();
-	const description = RocketChat.settings.get('Blockstack_Auth_Description');
-	const iconUrl = RocketChat.Assets.getURL('Assets_favicon_192');
+	const description = settings.get('Blockstack_Auth_Description');
+	const iconUrl = RocketChatAssets.getURL('Assets_favicon_192');
 
 	res.writeHead(200, {
 		'Content-Type': 'application/json',

packages/rocketchat-blockstack/server/settings.js

@@ -1,7 +1,6 @@
 import _ from 'underscore';
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
-
+import { settings } from 'meteor/rocketchat:settings';
 import { ServiceConfiguration } from 'meteor/service-configuration';
 import { logger } from './logger';
 
@@ -18,7 +17,7 @@ const defaults = {
 };
 
 Meteor.startup(() => {
-	RocketChat.settings.addGroup('Blockstack', function() {
+	settings.addGroup('Blockstack', function() {
 		this.add('Blockstack_Enable', defaults.enable, {
 			type: 'boolean',
 			i18nLabel: 'Enable',
@@ -37,10 +36,10 @@ Meteor.startup(() => {
 
 // Helper to return all Blockstack settings
 const getSettings = () => Object.assign({}, defaults, {
-	enable: RocketChat.settings.get('Blockstack_Enable'),
-	authDescription: RocketChat.settings.get('Blockstack_Auth_Description'),
-	buttonLabelText: RocketChat.settings.get('Blockstack_ButtonLabelText'),
-	generateUsername: RocketChat.settings.get('Blockstack_Generate_Username'),
+	enable: settings.get('Blockstack_Enable'),
+	authDescription: settings.get('Blockstack_Auth_Description'),
+	buttonLabelText: settings.get('Blockstack_ButtonLabelText'),
+	generateUsername: settings.get('Blockstack_Generate_Username'),
 });
 
 const configureService = _.debounce(Meteor.bindEnvironment(() => {
@@ -64,7 +63,7 @@ const configureService = _.debounce(Meteor.bindEnvironment(() => {
 
 // Add settings to auth provider configs on startup
 Meteor.startup(() => {
-	RocketChat.settings.get(/^Blockstack_.+/, () => {
+	settings.get(/^Blockstack_.+/, () => {
 		configureService();
 	});
 });

packages/rocketchat-blockstack/server/tokenHandler.js

@@ -1,5 +1,4 @@
 import { decodeToken } from 'blockstack';
-
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { Match, check } from 'meteor/check';

packages/rocketchat-blockstack/server/userHandler.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { ServiceConfiguration } from 'meteor/service-configuration';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { generateUsernameSuggestion } from 'meteor/rocketchat:lib';
 import { logger } from './logger';
 
 // Updates or creates a user after we authenticate with Blockstack
@@ -53,7 +53,7 @@ export const updateOrCreateUser = (serviceData, options) => {
 		if (profile.username && profile.username !== '') {
 			newUser.username = profile.username;
 		} else if (serviceConfig.generateUsername === true) {
-			newUser.username = RocketChat.generateUsernameSuggestion(newUser);
+			newUser.username = generateUsernameSuggestion(newUser);
 		}
 		// If no username at this point it will suggest one from the name
 

packages/rocketchat-bot-helpers/package.js

@@ -8,7 +8,9 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'rocketchat:lib',
+		'rocketchat:settings',
+		'rocketchat:models',
+		'rocketchat:authorization',
 		'accounts-base',
 	]);
 	api.mainModule('server/index.js', 'server');

packages/rocketchat-bot-helpers/server/index.js

@@ -1,6 +1,8 @@
 import './settings';
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms } from 'meteor/rocketchat:models';
+import { settings } from 'meteor/rocketchat:settings';
+import { hasRole } from 'meteor/rocketchat:authorization';
 import _ from 'underscore';
 
 /**
@@ -25,8 +27,8 @@ class BotHelpers {
 		fieldsSetting.forEach((n) => {
 			this.userFields[n.trim()] = 1;
 		});
-		this._allUsers = RocketChat.models.Users.find(this.queries.users, { fields: this.userFields });
-		this._onlineUsers = RocketChat.models.Users.find({ $and: [this.queries.users, this.queries.online] }, { fields: this.userFields });
+		this._allUsers = Users.find(this.queries.users, { fields: this.userFields });
+		this._onlineUsers = Users.find({ $and: [this.queries.users, this.queries.online] }, { fields: this.userFields });
 	}
 
 	// request methods or props as arguments to Meteor.call
@@ -49,7 +51,7 @@ class BotHelpers {
 	}
 
 	addUserToRoom(userName, room) {
-		const foundRoom = RocketChat.models.Rooms.findOneByIdOrName(room);
+		const foundRoom = Rooms.findOneByIdOrName(room);
 
 		if (!_.isObject(foundRoom)) {
 			throw new Meteor.Error('invalid-channel');
@@ -62,7 +64,7 @@ class BotHelpers {
 	}
 
 	removeUserFromRoom(userName, room) {
-		const foundRoom = RocketChat.models.Rooms.findOneByIdOrName(room);
+		const foundRoom = Rooms.findOneByIdOrName(room);
 
 		if (!_.isObject(foundRoom)) {
 			throw new Meteor.Error('invalid-channel');
@@ -150,14 +152,14 @@ class BotHelpers {
 const botHelpers = new BotHelpers();
 
 // init cursors with fields setting and update on setting change
-RocketChat.settings.get('BotHelpers_userFields', function(settingKey, settingValue) {
+settings.get('BotHelpers_userFields', function(settingKey, settingValue) {
 	botHelpers.setupCursors(settingValue);
 });
 
 Meteor.methods({
 	botRequest: (...args) => {
 		const userID = Meteor.userId();
-		if (userID && RocketChat.authz.hasRole(userID, 'bot')) {
+		if (userID && hasRole(userID, 'bot')) {
 			return botHelpers.request(...args);
 		} else {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'botRequest' });

packages/rocketchat-bot-helpers/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() {
-	RocketChat.settings.addGroup('Bots', function() {
+	settings.addGroup('Bots', function() {
 		this.add('BotHelpers_userFields', '_id, name, username, emails, language, utcOffset', {
 			type: 'string',
 			section: 'Helpers',

packages/rocketchat-cas/client/cas_client.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { Random } from 'meteor/random';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 
 const openCenteredPopup = function(url, width, height) {
 
@@ -29,9 +29,9 @@ Meteor.loginWithCas = function(options, callback) {
 	options = options || {};
 
 	const credentialToken = Random.id();
-	const login_url = RocketChat.settings.get('CAS_login_url');
-	const popup_width = RocketChat.settings.get('CAS_popup_width');
-	const popup_height = RocketChat.settings.get('CAS_popup_height');
+	const login_url = settings.get('CAS_login_url');
+	const popup_width = settings.get('CAS_popup_width');
+	const popup_height = settings.get('CAS_popup_height');
 
 	if (!login_url) {
 		return;

packages/rocketchat-cas/package.js

@@ -9,6 +9,8 @@ Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
 		'rocketchat:lib',
+		'rocketchat:models',
+		'rocketchat:settings',
 		'rocketchat:logger',
 		'service-configuration',
 		'routepolicy',

packages/rocketchat-cas/server/cas_rocketchat.js

@@ -1,11 +1,11 @@
 import { Meteor } from 'meteor/meteor';
 import { Logger } from 'meteor/rocketchat:logger';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 import { ServiceConfiguration } from 'meteor/service-configuration';
 export const logger = new Logger('CAS', {});
 
 Meteor.startup(function() {
-	RocketChat.settings.addGroup('CAS', function() {
+	settings.addGroup('CAS', function() {
 		this.add('CAS_enabled', false, { type: 'boolean', group: 'CAS', public: true });
 		this.add('CAS_base_url', '', { type: 'string', group: 'CAS', public: true });
 		this.add('CAS_login_url', '', { type: 'string', group: 'CAS', public: true });
@@ -39,16 +39,16 @@ function updateServices(/* record*/) {
 	timer = Meteor.setTimeout(function() {
 		const data = {
 			// These will pe passed to 'node-cas' as options
-			enabled:          RocketChat.settings.get('CAS_enabled'),
-			base_url:         RocketChat.settings.get('CAS_base_url'),
-			login_url:        RocketChat.settings.get('CAS_login_url'),
+			enabled:          settings.get('CAS_enabled'),
+			base_url:         settings.get('CAS_base_url'),
+			login_url:        settings.get('CAS_login_url'),
 			// Rocketchat Visuals
-			buttonLabelText:  RocketChat.settings.get('CAS_button_label_text'),
-			buttonLabelColor: RocketChat.settings.get('CAS_button_label_color'),
-			buttonColor:      RocketChat.settings.get('CAS_button_color'),
-			width:            RocketChat.settings.get('CAS_popup_width'),
-			height:           RocketChat.settings.get('CAS_popup_height'),
-			autoclose:        RocketChat.settings.get('CAS_autoclose'),
+			buttonLabelText:  settings.get('CAS_button_label_text'),
+			buttonLabelColor: settings.get('CAS_button_label_color'),
+			buttonColor:      settings.get('CAS_button_color'),
+			width:            settings.get('CAS_popup_width'),
+			height:           settings.get('CAS_popup_height'),
+			autoclose:        settings.get('CAS_autoclose'),
 		};
 
 		// Either register or deregister the CAS login service based upon its configuration
@@ -62,6 +62,6 @@ function updateServices(/* record*/) {
 	}, 2000);
 }
 
-RocketChat.settings.get(/^CAS_.+/, (key, value) => {
+settings.get(/^CAS_.+/, (key, value) => {
 	updateServices(value);
 });

packages/rocketchat-cas/server/cas_server.js

@@ -2,11 +2,12 @@ import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { Random } from 'meteor/random';
 import { WebApp } from 'meteor/webapp';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 import { RoutePolicy } from 'meteor/routepolicy';
+import { Rooms, Subscriptions, CredentialTokens } from 'meteor/rocketchat:models';
+import { _setRealName } from 'meteor/rocketchat:lib';
 import { logger } from './cas_rocketchat';
 import _ from 'underscore';
-
 import fiber from 'fibers';
 import url from 'url';
 import CAS from 'cas';
@@ -22,16 +23,16 @@ const closePopup = function(res) {
 const casTicket = function(req, token, callback) {
 
 	// get configuration
-	if (!RocketChat.settings.get('CAS_enabled')) {
+	if (!settings.get('CAS_enabled')) {
 		logger.error('Got ticket validation request, but CAS is not enabled');
 		callback();
 	}
 
 	// get ticket and validate.
 	const parsedUrl = url.parse(req.url, true);
 	const ticketId = parsedUrl.query.ticket;
-	const baseUrl = RocketChat.settings.get('CAS_base_url');
-	const cas_version = parseFloat(RocketChat.settings.get('CAS_version'));
+	const baseUrl = settings.get('CAS_base_url');
+	const cas_version = parseFloat(settings.get('CAS_version'));
 	const appUrl = Meteor.absoluteUrl().replace(/\/$/, '') + __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
 	logger.debug(`Using CAS_base_url: ${ baseUrl }`);
 
@@ -52,7 +53,7 @@ const casTicket = function(req, token, callback) {
 			if (details && details.attributes) {
 				_.extend(user_info, { attributes: details.attributes });
 			}
-			RocketChat.models.CredentialTokens.create(token, user_info);
+			CredentialTokens.create(token, user_info);
 		} else {
 			logger.error(`Unable to validate ticket: ${ ticketId }`);
 		}
@@ -116,16 +117,16 @@ Accounts.registerLoginHandler(function(options) {
 		return undefined;
 	}
 
-	const credentials = RocketChat.models.CredentialTokens.findOneById(options.cas.credentialToken);
+	const credentials = CredentialTokens.findOneById(options.cas.credentialToken);
 	if (credentials === undefined) {
 		throw new Meteor.Error(Accounts.LoginCancelledError.numericError,
 			'no matching login attempt found');
 	}
 
 	const result = credentials.userInfo;
-	const syncUserDataFieldMap = RocketChat.settings.get('CAS_Sync_User_Data_FieldMap').trim();
-	const cas_version = parseFloat(RocketChat.settings.get('CAS_version'));
-	const sync_enabled = RocketChat.settings.get('CAS_Sync_User_Data_Enabled');
+	const syncUserDataFieldMap = settings.get('CAS_Sync_User_Data_FieldMap').trim();
+	const cas_version = parseFloat(settings.get('CAS_version'));
+	const sync_enabled = settings.get('CAS_Sync_User_Data_Enabled');
 
 	// We have these
 	const ext_attrs = {
@@ -196,7 +197,7 @@ Accounts.registerLoginHandler(function(options) {
 			logger.debug('Syncing user attributes');
 			// Update name
 			if (int_attrs.name) {
-				RocketChat._setRealName(user._id, int_attrs.name);
+				_setRealName(user._id, int_attrs.name);
 			}
 
 			// Update email
@@ -248,13 +249,13 @@ Accounts.registerLoginHandler(function(options) {
 		if (int_attrs.rooms) {
 			_.each(int_attrs.rooms.split(','), function(room_name) {
 				if (room_name) {
-					let room = RocketChat.models.Rooms.findOneByNameAndType(room_name, 'c');
+					let room = Rooms.findOneByNameAndType(room_name, 'c');
 					if (!room) {
-						room = RocketChat.models.Rooms.createWithIdTypeAndName(Random.id(), 'c', room_name);
+						room = Rooms.createWithIdTypeAndName(Random.id(), 'c', room_name);
 					}
 
-					if (!RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(room._id, userId)) {
-						RocketChat.models.Subscriptions.createWithRoomAndUser(room, user, {
+					if (!Subscriptions.findOneByRoomIdAndUserId(room._id, userId)) {
+						Subscriptions.createWithRoomAndUser(room, user, {
 							ts: new Date(),
 							open: true,
 							alert: true,

packages/rocketchat-lib/server/functions/index.js

@@ -17,7 +17,7 @@ export { saveCustomFieldsWithoutValidation } from './saveCustomFieldsWithoutVali
 export { saveUser } from './saveUser';
 export { sendMessage } from './sendMessage';
 export { setEmail } from './setEmail';
-export { setRealName } from './setRealName';
+export { setRealName, _setRealName } from './setRealName';
 export { setUserAvatar } from './setUserAvatar';
 export { setUsername } from './setUsername';
 export { unarchiveRoom } from './unarchiveRoom';