Removal of EJSON, Accounts, Email, HTTP, Random, ReactiveDict, Reacti…

…veVar, SHA256 and WebApp global variables (#12377) * First wave of removal of Meteor global * Second wave of removal of Meteor global * Third wave of removal of Meteor global * Fix tests * Remove global variable SHA256 * Remove global variable WebApp * Remove global variable EJSON * Remove global variable Email * Remove global variable HTTP * Remove global variable Random * Remove global variable ReactiveDict * Remove global variable ReactiveVar * Remove global variable Accounts * Fix ESLint
RocketChat · Nov 1, 2018 · 26d59c3 · 26d59c3
1 parent 6e88d4d
commit 26d59c3
Show file tree

Hide file tree

Showing 259 changed files with 317 additions and 13 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -4,7 +4,6 @@
 	"globals": {
 		"__meteor_runtime_config__"   : false,
 		"AccountBox"                  : false,
-		"Accounts"                    : false,
 		"AgentUsers"                  : false,
 		"Apps"                        : false,
 		"Assets"                      : false,
@@ -19,11 +18,8 @@
 		"CryptoJS"                    : false,
 		"Department"                  : false,
 		"DDPRateLimiter"              : false,
-		"EJSON"                       : false,
-		"Email"                       : false,
 		"FlowRouter"                  : false,
 		"FileUpload"                  : false,
-		"HTTP"                        : false,
 		"getNextAgent"                : false,
 		"handleError"                 : false,
 		"getAvatarUrlFromUsername"    : false,
@@ -43,9 +39,6 @@
 		"Package"                     : false,
 		"parentCall"                  : false,
 		"Promise"                     : false,
-		"Random"                      : false,
-		"ReactiveDict"                : false,
-		"ReactiveVar"                 : false,
 		"Reload"                      : false,
 		"RocketChat"                  : true,
 		"RocketChatFile"              : false,
@@ -54,7 +47,6 @@
 		"ServiceConfiguration"        : false,
 		"Session"                     : false,
 		"Settings"                    : false,
-		"SHA256"                      : false,
 		"SideNav"                     : false,
 		"t"                           : false,
 		"TAPi18n"                     : false,
@@ -67,7 +59,6 @@
 		"Triggers"                    : false,
 		"UAParser"                    : false,
 		"visitor"                     : false,
-		"WebApp"                      : false,
 		"VideoRecorder"               : false,
 		"VRecDialog"                  : false
 	}

diff --git a/client/routes/router.js b/client/routes/router.js
@@ -1,5 +1,6 @@
 /* globals KonchatNotification */
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 import s from 'underscore.string';
 
 Blaze.registerHelper('pathFor', function(path, kw) {

diff --git a/client/startup/i18n.js b/client/startup/i18n.js
@@ -1,6 +1,7 @@
 /* globals isRtl */
 
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 import moment from 'moment';
 
 const currentLanguage = new ReactiveVar();

diff --git a/packages/chatpal-search/client/template/admin.js b/packages/chatpal-search/client/template/admin.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 import toastr from 'toastr';
 
 Template.ChatpalAdmin.onCreated(function() {

diff --git a/packages/chatpal-search/client/template/result.js b/packages/chatpal-search/client/template/result.js
@@ -1,4 +1,5 @@
 import { DateFormat } from 'meteor/rocketchat:lib';
+import { ReactiveVar } from 'meteor/reactive-var';
 
 Template.ChatpalSearchResultTemplate.onCreated(function() {
 	this.badRequest = new ReactiveVar(false);

diff --git a/packages/chatpal-search/server/provider/index.js b/packages/chatpal-search/server/provider/index.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { HTTP } from 'meteor/http';
 import ChatpalLogger from '../utils/logger';
 import { Random } from 'meteor/random';
 

diff --git a/packages/chatpal-search/server/utils/utils.js b/packages/chatpal-search/server/utils/utils.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { HTTP } from 'meteor/http';
+
 Meteor.methods({
 	'chatpalUtilsCreateKey'(email) {
 		try {

diff --git a/packages/meteor-accounts-saml/saml_client.js b/packages/meteor-accounts-saml/saml_client.js
@@ -1,5 +1,8 @@
 /* globals cordova */
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+import { Random } from 'meteor/random';
+
 if (!Accounts.saml) {
 	Accounts.saml = {};
 }

diff --git a/packages/meteor-accounts-saml/saml_rocketchat.js b/packages/meteor-accounts-saml/saml_rocketchat.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+
 const logger = new Logger('steffo:meteor-accounts-saml', {
 	methods: {
 		updated: {

diff --git a/packages/meteor-accounts-saml/saml_server.js b/packages/meteor-accounts-saml/saml_server.js
@@ -1,6 +1,9 @@
 /* globals RoutePolicy, SAML */
 /* jshint newcap: false */
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+import { Random } from 'meteor/random';
+import { WebApp } from 'meteor/webapp';
 import _ from 'underscore';
 
 if (!Accounts.saml) {

diff --git a/packages/rocketchat-2fa/client/TOTPPassword.js b/packages/rocketchat-2fa/client/TOTPPassword.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 import toastr from 'toastr';
 
 function reportError(error, callback) {

diff --git a/packages/rocketchat-2fa/client/accountSecurity.js b/packages/rocketchat-2fa/client/accountSecurity.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 import toastr from 'toastr';
 import qrcode from 'yaqrcode';
 

diff --git a/packages/rocketchat-2fa/server/lib/totp.js b/packages/rocketchat-2fa/server/lib/totp.js
@@ -1,3 +1,5 @@
+import { SHA256 } from 'meteor/sha';
+import { Random } from 'meteor/random';
 import speakeasy from 'speakeasy';
 
 RocketChat.TOTP = {

diff --git a/packages/rocketchat-2fa/server/loginHandler.js b/packages/rocketchat-2fa/server/loginHandler.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+
 Accounts.registerLoginHandler('totp', function(options) {
 	if (!options.totp || !options.totp.code) {
 		return;

diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js
@@ -1,5 +1,6 @@
 /* global Restivus, DDP, DDPCommon */
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 
 import _ from 'underscore';
 const logger = new Logger('API', {});

diff --git a/packages/rocketchat-api/server/helpers/getLoggedInUser.js b/packages/rocketchat-api/server/helpers/getLoggedInUser.js
@@ -1,3 +1,5 @@
+import { Accounts } from 'meteor/accounts-base';
+
 RocketChat.API.helperMethods.set('getLoggedInUser', function _getLoggedInUser() {
 	let user;
 

diff --git a/packages/rocketchat-api/server/v1/commands.js b/packages/rocketchat-api/server/v1/commands.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 
 RocketChat.API.v1.addRoute('commands.get', { authRequired: true }, {
 	get() {

diff --git a/packages/rocketchat-api/server/v1/push.js b/packages/rocketchat-api/server/v1/push.js
@@ -1,5 +1,6 @@
 /* globals Push */
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 
 RocketChat.API.v1.addRoute('push.token', { authRequired: true }, {
 	post() {

diff --git a/packages/rocketchat-apps/client/admin/appInstall.js b/packages/rocketchat-apps/client/admin/appInstall.js
@@ -7,6 +7,7 @@
 // if you're developing it and using a rest api with a particular parameter passed
 // then it will be enabled by default for development reasons. The server prefers a url
 // over the passed in body, so if both are found it will only use the url.
+import { ReactiveVar } from 'meteor/reactive-var';
 
 Template.appInstall.helpers({
 	appFile() {

diff --git a/packages/rocketchat-apps/client/admin/appLogs.js b/packages/rocketchat-apps/client/admin/appLogs.js
@@ -1,3 +1,4 @@
+import { ReactiveVar } from 'meteor/reactive-var';
 import moment from 'moment';
 import hljs from 'highlight.js';
 

diff --git a/packages/rocketchat-apps/client/admin/appManage.js b/packages/rocketchat-apps/client/admin/appManage.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';

diff --git a/packages/rocketchat-apps/client/admin/appWhatIsIt.js b/packages/rocketchat-apps/client/admin/appWhatIsIt.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 
 Template.appWhatIsIt.onCreated(function() {
 	this.isLoading = new ReactiveVar(false);

diff --git a/packages/rocketchat-apps/client/admin/apps.js b/packages/rocketchat-apps/client/admin/apps.js
@@ -1,4 +1,5 @@
 import toastr from 'toastr';
+import { ReactiveVar } from 'meteor/reactive-var';
 
 import { AppEvents } from '../communication';
 const ENABLED_STATUS = ['auto_enabled', 'manually_enabled'];

diff --git a/packages/rocketchat-apps/server/bridges/http.js b/packages/rocketchat-apps/server/bridges/http.js
@@ -1,3 +1,5 @@
+import { HTTP } from 'meteor/http';
+
 export class AppHttpBridge {
 	async call(info) {
 		if (!info.request.content && typeof info.request.data === 'object') {

diff --git a/packages/rocketchat-apps/server/bridges/messages.js b/packages/rocketchat-apps/server/bridges/messages.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 
 export class AppMessageBridge {
 	constructor(orch) {

diff --git a/packages/rocketchat-apps/server/communication/rest.js b/packages/rocketchat-apps/server/communication/rest.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { HTTP } from 'meteor/http';
 import Busboy from 'busboy';
 
 export class AppsRestApi {

diff --git a/packages/rocketchat-apps/server/converters/messages.js b/packages/rocketchat-apps/server/converters/messages.js
@@ -1,3 +1,5 @@
+import { Random } from 'meteor/random';
+
 export class AppMessagesConverter {
 	constructor(orch) {
 		this.orch = orch;

diff --git a/packages/rocketchat-assets/server/assets.js b/packages/rocketchat-assets/server/assets.js
@@ -1,5 +1,6 @@
 /* global WebAppHashing, WebAppInternals */
 import { Meteor } from 'meteor/meteor';
+import { WebApp } from 'meteor/webapp';
 import _ from 'underscore';
 
 import sizeOf from 'image-size';

diff --git a/packages/rocketchat-authorization/client/views/permissions.js b/packages/rocketchat-authorization/client/views/permissions.js
@@ -1,5 +1,6 @@
 /* globals ChatPermissions */
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 
 Template.permissions.helpers({
 	role() {

diff --git a/packages/rocketchat-authorization/client/views/permissionsRole.js b/packages/rocketchat-authorization/client/views/permissionsRole.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 import toastr from 'toastr';
 
 Template.permissionsRole.helpers({

diff --git a/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js b/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js
@@ -1,5 +1,7 @@
 /* globals ChatSubscription */
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Random } from 'meteor/random';
 import _ from 'underscore';
 import toastr from 'toastr';
 

diff --git a/packages/rocketchat-autotranslate/server/autotranslate.js b/packages/rocketchat-autotranslate/server/autotranslate.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { HTTP } from 'meteor/http';
 import _ from 'underscore';
 import s from 'underscore.string';
 

diff --git a/packages/rocketchat-cas/client/cas_client.js b/packages/rocketchat-cas/client/cas_client.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+import { Random } from 'meteor/random';
 
 const openCenteredPopup = function(url, width, height) {
 

diff --git a/packages/rocketchat-cas/server/cas_server.js b/packages/rocketchat-cas/server/cas_server.js
@@ -1,6 +1,9 @@
 /* globals RoutePolicy, logger */
 /* jshint newcap: false */
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+import { Random } from 'meteor/random';
+import { WebApp } from 'meteor/webapp';
 import _ from 'underscore';
 
 import fiber from 'fibers';

diff --git a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js b/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js
@@ -1,5 +1,6 @@
 /* global AutoComplete Deps */
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 import toastr from 'toastr';
 import resetSelection from '../resetSelection';
 

diff --git a/packages/rocketchat-channel-settings/client/lib/ChannelSettings.js b/packages/rocketchat-channel-settings/client/lib/ChannelSettings.js
@@ -1,4 +1,6 @@
+import { ReactiveVar } from 'meteor/reactive-var';
 import _ from 'underscore';
+
 RocketChat.ChannelSettings = new class {
 	constructor() {
 		this.options = new ReactiveVar({});

diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.js b/packages/rocketchat-channel-settings/client/views/channelSettings.js
@@ -1,5 +1,6 @@
 /* globals popover */
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 import toastr from 'toastr';
 import moment from 'moment';
 import s from 'underscore.string';

diff --git a/packages/rocketchat-cors/cors.js b/packages/rocketchat-cors/cors.js
@@ -1,5 +1,6 @@
 /* globals WebAppInternals */
 import { Meteor } from 'meteor/meteor';
+import { WebApp } from 'meteor/webapp';
 import _ from 'underscore';
 
 import url from 'url';

diff --git a/packages/rocketchat-crowd/client/loginHelper.js b/packages/rocketchat-crowd/client/loginHelper.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 
 Meteor.loginWithCrowd = function(...args) {
 	// Pull username and password

diff --git a/packages/rocketchat-crowd/server/crowd.js b/packages/rocketchat-crowd/server/crowd.js
@@ -1,6 +1,8 @@
 /* globals:CROWD:true */
 /* eslint new-cap: [2, {"capIsNewExceptions": ["SHA256"]}] */
+import { SHA256 } from 'meteor/sha';
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 const logger = new Logger('CROWD', {});
 
 function fallbackDefaultAccountSystem(bind, username, password) {

diff --git a/packages/rocketchat-custom-oauth/client/custom_oauth_client.js b/packages/rocketchat-custom-oauth/client/custom_oauth_client.js
@@ -1,5 +1,7 @@
 /* globals OAuth*/
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+import { Random } from 'meteor/random';
 import s from 'underscore.string';
 
 // Request custom OAuth credentials for the user

diff --git a/packages/rocketchat-custom-oauth/server/custom_oauth_server.js b/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
@@ -1,5 +1,7 @@
 /* globals OAuth*/
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+import { HTTP } from 'meteor/http';
 import _ from 'underscore';
 
 const logger = new Logger('CustomOAuth');

diff --git a/packages/rocketchat-custom-sounds/client/admin/adminSounds.js b/packages/rocketchat-custom-sounds/client/admin/adminSounds.js
@@ -1,4 +1,5 @@
 import s from 'underscore.string';
+import { ReactiveVar } from 'meteor/reactive-var';
 
 import { RocketChatTabBar } from 'meteor/rocketchat:lib';
 

diff --git a/packages/rocketchat-custom-sounds/client/admin/soundInfo.js b/packages/rocketchat-custom-sounds/client/admin/soundInfo.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 
 Template.soundInfo.helpers({
 	name() {

diff --git a/packages/rocketchat-custom-sounds/client/lib/CustomSounds.js b/packages/rocketchat-custom-sounds/client/lib/CustomSounds.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 import _ from 'underscore';
 
 class CustomSounds {

diff --git a/packages/rocketchat-custom-sounds/server/startup/custom-sounds.js b/packages/rocketchat-custom-sounds/server/startup/custom-sounds.js
@@ -1,5 +1,6 @@
 /* globals RocketChatFileCustomSoundsInstance */
 import { Meteor } from 'meteor/meteor';
+import { WebApp } from 'meteor/webapp';
 import _ from 'underscore';
 
 Meteor.startup(function() {

diff --git a/packages/rocketchat-emoji-custom/admin/adminEmoji.js b/packages/rocketchat-emoji-custom/admin/adminEmoji.js
@@ -1,5 +1,5 @@
 import s from 'underscore.string';
-
+import { ReactiveVar } from 'meteor/reactive-var';
 import { RocketChatTabBar } from 'meteor/rocketchat:lib';
 
 Template.adminEmoji.helpers({

diff --git a/packages/rocketchat-emoji-custom/admin/emojiInfo.js b/packages/rocketchat-emoji-custom/admin/emojiInfo.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 
 Template.emojiInfo.helpers({
 	name() {

diff --git a/packages/rocketchat-emoji-custom/server/startup/emoji-custom.js b/packages/rocketchat-emoji-custom/server/startup/emoji-custom.js
@@ -1,5 +1,6 @@
 /* globals RocketChatFileEmojiCustomInstance */
 import { Meteor } from 'meteor/meteor';
+import { WebApp } from 'meteor/webapp';
 import _ from 'underscore';
 
 Meteor.startup(function() {

diff --git a/packages/rocketchat-emoji/client/emojiPicker.js b/packages/rocketchat-emoji/client/emojiPicker.js
@@ -1,4 +1,6 @@
 /* globals Template, isSetNotNull */
+import { ReactiveVar } from 'meteor/reactive-var';
+
 const emojiCategories = {};
 /**
  * Turns category hash to a nice readable translated name

diff --git a/packages/rocketchat-file-upload/client/lib/fileUploadHandler.js b/packages/rocketchat-file-upload/client/lib/fileUploadHandler.js
@@ -1,6 +1,7 @@
 /* globals FileUploadBase, UploadFS, fileUploadHandler:true */
 /* exported fileUploadHandler */
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 
 new UploadFS.Store({
 	collection: RocketChat.models.Uploads.model,

diff --git a/packages/rocketchat-file-upload/lib/FileUploadBase.js b/packages/rocketchat-file-upload/lib/FileUploadBase.js
@@ -1,6 +1,7 @@
 /* globals FileUploadBase:true, UploadFS */
 /* exported FileUploadBase */
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 import _ from 'underscore';
 
 UploadFS.config.defaultStorePermissions = new UploadFS.StorePermissions({