Removal of EJSON, Accounts, Email, HTTP, Random, ReactiveDict, ReactiveVar, 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

.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
 	}

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) {

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();

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() {

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);

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';
 

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 {

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 = {};
 }

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: {

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) {

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) {

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';
 

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 = {

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;

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', {});

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;
 

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() {

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() {

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() {

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';
 

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';

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);

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'];

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') {

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) {

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 {

packages/rocketchat-apps/server/converters/messages.js

@@ -1,3 +1,5 @@
+import { Random } from 'meteor/random';
+
 export class AppMessagesConverter {
 	constructor(orch) {
 		this.orch = orch;

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';

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() {

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({

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';
 

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';
 

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) {
 

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';

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';
 

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({});

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';

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';

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

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) {

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

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');

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';
 

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() {

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 {

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() {

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({

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() {

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() {

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

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,

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({

packages/rocketchat-file-upload/server/config/Slingshot_DEPRECATED.js

@@ -1,5 +1,6 @@
 /* globals Slingshot, FileUpload */
 import _ from 'underscore';
+import { Random } from 'meteor/random';
 
 const configureSlingshot = _.debounce(() => {
 	const type = RocketChat.settings.get('FileUpload_Storage_Type');

packages/rocketchat-file-upload/server/lib/proxy.js

@@ -1,6 +1,7 @@
 /* globals UploadFS, InstanceStatus */
 
 import { Meteor } from 'meteor/meteor';
+import { WebApp } from 'meteor/webapp';
 import http from 'http';
 import URL from 'url';
 

packages/rocketchat-file-upload/server/methods/sendFileMessage.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 import _ from 'underscore';
 
 Meteor.methods({

packages/rocketchat-file-upload/ufs/AmazonS3/server.js

@@ -1,4 +1,5 @@
 import { UploadFS } from 'meteor/jalik:ufs';
+import { Random } from 'meteor/random';
 import _ from 'underscore';
 import S3 from 'aws-sdk/clients/s3';
 import stream from 'stream';

packages/rocketchat-file-upload/ufs/GoogleStorage/server.js

@@ -1,4 +1,5 @@
 import { UploadFS } from 'meteor/jalik:ufs';
+import { Random } from 'meteor/random';
 import gcStorage from '@google-cloud/storage';
 
 /**

packages/rocketchat-file-upload/ufs/Webdav/server.js

@@ -1,4 +1,5 @@
 import { UploadFS } from 'meteor/jalik:ufs';
+import { Random } from 'meteor/random';
 import Webdav from 'webdav';
 import stream from 'stream';
 /**

packages/rocketchat-google-vision/server/googlevision.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 
 class GoogleVision {
 	constructor() {

packages/rocketchat-importer-csv/server/importer.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 import {
 	Base,
 	ProgressStep,

packages/rocketchat-importer-hipchat-enterprise/server/importer.js

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+import { Random } from 'meteor/random';
 import {
 	Base,
 	ProgressStep,

packages/rocketchat-importer-hipchat/server/importer.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 import {
 	Base,
 	ProgressStep,

packages/rocketchat-importer-slack-users/server/importer.js

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+import { Random } from 'meteor/random';
 import {
 	Base,
 	ProgressStep,

packages/rocketchat-importer-slack/server/importer.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 import {
 	Base,
 	ProgressStep,

packages/rocketchat-importer/client/admin/adminImportPrepare.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 import { Importers } from 'meteor/rocketchat:importer';
 import toastr from 'toastr';
 

packages/rocketchat-importer/client/admin/adminImportProgress.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 import { Importers, ImporterWebsocketReceiver, ProgressStep } from 'meteor/rocketchat:importer';
 
 import toastr from 'toastr';

packages/rocketchat-integrations/client/views/integrationsIncoming.js

@@ -1,6 +1,8 @@
 /* global ChatIntegrations */
 
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Random } from 'meteor/random';
 import hljs from 'highlight.js';
 import toastr from 'toastr';
 

packages/rocketchat-integrations/client/views/integrationsOutgoing.js

@@ -1,6 +1,8 @@
 /* global ChatIntegrations */
 
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Random } from 'meteor/random';
 import hljs from 'highlight.js';
 import toastr from 'toastr';
 

packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js

@@ -1,6 +1,7 @@
 /* global ChatIntegrations, ChatIntegrationHistory */
 
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 import _ from 'underscore';
 import hljs from 'highlight.js';
 import moment from 'moment';

packages/rocketchat-integrations/server/api/api.js

@@ -1,6 +1,8 @@
 /* globals Meteor Restivus logger processWebhookMessage*/
 // TODO: remove globals
 
+import { HTTP } from 'meteor/http';
+import { Random } from 'meteor/random';
 import Fiber from 'fibers';
 import Future from 'fibers/future';
 import _ from 'underscore';

packages/rocketchat-integrations/server/lib/triggerHandler.js

@@ -1,5 +1,7 @@
 /* global logger, processWebhookMessage */
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
+import { HTTP } from 'meteor/http';
 import _ from 'underscore';
 import s from 'underscore.string';
 import moment from 'moment';

packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.js

@@ -1,5 +1,6 @@
 /* global Babel */
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 import _ from 'underscore';
 import s from 'underscore.string';
 const validChannelChars = ['@', '#'];

packages/rocketchat-katex/katex.js

@@ -3,6 +3,7 @@
  * https://github.com/Khan/KaTeX
  */
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 import _ from 'underscore';
 import s from 'underscore.string';
 

packages/rocketchat-lazy-load/client/lazyloadImage.js

@@ -1,3 +1,4 @@
+import { ReactiveVar } from 'meteor/reactive-var';
 import './lazyloadImage.html';
 import { addImage, fixCordova } from './';
 

packages/rocketchat-ldap/client/loginHelper.js

@@ -3,6 +3,7 @@
 // on any particular call (if you have multiple ldap servers you'd like to connect to)
 // You'll likely want to set the dn value here {dn: "..."}
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 
 Meteor.loginWithLDAP = function(...args) {
 	// Pull username and password

packages/rocketchat-ldap/server/loginHandler.js

@@ -1,6 +1,8 @@
 /* eslint new-cap: [2, {"capIsNewExceptions": ["SHA256"]}] */
 
+import { SHA256 } from 'meteor/sha';
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 import { slug, getLdapUsername, getLdapUserUniqueID, syncUserData, addLdapUser } from './sync';
 import LDAP from './ldap';
 

packages/rocketchat-ldap/server/sync.js

@@ -1,6 +1,7 @@
 /* globals slugify, SyncedCron */
 
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 import _ from 'underscore';
 import LDAP from './ldap';
 

packages/rocketchat-lib/client/AdminBox.js

@@ -1,3 +1,4 @@
+import { ReactiveVar } from 'meteor/reactive-var';
 import _ from 'underscore';
 
 RocketChat.AdminBox = new class {

packages/rocketchat-lib/client/MessageAction.js

@@ -1,6 +1,7 @@
 /* globals chatMessages cordova */
 
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 import _ from 'underscore';
 import moment from 'moment';
 import toastr from 'toastr';

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

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
 
 export class RocketChatAnnouncement {
 	constructor(args = {}) {

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

@@ -1,3 +1,5 @@
+import { ReactiveVar } from 'meteor/reactive-var';
+
 export class RocketChatTabBar {
 	constructor() {
 		this.template = new ReactiveVar();

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

@@ -1,4 +1,5 @@
 import _ from 'underscore';
+import { ReactiveVar } from 'meteor/reactive-var';
 
 RocketChat.TabBar = new (class TabBar {
 	get size() {

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

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+import { ReactiveVar } from 'meteor/reactive-var';
 import localforage from 'localforage';
 import _ from 'underscore';
 

packages/rocketchat-lib/client/views/customFieldsForm.js

@@ -1,3 +1,5 @@
+import { ReactiveVar } from 'meteor/reactive-var';
+
 Template.customFieldsForm.helpers({
 	new() {
 		return this.new;

packages/rocketchat-lib/lib/RoomTypeConfig.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 
 export const RoomSettingsEnum = {
 	NAME: 'roomName',

packages/rocketchat-lib/lib/callbacks.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 import _ from 'underscore';
 
 /*

packages/rocketchat-lib/lib/promises.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 import _ from 'underscore';
 
 /*

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

@@ -1,5 +1,6 @@
 /* globals Gravatar */
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 import _ from 'underscore';
 import s from 'underscore.string';
 import * as Mailer from 'meteor/rocketchat:mailer';

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

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { HTTP } from 'meteor/http';
 
 RocketChat.setUserAvatar = function(user, dataURI, contentType, service) {
 	let encoding;

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

@@ -1,4 +1,5 @@
 import s from 'underscore.string';
+import { Accounts } from 'meteor/accounts-base';
 
 RocketChat._setUsername = function(userId, u) {
 	const username = s.trim(u);

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

@@ -1,5 +1,6 @@
 /* global InstanceStatus */
 import { Meteor } from 'meteor/meteor';
+import { WebApp } from 'meteor/webapp';
 import _ from 'underscore';
 
 const logger = new Logger('Meteor', {

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

@@ -1,5 +1,6 @@
 // Do not disclose if user exists when password is invalid
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 
 const { _runLoginHandlers } = Accounts;
 Accounts._runLoginHandlers = function(methodInvocation, options) {

packages/rocketchat-lib/server/methods/createToken.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 
 Meteor.methods({
 	createToken(userId) {

packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 import s from 'underscore.string';
 
 Meteor.methods({

packages/rocketchat-lib/server/methods/filterATAllTag.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 import _ from 'underscore';
 
 RocketChat.callbacks.add('beforeSaveMessage', function(message) {

packages/rocketchat-lib/server/methods/filterATHereTag.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 import _ from 'underscore';
 
 RocketChat.callbacks.add('beforeSaveMessage', function(message) {

packages/rocketchat-lib/server/methods/sendMessage.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 import moment from 'moment';
 
 Meteor.methods({

packages/rocketchat-lib/server/models/Users.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 import _ from 'underscore';
 import s from 'underscore.string';
 

packages/rocketchat-lib/server/oauth/facebook.js

@@ -1,5 +1,6 @@
 import _ from 'underscore';
 import { OAuth } from 'meteor/oauth';
+import { HTTP } from 'meteor/http';
 const crypto = Npm.require('crypto');
 const whitelisted = [
 	'id',

packages/rocketchat-lib/server/oauth/google.js

@@ -1,5 +1,6 @@
 /* globals Google */
 import _ from 'underscore';
+import { HTTP } from 'meteor/http';
 
 function getIdentity(accessToken) {
 	try {