Remove dependency of RC namespace in rc-sandstorm

packages/rocketchat-lib/client/lib/sandstorm.js

@@ -0,0 +1,3 @@
+import { Sandstorm } from 'meteor/rocketchat:sandstorm';
+
+RocketChat.Sandstorm = Sandstorm;

packages/rocketchat-lib/package.js

@@ -43,6 +43,7 @@ Package.onUse(function(api) {
 	api.use('rocketchat:logger');
 	api.use('rocketchat:mailer');
 	api.use('rocketchat:settings');
+	api.use('rocketchat:sandstorm');
 	api.use('rocketchat:authorization');
 	api.use('mizzao:timesync');
 	api.use('rocketchat:custom-oauth');
@@ -146,6 +147,7 @@ Package.onUse(function(api) {
 	api.addFiles('server/lib/validateEmailDomain.js', 'server');
 	api.addFiles('server/lib/passwordPolicy.js', 'server');
 	api.addFiles('server/lib/migrations.js', 'server');
+	api.addFiles('server/lib/sandstorm.js', 'server');
 
 	// SERVER MODELS
 	api.addFiles('server/models/index.js', 'server');
@@ -238,6 +240,7 @@ Package.onUse(function(api) {
 	api.addFiles('client/lib/tooltip.js', 'client');
 	api.addFiles('client/lib/EmojiPicker.js', 'client');
 	api.addFiles('client/lib/ui-buttons.js', 'client');
+	api.addFiles('client/lib/sandstorm.js', 'client');
 
 	// CLIENT LIB STARTUP
 	api.addFiles('client/lib/startup/commands.js', 'client');

packages/rocketchat-lib/server/lib/sandstorm.js

@@ -0,0 +1,3 @@
+import { Sandstorm } from 'meteor/rocketchat:sandstorm';
+
+RocketChat.Sandstorm = Sandstorm;

packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js

@@ -5,6 +5,7 @@ import { settings } from 'meteor/rocketchat:settings';
 import { callbacks } from 'meteor/rocketchat:callbacks';
 import { Subscriptions } from 'meteor/rocketchat:models';
 import { roomTypes } from 'meteor/rocketchat:utils';
+import { Sandstorm } from 'meteor/rocketchat:sandstorm';
 import { callJoinRoom, messageContainsHighlight, parseMessageTextPerUser, replaceMentionedUsernamesWithFullNames } from '../functions/notifications/';
 import { sendEmail, shouldNotifyEmail } from '../functions/notifications/email';
 import { sendSinglePush, shouldNotifyMobile } from '../functions/notifications/mobile';
@@ -136,7 +137,7 @@ const sendNotification = async({
 	}
 
 	if (notificationSent) {
-		RocketChat.Sandstorm.notify(message, [subscription.u._id], `@${ sender.username }: ${ message.msg }`, room.t === 'p' ? 'privateMessage' : 'message');
+		Sandstorm.notify(message, [subscription.u._id], `@${ sender.username }: ${ message.msg }`, room.t === 'p' ? 'privateMessage' : 'message');
 	}
 };
 

packages/rocketchat-sandstorm/client/index.js

@@ -1,2 +1,6 @@
-import './powerboxListener';
+import { Sandstorm } from './powerboxListener';
 import './setPath';
+
+export {
+	Sandstorm,
+};

packages/rocketchat-sandstorm/client/powerboxListener.js

@@ -1,9 +1,8 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
 
-RocketChat.Sandstorm = RocketChat.Sandstorm || {};
+export const Sandstorm = {};
 
-RocketChat.Sandstorm.request = function() {};
+Sandstorm.request = function() {};
 if (Meteor.settings.public.sandstorm) {
 	const callbackMap = {};
 
@@ -20,7 +19,7 @@ if (Meteor.settings.public.sandstorm) {
 		uiView: 'EAZQAQEAABEBF1EEAQH_5-Jn6pjXtNsAAAA',
 	};
 
-	RocketChat.Sandstorm.request = function(interfaceName, cb) {
+	Sandstorm.request = function(interfaceName, cb) {
 		const rpcId = Math.random().toString();
 		callbackMap[rpcId] = cb;
 		window.parent.postMessage({ powerboxRequest: {

packages/rocketchat-sandstorm/package.js

@@ -8,7 +8,6 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'rocketchat:lib',
 		'jalik:ufs',
 		'kadira:flow-router',
 	]);

packages/rocketchat-sandstorm/server/events.js

@@ -1,17 +1,17 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
 import { getHttpBridge, waitPromise } from './lib';
+import { Sandstorm } from './lib';
 import _ from 'underscore';
 
-RocketChat.Sandstorm.notify = function() {};
+Sandstorm.notify = function() {};
 
 if (process.env.SANDSTORM === '1') {
 	const ACTIVITY_TYPES = {
 		message: 0,
 		privateMessage: 1,
 	};
 
-	RocketChat.Sandstorm.notify = function(message, userIds, caption, type) {
+	Sandstorm.notify = function(message, userIds, caption, type) {
 		const sessionId = message.sandstormSessionId;
 		if (!sessionId) {
 			return;

packages/rocketchat-sandstorm/server/index.js

@@ -1,3 +1,7 @@
-import './lib';
+import { Sandstorm } from './lib';
 import './events';
 import './powerbox';
+
+export {
+	Sandstorm,
+};

packages/rocketchat-sandstorm/server/lib.js

@@ -1,8 +1,7 @@
 import Future from 'fibers/future';
-import { RocketChat } from 'meteor/rocketchat:lib';
 import { UploadFS } from 'meteor/jalik:ufs';
 
-RocketChat.Sandstorm = {};
+export const Sandstorm = {};
 
 export let getHttpBridge;
 export let waitPromise;

packages/rocketchat-sandstorm/server/powerbox.js

@@ -1,15 +1,15 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Sandstorm } from './lib';
 import { getHttpBridge, waitPromise } from './lib';
 
-RocketChat.Sandstorm.offerUiView = function() {};
+Sandstorm.offerUiView = function() {};
 
 if (process.env.SANDSTORM === '1') {
 	const Capnp = require('capnp');
 	const Powerbox = Capnp.importSystem('sandstorm/powerbox.capnp');
 	const Grain = Capnp.importSystem('sandstorm/grain.capnp');
 
-	RocketChat.Sandstorm.offerUiView = function(token, serializedDescriptor, sessionId) {
+	Sandstorm.offerUiView = function(token, serializedDescriptor, sessionId) {
 		const httpBridge = getHttpBridge();
 		const session = httpBridge.getSessionContext(sessionId).context;
 		const { api } = httpBridge.getSandstormApi(sessionId);
@@ -43,7 +43,7 @@ if (process.env.SANDSTORM === '1') {
 			};
 		},
 		sandstormOffer(token, serializedDescriptor) {
-			RocketChat.Sandstorm.offerUiView(token, serializedDescriptor,
+			Sandstorm.offerUiView(token, serializedDescriptor,
 				this.connection.sandstormSessionId());
 		},
 	});