diff --git a/.eslintrc b/.eslintrc index 42e4850f3e0d..4142562873ce 100644 --- 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 index 45d241687e86..748f329da75f 100644 --- 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 index a6e78a273f43..3819f82c0edd 100644 --- 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 index adf4589e705e..6882d2bb5a3a 100644 --- 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 index b188e21b8a94..7041ea9879d8 100644 --- 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 index 3a4e461b9a58..9a393ce05362 100644 --- 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 index ec76ba5aceb5..d30ba0415c64 100644 --- 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 index 9d167572008c..bc0076e9ac94 100644 --- 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 index f7b5b6b354aa..40d18a5cb0bd 100644 --- 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 index d802d286dc5b..4bc41a2e5445 100644 --- 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 index 4c087081bfb4..5ac31193fc67 100644 --- 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 index e2d00c3c061e..dc61eebbface 100644 --- 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 index f245d209f5d3..e6f7878b4afd 100644 --- 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 index db4794391683..545038cfb73b 100644 --- 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 index b1a799d78a08..a42d93895503 100644 --- 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 index 5126d2b67748..f67a50928176 100644 --- 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 index 28a18ab419bb..9be449734d39 100644 --- 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 index a211c8df2d87..dfb6cae1d9dc 100644 --- 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 index 498410a3de3c..c89259fd9fe6 100644 --- 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 index 611edd82d013..d798d1349807 100644 --- 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 index 4c2f127ab776..19078f9fb96c 100644 --- 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 index ce77b1c67248..c527d7416014 100644 --- 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 index 5def7c5e4bdd..8e7166653300 100644 --- 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 index 4d32f265950d..dcb51ec6ce9c 100644 --- 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 index debbff666499..de3b0a89d9ca 100644 --- 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 index cd99f018ab59..68d30c1bf470 100644 --- 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 index e1bbc5a9b88c..d53cc5d297bb 100644 --- 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 index d65af0011c53..b79fbce2e03f 100644 --- 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 index 85fe41ffc5e8..b77c8daab9be 100644 --- 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 index 1bf1bb252f19..d7bb54a6609b 100644 --- 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 index 0134944c13ee..c3a67f9378af 100644 --- 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 index afbb6c5f0113..eeabb34eaae9 100644 --- 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 index 280e89380d8c..9bf775ec8e39 100644 --- 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 index 726157db8264..3f03dbf65c8a 100644 --- 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 index 60fcf50da9c5..98919e4cb59b 100644 --- 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 index 92ff8d7d0ef7..d5ec4375bef8 100644 --- 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 index 28f42c24f205..43804f74b8c3 100644 --- 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 index fb9c25d5e8ee..9d1f60f6c23e 100644 --- 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 index e8a87e38aec3..a7056d5d2ffe 100644 --- 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 index c430d78f8ac0..67c53b291776 100644 --- 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 index 2338ae86e7d7..f93ee32782d2 100644 --- 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 index 0c96ca95be68..e0c5ba09c758 100644 --- 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 index a1f8ecf28c0a..61f3ba8c463a 100644 --- 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 index 30dbf18f4588..b4c05674aec3 100644 --- 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 index eb2ba40fe74d..5f3775b10256 100644 --- 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 index 308f1536e636..226ed972cbfe 100644 --- 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 index aee72d545616..7071f93e5761 100644 --- 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 index 0e19c436fea6..719645032b28 100644 --- 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 index ecff8cbc0da9..1a8c3aa50a43 100644 --- 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 index 31094181ae52..e8e180e8b9a0 100644 --- 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 index 030f74731f98..b6e2f55310cc 100644 --- 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 index b32747154e90..0327222401b6 100644 --- 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({ diff --git a/packages/rocketchat-file-upload/server/config/Slingshot_DEPRECATED.js b/packages/rocketchat-file-upload/server/config/Slingshot_DEPRECATED.js index d802dc1a4aea..2a7539bb17c8 100644 --- a/packages/rocketchat-file-upload/server/config/Slingshot_DEPRECATED.js +++ b/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'); diff --git a/packages/rocketchat-file-upload/server/lib/proxy.js b/packages/rocketchat-file-upload/server/lib/proxy.js index 5f5090947132..83653bd43a24 100644 --- a/packages/rocketchat-file-upload/server/lib/proxy.js +++ b/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'; diff --git a/packages/rocketchat-file-upload/server/methods/sendFileMessage.js b/packages/rocketchat-file-upload/server/methods/sendFileMessage.js index 7a4112ebe642..95c3f55d29a2 100644 --- a/packages/rocketchat-file-upload/server/methods/sendFileMessage.js +++ b/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({ diff --git a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js b/packages/rocketchat-file-upload/ufs/AmazonS3/server.js index 5906323f4c5d..db850f5ab171 100644 --- a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js +++ b/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'; diff --git a/packages/rocketchat-file-upload/ufs/GoogleStorage/server.js b/packages/rocketchat-file-upload/ufs/GoogleStorage/server.js index 570c1b595d08..7fdb3e8ea397 100644 --- a/packages/rocketchat-file-upload/ufs/GoogleStorage/server.js +++ b/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'; /** diff --git a/packages/rocketchat-file-upload/ufs/Webdav/server.js b/packages/rocketchat-file-upload/ufs/Webdav/server.js index 19c46700815a..ede964e158e6 100644 --- a/packages/rocketchat-file-upload/ufs/Webdav/server.js +++ b/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'; /** diff --git a/packages/rocketchat-google-vision/server/googlevision.js b/packages/rocketchat-google-vision/server/googlevision.js index ec05eac45737..d2609c89e97d 100644 --- a/packages/rocketchat-google-vision/server/googlevision.js +++ b/packages/rocketchat-google-vision/server/googlevision.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; class GoogleVision { constructor() { diff --git a/packages/rocketchat-importer-csv/server/importer.js b/packages/rocketchat-importer-csv/server/importer.js index c10a512041ca..eeb5c854fccd 100644 --- a/packages/rocketchat-importer-csv/server/importer.js +++ b/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, diff --git a/packages/rocketchat-importer-hipchat-enterprise/server/importer.js b/packages/rocketchat-importer-hipchat-enterprise/server/importer.js index 6c42b03f7cae..815e6da7c848 100644 --- a/packages/rocketchat-importer-hipchat-enterprise/server/importer.js +++ b/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, diff --git a/packages/rocketchat-importer-hipchat/server/importer.js b/packages/rocketchat-importer-hipchat/server/importer.js index 7c9ec7789fa0..a00526a61b60 100644 --- a/packages/rocketchat-importer-hipchat/server/importer.js +++ b/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, diff --git a/packages/rocketchat-importer-slack-users/server/importer.js b/packages/rocketchat-importer-slack-users/server/importer.js index f6d0b7d5321f..a557cbe717ce 100644 --- a/packages/rocketchat-importer-slack-users/server/importer.js +++ b/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, diff --git a/packages/rocketchat-importer-slack/server/importer.js b/packages/rocketchat-importer-slack/server/importer.js index 6065b0f05808..dc267381485c 100644 --- a/packages/rocketchat-importer-slack/server/importer.js +++ b/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, diff --git a/packages/rocketchat-importer/client/admin/adminImportPrepare.js b/packages/rocketchat-importer/client/admin/adminImportPrepare.js index aa93a2cb2687..74021bebe502 100644 --- a/packages/rocketchat-importer/client/admin/adminImportPrepare.js +++ b/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'; diff --git a/packages/rocketchat-importer/client/admin/adminImportProgress.js b/packages/rocketchat-importer/client/admin/adminImportProgress.js index e30a6a4aa667..aa9368442055 100644 --- a/packages/rocketchat-importer/client/admin/adminImportProgress.js +++ b/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'; diff --git a/packages/rocketchat-integrations/client/views/integrationsIncoming.js b/packages/rocketchat-integrations/client/views/integrationsIncoming.js index fbfb27c98dfe..7270b88b29d3 100644 --- a/packages/rocketchat-integrations/client/views/integrationsIncoming.js +++ b/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'; diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoing.js b/packages/rocketchat-integrations/client/views/integrationsOutgoing.js index dd3fe136cbbf..2adf5c15d3e4 100644 --- a/packages/rocketchat-integrations/client/views/integrationsOutgoing.js +++ b/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'; diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js b/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js index 722e7aa94bcf..c69aeecc3605 100644 --- a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js +++ b/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'; diff --git a/packages/rocketchat-integrations/server/api/api.js b/packages/rocketchat-integrations/server/api/api.js index e6afa94c292f..54ab0e9be8fd 100644 --- a/packages/rocketchat-integrations/server/api/api.js +++ b/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'; diff --git a/packages/rocketchat-integrations/server/lib/triggerHandler.js b/packages/rocketchat-integrations/server/lib/triggerHandler.js index a97fedb80e58..851abfc69639 100644 --- a/packages/rocketchat-integrations/server/lib/triggerHandler.js +++ b/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'; diff --git a/packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.js b/packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.js index 6e387338cccd..c553bcd66c51 100644 --- a/packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.js +++ b/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 = ['@', '#']; diff --git a/packages/rocketchat-katex/katex.js b/packages/rocketchat-katex/katex.js index 1a5c5033cd15..bd233d87caa8 100644 --- a/packages/rocketchat-katex/katex.js +++ b/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'; diff --git a/packages/rocketchat-lazy-load/client/lazyloadImage.js b/packages/rocketchat-lazy-load/client/lazyloadImage.js index c48015dce546..cf8b79664dc8 100644 --- a/packages/rocketchat-lazy-load/client/lazyloadImage.js +++ b/packages/rocketchat-lazy-load/client/lazyloadImage.js @@ -1,3 +1,4 @@ +import { ReactiveVar } from 'meteor/reactive-var'; import './lazyloadImage.html'; import { addImage, fixCordova } from './'; diff --git a/packages/rocketchat-ldap/client/loginHelper.js b/packages/rocketchat-ldap/client/loginHelper.js index f5b8e9dc58bf..57a006524c08 100644 --- a/packages/rocketchat-ldap/client/loginHelper.js +++ b/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 diff --git a/packages/rocketchat-ldap/server/loginHandler.js b/packages/rocketchat-ldap/server/loginHandler.js index a50455f2544c..134fbdf0ab36 100644 --- a/packages/rocketchat-ldap/server/loginHandler.js +++ b/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'; diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js index 1605d3c38a00..75e3abd719f8 100644 --- a/packages/rocketchat-ldap/server/sync.js +++ b/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'; diff --git a/packages/rocketchat-lib/client/AdminBox.js b/packages/rocketchat-lib/client/AdminBox.js index 10492de6a265..15253eb648b6 100644 --- a/packages/rocketchat-lib/client/AdminBox.js +++ b/packages/rocketchat-lib/client/AdminBox.js @@ -1,3 +1,4 @@ +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; RocketChat.AdminBox = new class { diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index cdf9bedb7a16..7e891f19d5ed 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/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'; diff --git a/packages/rocketchat-lib/client/lib/RocketChatAnnouncement.js b/packages/rocketchat-lib/client/lib/RocketChatAnnouncement.js index a220b388906c..4fd6d432abce 100644 --- a/packages/rocketchat-lib/client/lib/RocketChatAnnouncement.js +++ b/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 = {}) { diff --git a/packages/rocketchat-lib/client/lib/RocketChatTabBar.js b/packages/rocketchat-lib/client/lib/RocketChatTabBar.js index 49c36326c801..c891c13278cd 100644 --- a/packages/rocketchat-lib/client/lib/RocketChatTabBar.js +++ b/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(); diff --git a/packages/rocketchat-lib/client/lib/TabBar.js b/packages/rocketchat-lib/client/lib/TabBar.js index 5c03f09ee33e..8e7db8dff6e9 100644 --- a/packages/rocketchat-lib/client/lib/TabBar.js +++ b/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() { diff --git a/packages/rocketchat-lib/client/lib/cachedCollection.js b/packages/rocketchat-lib/client/lib/cachedCollection.js index e91c0dccb3be..24a07fbadbf0 100644 --- a/packages/rocketchat-lib/client/lib/cachedCollection.js +++ b/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'; diff --git a/packages/rocketchat-lib/client/views/customFieldsForm.js b/packages/rocketchat-lib/client/views/customFieldsForm.js index 469fcb933ff5..f631f6400bdc 100644 --- a/packages/rocketchat-lib/client/views/customFieldsForm.js +++ b/packages/rocketchat-lib/client/views/customFieldsForm.js @@ -1,3 +1,5 @@ +import { ReactiveVar } from 'meteor/reactive-var'; + Template.customFieldsForm.helpers({ new() { return this.new; diff --git a/packages/rocketchat-lib/lib/RoomTypeConfig.js b/packages/rocketchat-lib/lib/RoomTypeConfig.js index cb0e31d1a44e..2a16e5247384 100644 --- a/packages/rocketchat-lib/lib/RoomTypeConfig.js +++ b/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', diff --git a/packages/rocketchat-lib/lib/callbacks.js b/packages/rocketchat-lib/lib/callbacks.js index 73c800a022d0..f4c6c2c8a5e9 100644 --- a/packages/rocketchat-lib/lib/callbacks.js +++ b/packages/rocketchat-lib/lib/callbacks.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import _ from 'underscore'; /* diff --git a/packages/rocketchat-lib/lib/promises.js b/packages/rocketchat-lib/lib/promises.js index bf201d0e2029..a306ccceeef6 100644 --- a/packages/rocketchat-lib/lib/promises.js +++ b/packages/rocketchat-lib/lib/promises.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import _ from 'underscore'; /* diff --git a/packages/rocketchat-lib/server/functions/saveUser.js b/packages/rocketchat-lib/server/functions/saveUser.js index f3c794976917..7d6fbf9f5f64 100644 --- a/packages/rocketchat-lib/server/functions/saveUser.js +++ b/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'; diff --git a/packages/rocketchat-lib/server/functions/setUserAvatar.js b/packages/rocketchat-lib/server/functions/setUserAvatar.js index 0985178849b2..dc4319aff6fb 100644 --- a/packages/rocketchat-lib/server/functions/setUserAvatar.js +++ b/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; diff --git a/packages/rocketchat-lib/server/functions/setUsername.js b/packages/rocketchat-lib/server/functions/setUsername.js index 20c317c9b032..b9fa77799398 100644 --- a/packages/rocketchat-lib/server/functions/setUsername.js +++ b/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); diff --git a/packages/rocketchat-lib/server/lib/debug.js b/packages/rocketchat-lib/server/lib/debug.js index 1c7b577c2c27..f5ca069d8a04 100644 --- a/packages/rocketchat-lib/server/lib/debug.js +++ b/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', { diff --git a/packages/rocketchat-lib/server/lib/loginErrorMessageOverride.js b/packages/rocketchat-lib/server/lib/loginErrorMessageOverride.js index 857a4eb5bf92..c75c3853bc1e 100644 --- a/packages/rocketchat-lib/server/lib/loginErrorMessageOverride.js +++ b/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) { diff --git a/packages/rocketchat-lib/server/methods/createToken.js b/packages/rocketchat-lib/server/methods/createToken.js index 0dc8711b9df2..249c039b4a61 100644 --- a/packages/rocketchat-lib/server/methods/createToken.js +++ b/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) { diff --git a/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js b/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js index 33128f5ab704..06a7ba4ad9b7 100644 --- a/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js +++ b/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({ diff --git a/packages/rocketchat-lib/server/methods/filterATAllTag.js b/packages/rocketchat-lib/server/methods/filterATAllTag.js index 906e68af624f..7a2f596a670b 100644 --- a/packages/rocketchat-lib/server/methods/filterATAllTag.js +++ b/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) { diff --git a/packages/rocketchat-lib/server/methods/filterATHereTag.js b/packages/rocketchat-lib/server/methods/filterATHereTag.js index a5765967de4e..9ca5680d4c55 100644 --- a/packages/rocketchat-lib/server/methods/filterATHereTag.js +++ b/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) { diff --git a/packages/rocketchat-lib/server/methods/sendMessage.js b/packages/rocketchat-lib/server/methods/sendMessage.js index bfec23de3dd4..5844d3d7697e 100644 --- a/packages/rocketchat-lib/server/methods/sendMessage.js +++ b/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({ diff --git a/packages/rocketchat-lib/server/models/Users.js b/packages/rocketchat-lib/server/models/Users.js index 87fe3900e332..cf968a47c15c 100644 --- a/packages/rocketchat-lib/server/models/Users.js +++ b/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'; diff --git a/packages/rocketchat-lib/server/oauth/facebook.js b/packages/rocketchat-lib/server/oauth/facebook.js index 1776dce9d832..7f1bf4ab13ce 100644 --- a/packages/rocketchat-lib/server/oauth/facebook.js +++ b/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', diff --git a/packages/rocketchat-lib/server/oauth/google.js b/packages/rocketchat-lib/server/oauth/google.js index eaebc9b901a1..068a288ddc2d 100644 --- a/packages/rocketchat-lib/server/oauth/google.js +++ b/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 { diff --git a/packages/rocketchat-lib/server/oauth/oauth.js b/packages/rocketchat-lib/server/oauth/oauth.js index 71cf29905869..49762204713c 100644 --- a/packages/rocketchat-lib/server/oauth/oauth.js +++ b/packages/rocketchat-lib/server/oauth/oauth.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; import _ from 'underscore'; const AccessTokenServices = {}; diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js index 749431adfd17..4902fd7e84b8 100644 --- a/packages/rocketchat-lib/server/startup/settings.js +++ b/packages/rocketchat-lib/server/startup/settings.js @@ -1,3 +1,4 @@ +import { Random } from 'meteor/random'; import './email'; // Insert server unique id if it doesn't exist diff --git a/packages/rocketchat-livechat/.app/client/lib/LivechatVideoCall.js b/packages/rocketchat-livechat/.app/client/lib/LivechatVideoCall.js index feb456ed82f8..0cb30fd43a9f 100644 --- a/packages/rocketchat-livechat/.app/client/lib/LivechatVideoCall.js +++ b/packages/rocketchat-livechat/.app/client/lib/LivechatVideoCall.js @@ -1,5 +1,6 @@ /* globals LivechatVideoCall, cordova, JitsiMeetExternalAPI */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import visitor from '../../imports/client/visitor'; LivechatVideoCall = new (class LivechatVideoCall { diff --git a/packages/rocketchat-livechat/.app/client/lib/_livechat.js b/packages/rocketchat-livechat/.app/client/lib/_livechat.js index fddfc5040f87..ee2ab10a6cab 100644 --- a/packages/rocketchat-livechat/.app/client/lib/_livechat.js +++ b/packages/rocketchat-livechat/.app/client/lib/_livechat.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import visitor from '../../imports/client/visitor'; this.Livechat = new (class Livechat { diff --git a/packages/rocketchat-livechat/.app/client/lib/chatMessages.js b/packages/rocketchat-livechat/.app/client/lib/chatMessages.js index 98bdb93c1cbf..c4edf1ae596b 100644 --- a/packages/rocketchat-livechat/.app/client/lib/chatMessages.js +++ b/packages/rocketchat-livechat/.app/client/lib/chatMessages.js @@ -1,5 +1,6 @@ /* globals MsgTyping, showError, Livechat */ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/packages/rocketchat-livechat/.app/client/lib/fromApp/RoomHistoryManager.js b/packages/rocketchat-livechat/.app/client/lib/fromApp/RoomHistoryManager.js index 76a64bdbc905..dabc2282d6ba 100644 --- a/packages/rocketchat-livechat/.app/client/lib/fromApp/RoomHistoryManager.js +++ b/packages/rocketchat-livechat/.app/client/lib/fromApp/RoomHistoryManager.js @@ -1,6 +1,7 @@ /* globals readMessage UserRoles RoomRoles*/ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import visitor from '../../../imports/client/visitor'; import _ from 'underscore'; diff --git a/packages/rocketchat-livechat/.app/client/lib/hooks.js b/packages/rocketchat-livechat/.app/client/lib/hooks.js index 9bbf720933bb..862417b1c185 100644 --- a/packages/rocketchat-livechat/.app/client/lib/hooks.js +++ b/packages/rocketchat-livechat/.app/client/lib/hooks.js @@ -1,5 +1,6 @@ /* globals CustomFields, Livechat */ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import visitor from '../../imports/client/visitor'; const api = { diff --git a/packages/rocketchat-livechat/.app/client/lib/msgTyping.js b/packages/rocketchat-livechat/.app/client/lib/msgTyping.js index a4222d404c95..ee50da90fa22 100644 --- a/packages/rocketchat-livechat/.app/client/lib/msgTyping.js +++ b/packages/rocketchat-livechat/.app/client/lib/msgTyping.js @@ -1,5 +1,6 @@ /* globals Notifications, Livechat */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import visitor from '../../imports/client/visitor'; import _ from 'underscore'; diff --git a/packages/rocketchat-livechat/.app/client/lib/triggers.js b/packages/rocketchat-livechat/.app/client/lib/triggers.js index a69720f3f39d..ceb0d9b928a0 100644 --- a/packages/rocketchat-livechat/.app/client/lib/triggers.js +++ b/packages/rocketchat-livechat/.app/client/lib/triggers.js @@ -1,5 +1,6 @@ /* globals Livechat */ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import visitor from '../../imports/client/visitor'; const firedTriggers = JSON.parse(localStorage.getItem('rocketChatFiredTriggers')) || []; diff --git a/packages/rocketchat-livechat/.app/client/startup/visitor.js b/packages/rocketchat-livechat/.app/client/startup/visitor.js index 35748e0f0788..6bf40b2579e9 100644 --- a/packages/rocketchat-livechat/.app/client/startup/visitor.js +++ b/packages/rocketchat-livechat/.app/client/startup/visitor.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import visitor from '../../imports/client/visitor'; Meteor.startup(() => { diff --git a/packages/rocketchat-livechat/.app/client/views/messages.js b/packages/rocketchat-livechat/.app/client/views/messages.js index d215a5845b92..c4ea12aa4201 100644 --- a/packages/rocketchat-livechat/.app/client/views/messages.js +++ b/packages/rocketchat-livechat/.app/client/views/messages.js @@ -1,5 +1,6 @@ /* globals Livechat, LivechatVideoCall, MsgTyping, fileUpload */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import visitor from '../../imports/client/visitor'; import _ from 'underscore'; import mime from 'mime-type/with-db'; diff --git a/packages/rocketchat-livechat/.app/client/views/offlineForm.js b/packages/rocketchat-livechat/.app/client/views/offlineForm.js index ca1742fef4cd..dcff90237085 100644 --- a/packages/rocketchat-livechat/.app/client/views/offlineForm.js +++ b/packages/rocketchat-livechat/.app/client/views/offlineForm.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-livechat/.app/client/views/register.js b/packages/rocketchat-livechat/.app/client/views/register.js index 1dd8bd91b21b..d31f76c75158 100644 --- a/packages/rocketchat-livechat/.app/client/views/register.js +++ b/packages/rocketchat-livechat/.app/client/views/register.js @@ -1,5 +1,6 @@ /* globals Department, Livechat, LivechatVideoCall */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import visitor from '../../imports/client/visitor'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-livechat/.app/client/views/switchDepartment.js b/packages/rocketchat-livechat/.app/client/views/switchDepartment.js index 5f04075380d3..b170dcd43667 100644 --- a/packages/rocketchat-livechat/.app/client/views/switchDepartment.js +++ b/packages/rocketchat-livechat/.app/client/views/switchDepartment.js @@ -1,5 +1,6 @@ /* globals Department, Livechat */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import swal from 'sweetalert2'; import visitor from '../../imports/client/visitor'; diff --git a/packages/rocketchat-livechat/.app/client/views/videoCall.js b/packages/rocketchat-livechat/.app/client/views/videoCall.js index d0e6231feba8..95d817a04a84 100644 --- a/packages/rocketchat-livechat/.app/client/views/videoCall.js +++ b/packages/rocketchat-livechat/.app/client/views/videoCall.js @@ -1,4 +1,5 @@ /* globals LivechatVideoCall */ +import { ReactiveVar } from 'meteor/reactive-var'; Template.videoCall.helpers({ visible() { diff --git a/packages/rocketchat-livechat/.app/imports/client/visitor.js b/packages/rocketchat-livechat/.app/imports/client/visitor.js index 8a51ab48d797..8b20645f85ac 100644 --- a/packages/rocketchat-livechat/.app/imports/client/visitor.js +++ b/packages/rocketchat-livechat/.app/imports/client/visitor.js @@ -1,5 +1,8 @@ /* globals Commands, Livechat, UserPresence */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; +import { Random } from 'meteor/random'; + const msgStream = new Meteor.Streamer('room-messages'); export default { diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js index 9584b02159bb..bf22bcfd3035 100644 --- a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js +++ b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js @@ -1,5 +1,6 @@ /* globals popover */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import moment from 'moment'; import { drawLineChart } from '../../../lib/chartHandler'; diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.js b/packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.js index 2029c19f14a9..6d1cb7495bbd 100644 --- a/packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.js +++ b/packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.js @@ -1,4 +1,5 @@ import moment from 'moment'; +import { ReactiveVar } from 'meteor/reactive-var'; import { drawLineChart, drawDoughnutChart, updateChart } from '../../../lib/chartHandler'; import { getTimingsChartData, getAgentStatusData, getConversationsOverviewData, getTimingsOverviewData } from '../../../lib/dataHandler'; diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js index be8ba6494be0..19feab3b1033 100644 --- a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js +++ b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; Template.livechatIntegrationFacebook.helpers({ pages() { diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js index ee78853ae6e1..8a4ad736ff87 100644 --- a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js +++ b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js @@ -1,5 +1,6 @@ /* globals LivechatIntegration */ 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-livechat/client/views/app/livechatAppearance.js b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js index a23eb5f812ed..4fe233c3f568 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js +++ b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js @@ -1,6 +1,8 @@ /* globals jscolor*/ /* eslint new-cap: ["error", { "newIsCapExceptions": ["jscolor"] }]*/ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; +import { Random } from 'meteor/random'; import s from 'underscore.string'; import moment from 'moment'; import toastr from 'toastr'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js b/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js index 5da996c4c799..847231745d25 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js +++ b/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import moment from 'moment'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js b/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js index d37f0d04d0e4..0696a41193f5 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js +++ b/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import toastr from 'toastr'; Template.livechatCustomFieldForm.helpers({ diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js b/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js index ffada6274c48..7038571b20a1 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js +++ b/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js b/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js index 88c22b84a0e4..7b4200a3dba4 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js +++ b/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import toastr from 'toastr'; /* globals LivechatOfficeHour */ import moment from 'moment'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatQueue.js b/packages/rocketchat-livechat/client/views/app/livechatQueue.js index 7925fa0bb58f..f7808fa73e62 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatQueue.js +++ b/packages/rocketchat-livechat/client/views/app/livechatQueue.js @@ -1,5 +1,6 @@ /* globals LivechatQueueUser */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; Template.livechatQueue.helpers({ departments() { diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js index e8267c986795..c2d69c8e0594 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js +++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js @@ -1,7 +1,8 @@ /* globals LivechatVisitor */ import { Meteor } from 'meteor/meteor'; - +import { ReactiveVar } from 'meteor/reactive-var'; import toastr from 'toastr'; + Template.visitorEdit.helpers({ visitor() { return Template.instance().visitor.get(); diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js index 777e7141dd71..74a7bc01ba93 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js +++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js @@ -1,5 +1,7 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import toastr from 'toastr'; + Template.visitorForward.helpers({ visitor() { return Template.instance().visitor.get(); diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js index f4f321de4bb4..87efe06b1f4a 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js +++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js @@ -1,3 +1,4 @@ +import { ReactiveVar } from 'meteor/reactive-var'; import moment from 'moment'; const visitorHistory = new Mongo.Collection('visitor_history'); diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js index 7a95b9f62646..147d0818eb71 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js +++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js @@ -1,6 +1,7 @@ /* globals LivechatVisitor */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; diff --git a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js b/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js index c339387d8ac9..5394dd09204a 100644 --- a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js +++ b/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js @@ -1,3 +1,5 @@ +import { ReactiveVar } from 'meteor/reactive-var'; + Template.livechatTriggerAction.helpers({ hiddenValue(current) { if (this.name === undefined && Template.instance().firstAction) { diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechat.js b/packages/rocketchat-livechat/client/views/sideNav/livechat.js index c5d053bc70bd..6a8841129120 100644 --- a/packages/rocketchat-livechat/client/views/sideNav/livechat.js +++ b/packages/rocketchat-livechat/client/views/sideNav/livechat.js @@ -1,5 +1,6 @@ /* globals LivechatInquiry, KonchatNotification */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; Template.livechat.helpers({ isActive() { diff --git a/packages/rocketchat-livechat/imports/server/rest/facebook.js b/packages/rocketchat-livechat/imports/server/rest/facebook.js index 54a401fe7c4c..bfab014fff9c 100644 --- a/packages/rocketchat-livechat/imports/server/rest/facebook.js +++ b/packages/rocketchat-livechat/imports/server/rest/facebook.js @@ -1,4 +1,5 @@ import crypto from 'crypto'; +import { Random } from 'meteor/random'; import LivechatVisitors from '../../../server/models/LivechatVisitors'; diff --git a/packages/rocketchat-livechat/imports/server/rest/sms.js b/packages/rocketchat-livechat/imports/server/rest/sms.js index a8d90481e232..216696fff343 100644 --- a/packages/rocketchat-livechat/imports/server/rest/sms.js +++ b/packages/rocketchat-livechat/imports/server/rest/sms.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import LivechatVisitors from '../../../server/models/LivechatVisitors'; RocketChat.API.v1.addRoute('livechat/sms-incoming/:service', { diff --git a/packages/rocketchat-livechat/livechat.js b/packages/rocketchat-livechat/livechat.js index 5b79e2d35634..ca7013d64052 100644 --- a/packages/rocketchat-livechat/livechat.js +++ b/packages/rocketchat-livechat/livechat.js @@ -1,9 +1,8 @@ -/* globals WebApp:true */ import { Meteor } from 'meteor/meteor'; +import { WebApp } from 'meteor/webapp'; import _ from 'underscore'; import url from 'url'; -const { WebApp } = Package.webapp; const { Autoupdate } = Package.autoupdate; WebApp.connectHandlers.use('/livechat', Meteor.bindEnvironment((req, res, next) => { diff --git a/packages/rocketchat-livechat/server/api/lib/livechat.js b/packages/rocketchat-livechat/server/api/lib/livechat.js index 16119f9451f6..43c2043615b1 100644 --- a/packages/rocketchat-livechat/server/api/lib/livechat.js +++ b/packages/rocketchat-livechat/server/api/lib/livechat.js @@ -1,3 +1,4 @@ +import { Random } from 'meteor/random'; import _ from 'underscore'; import LivechatVisitors from '../../models/LivechatVisitors'; diff --git a/packages/rocketchat-livechat/server/api/v1/message.js b/packages/rocketchat-livechat/server/api/v1/message.js index cf3936078bf2..47719369865a 100644 --- a/packages/rocketchat-livechat/server/api/v1/message.js +++ b/packages/rocketchat-livechat/server/api/v1/message.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import LivechatVisitors from '../../../server/models/LivechatVisitors'; import { findGuest, findRoom } from '../lib/livechat'; diff --git a/packages/rocketchat-livechat/server/api/v1/room.js b/packages/rocketchat-livechat/server/api/v1/room.js index 08d3b7c93bbb..4229100d3250 100644 --- a/packages/rocketchat-livechat/server/api/v1/room.js +++ b/packages/rocketchat-livechat/server/api/v1/room.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import { findGuest, findRoom, getRoom, settings } from '../lib/livechat'; RocketChat.API.v1.addRoute('livechat/room', { diff --git a/packages/rocketchat-livechat/server/api/v1/videoCall.js b/packages/rocketchat-livechat/server/api/v1/videoCall.js index 00e4d44e1976..249cf59407e1 100644 --- a/packages/rocketchat-livechat/server/api/v1/videoCall.js +++ b/packages/rocketchat-livechat/server/api/v1/videoCall.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import { findGuest, getRoom, settings } from '../lib/livechat'; RocketChat.API.v1.addRoute('livechat/video.call/:token', { diff --git a/packages/rocketchat-livechat/server/hooks/RDStation.js b/packages/rocketchat-livechat/server/hooks/RDStation.js index 04e9b5df19e8..f464fa78b5d8 100644 --- a/packages/rocketchat-livechat/server/hooks/RDStation.js +++ b/packages/rocketchat-livechat/server/hooks/RDStation.js @@ -1,3 +1,5 @@ +import { HTTP } from 'meteor/http'; + function sendToRDStation(room) { if (!RocketChat.settings.get('Livechat_RDStation_Token')) { return room; diff --git a/packages/rocketchat-livechat/server/lib/Livechat.js b/packages/rocketchat-livechat/server/lib/Livechat.js index aab56f3c60bc..7a2541c79d8d 100644 --- a/packages/rocketchat-livechat/server/lib/Livechat.js +++ b/packages/rocketchat-livechat/server/lib/Livechat.js @@ -1,5 +1,6 @@ /* globals HTTP */ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; diff --git a/packages/rocketchat-livechat/server/lib/OmniChannel.js b/packages/rocketchat-livechat/server/lib/OmniChannel.js index 139b4ec5d9f7..f4855b5d3920 100644 --- a/packages/rocketchat-livechat/server/lib/OmniChannel.js +++ b/packages/rocketchat-livechat/server/lib/OmniChannel.js @@ -1,3 +1,5 @@ +import { HTTP } from 'meteor/http'; + const gatewayURL = 'https://omni.rocket.chat'; export default { diff --git a/packages/rocketchat-livechat/server/methods/sendFileLivechatMessage.js b/packages/rocketchat-livechat/server/methods/sendFileLivechatMessage.js index 709dd92b4cf2..6aac9de7b337 100644 --- a/packages/rocketchat-livechat/server/methods/sendFileLivechatMessage.js +++ b/packages/rocketchat-livechat/server/methods/sendFileLivechatMessage.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import LivechatVisitors from '../models/LivechatVisitors'; Meteor.methods({ diff --git a/packages/rocketchat-livechat/server/methods/startFileUploadRoom.js b/packages/rocketchat-livechat/server/methods/startFileUploadRoom.js index 3b41c65d17aa..495c51fb03ba 100644 --- a/packages/rocketchat-livechat/server/methods/startFileUploadRoom.js +++ b/packages/rocketchat-livechat/server/methods/startFileUploadRoom.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import LivechatVisitors from '../models/LivechatVisitors'; Meteor.methods({ diff --git a/packages/rocketchat-livechat/server/methods/startVideoCall.js b/packages/rocketchat-livechat/server/methods/startVideoCall.js index 4904e255adad..e32033b6874b 100644 --- a/packages/rocketchat-livechat/server/methods/startVideoCall.js +++ b/packages/rocketchat-livechat/server/methods/startVideoCall.js @@ -1,5 +1,6 @@ /* eslint new-cap: [2, {"capIsNewExceptions": ["MD5"]}] */ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; Meteor.methods({ 'livechat:startVideoCall'(roomId) { diff --git a/packages/rocketchat-livestream/client/views/broadcastView.js b/packages/rocketchat-livestream/client/views/broadcastView.js index 9faa2e5b702d..3c1c3c613389 100644 --- a/packages/rocketchat-livestream/client/views/broadcastView.js +++ b/packages/rocketchat-livestream/client/views/broadcastView.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; const getMedia = () => navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia; const createAndConnect = (url) => { diff --git a/packages/rocketchat-livestream/client/views/liveStreamTab.js b/packages/rocketchat-livestream/client/views/liveStreamTab.js index bcaa38181db5..f0bbce9d51af 100644 --- a/packages/rocketchat-livestream/client/views/liveStreamTab.js +++ b/packages/rocketchat-livestream/client/views/liveStreamTab.js @@ -1,5 +1,6 @@ /* globals popout */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import toastr from 'toastr'; import { auth } from '../oauth.js'; import { RocketChatAnnouncement } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-livestream/client/views/liveStreamView.js b/packages/rocketchat-livestream/client/views/liveStreamView.js index d5c10cc6ca59..93011ba3b0f7 100644 --- a/packages/rocketchat-livestream/client/views/liveStreamView.js +++ b/packages/rocketchat-livestream/client/views/liveStreamView.js @@ -1,3 +1,4 @@ +import { ReactiveVar } from 'meteor/reactive-var'; this.onYouTubePlayerAPIReady = function() { const playerReadyEvent = new Event('playerReady'); diff --git a/packages/rocketchat-logger/server/server.js b/packages/rocketchat-logger/server/server.js index 608d62a30d03..06a938dbec5a 100644 --- a/packages/rocketchat-logger/server/server.js +++ b/packages/rocketchat-logger/server/server.js @@ -1,5 +1,7 @@ /* globals EventEmitter LoggerManager SystemLogger Log*/ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; +import { EJSON } from 'meteor/ejson'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-mail-messages/server/functions/sendMail.js b/packages/rocketchat-mail-messages/server/functions/sendMail.js index fa82ec2155f3..05c6aedd70f8 100644 --- a/packages/rocketchat-mail-messages/server/functions/sendMail.js +++ b/packages/rocketchat-mail-messages/server/functions/sendMail.js @@ -1,5 +1,6 @@ /* globals */ import { Meteor } from 'meteor/meteor'; +import { EJSON } from 'meteor/ejson'; import s from 'underscore.string'; import * as Mailer from 'meteor/rocketchat:mailer'; diff --git a/packages/rocketchat-mailer/server/api.js b/packages/rocketchat-mailer/server/api.js index e6da31788afa..b1323702bec5 100644 --- a/packages/rocketchat-mailer/server/api.js +++ b/packages/rocketchat-mailer/server/api.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Email } from 'meteor/email'; import _ from 'underscore'; import s from 'underscore.string'; import juice from 'juice'; diff --git a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js index cd0553eb6dce..eee8673de2c9 100644 --- a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js +++ b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js @@ -1,5 +1,6 @@ /* globals MentionedMessage */ import _ from 'underscore'; +import { ReactiveVar } from 'meteor/reactive-var'; Template.mentionsFlexTab.helpers({ hasMessages() { diff --git a/packages/rocketchat-mentions/server/server.js b/packages/rocketchat-mentions/server/server.js index 9184d47b4d75..1dba02354ad8 100644 --- a/packages/rocketchat-mentions/server/server.js +++ b/packages/rocketchat-mentions/server/server.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import _ from 'underscore'; import MentionsServer from './Mentions'; diff --git a/packages/rocketchat-message-pin/client/views/pinnedMessages.js b/packages/rocketchat-message-pin/client/views/pinnedMessages.js index 3331d93211be..eafb34ce2bce 100644 --- a/packages/rocketchat-message-pin/client/views/pinnedMessages.js +++ b/packages/rocketchat-message-pin/client/views/pinnedMessages.js @@ -1,5 +1,6 @@ /* globals PinnedMessage */ import _ from 'underscore'; +import { ReactiveVar } from 'meteor/reactive-var'; Template.pinnedMessages.helpers({ hasMessages() { diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js b/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js index 840984b26578..8f5ceb0a915b 100644 --- a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js +++ b/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js @@ -1,4 +1,5 @@ import _ from 'underscore'; +import { ReactiveVar } from 'meteor/reactive-var'; /* global SnippetedMessages */ Template.snippetedMessages.helpers({ diff --git a/packages/rocketchat-message-snippet/server/requests.js b/packages/rocketchat-message-snippet/server/requests.js index 5b54b8f6faed..65d1a1089fe5 100644 --- a/packages/rocketchat-message-snippet/server/requests.js +++ b/packages/rocketchat-message-snippet/server/requests.js @@ -1,4 +1,6 @@ /* global Cookies */ +import { WebApp } from 'meteor/webapp'; + WebApp.connectHandlers.use('/snippet/download', function(req, res) { let rawCookies; let token; diff --git a/packages/rocketchat-message-star/client/views/starredMessages.js b/packages/rocketchat-message-star/client/views/starredMessages.js index 63f490632ea2..ddfa2cdc3366 100644 --- a/packages/rocketchat-message-star/client/views/starredMessages.js +++ b/packages/rocketchat-message-star/client/views/starredMessages.js @@ -1,5 +1,6 @@ /* globals StarredMessage */ import _ from 'underscore'; +import { ReactiveVar } from 'meteor/reactive-var'; Template.starredMessages.helpers({ hasMessages() { diff --git a/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.js b/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.js index a443d6c1ffa3..e7729e638a8b 100644 --- a/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.js +++ b/packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.js @@ -1,6 +1,7 @@ /* globals ChatOAuthApps */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import toastr from 'toastr'; Template.oauthApp.onCreated(function() { diff --git a/packages/rocketchat-oauth2-server-config/admin/server/methods/addOAuthApp.js b/packages/rocketchat-oauth2-server-config/admin/server/methods/addOAuthApp.js index 67a2d90a3e63..5d915849217b 100644 --- a/packages/rocketchat-oauth2-server-config/admin/server/methods/addOAuthApp.js +++ b/packages/rocketchat-oauth2-server-config/admin/server/methods/addOAuthApp.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import _ from 'underscore'; Meteor.methods({ diff --git a/packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.js b/packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.js index fa1b150a5c09..77cca296e015 100644 --- a/packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.js +++ b/packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.js @@ -1,5 +1,6 @@ /* global OAuth2Server */ import { Meteor } from 'meteor/meteor'; +import { WebApp } from 'meteor/webapp'; const oauth2server = new OAuth2Server({ accessTokensCollectionName: 'rocketchat_oauth_access_tokens', diff --git a/packages/rocketchat-otr/client/rocketchat.otr.js b/packages/rocketchat-otr/client/rocketchat.otr.js index b4abfbae2e71..e167ea328a7d 100644 --- a/packages/rocketchat-otr/client/rocketchat.otr.js +++ b/packages/rocketchat-otr/client/rocketchat.otr.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; class OTR { constructor() { diff --git a/packages/rocketchat-otr/client/rocketchat.otr.room.js b/packages/rocketchat-otr/client/rocketchat.otr.room.js index 12d737369c4c..a2dd3f4b6f9c 100644 --- a/packages/rocketchat-otr/client/rocketchat.otr.room.js +++ b/packages/rocketchat-otr/client/rocketchat.otr.room.js @@ -1,4 +1,7 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; +import { Random } from 'meteor/random'; +import { EJSON } from 'meteor/ejson'; import _ from 'underscore'; import toastr from 'toastr'; /* globals crypto */ diff --git a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js b/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js index 80f1ee3a2b0e..258afd68eb2b 100644 --- a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js +++ b/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js @@ -1,5 +1,6 @@ /* globals ChatSubscription popover */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; const notificationLabels = { all: 'All_messages', diff --git a/packages/rocketchat-reactions/setReaction.js b/packages/rocketchat-reactions/setReaction.js index 9161802429d1..b5841ddb8cf8 100644 --- a/packages/rocketchat-reactions/setReaction.js +++ b/packages/rocketchat-reactions/setReaction.js @@ -1,5 +1,6 @@ /* globals msgStream */ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import _ from 'underscore'; const removeUserReaction = (message, reaction, username) => { diff --git a/packages/rocketchat-search/client/provider/result.js b/packages/rocketchat-search/client/provider/result.js index ecaff5beb7ac..f82b12d4351d 100644 --- a/packages/rocketchat-search/client/provider/result.js +++ b/packages/rocketchat-search/client/provider/result.js @@ -1,5 +1,6 @@ /* globals FlowRouter, RoomHistoryManager */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; Meteor.startup(function() { diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.js b/packages/rocketchat-setup-wizard/client/setupWizard.js index 5f125d927bfe..52d251078553 100644 --- a/packages/rocketchat-setup-wizard/client/setupWizard.js +++ b/packages/rocketchat-setup-wizard/client/setupWizard.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; +import { ReactiveDict } from 'meteor/reactive-dict'; const cannotSetup = () => { const showSetupWizard = RocketChat.settings.get('Show_Setup_Wizard'); diff --git a/packages/rocketchat-slackbridge/server/RocketAdapter.js b/packages/rocketchat-slackbridge/server/RocketAdapter.js index 699557d87958..9b92b9a25ce9 100644 --- a/packages/rocketchat-slackbridge/server/RocketAdapter.js +++ b/packages/rocketchat-slackbridge/server/RocketAdapter.js @@ -1,6 +1,9 @@ /* globals logger*/ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; +import { Random } from 'meteor/random'; +import { HTTP } from 'meteor/http'; import _ from 'underscore'; export default class RocketAdapter { diff --git a/packages/rocketchat-slackbridge/server/SlackAdapter.js b/packages/rocketchat-slackbridge/server/SlackAdapter.js index 2363f3d553d8..70b20da13afe 100644 --- a/packages/rocketchat-slackbridge/server/SlackAdapter.js +++ b/packages/rocketchat-slackbridge/server/SlackAdapter.js @@ -1,5 +1,6 @@ /* globals logger*/ import { Meteor } from 'meteor/meteor'; +import { HTTP } from 'meteor/http'; import _ from 'underscore'; import url from 'url'; import http from 'http'; diff --git a/packages/rocketchat-slackbridge/server/slackbridge_import.server.js b/packages/rocketchat-slackbridge/server/slackbridge_import.server.js index 53b2d66cd6c5..2a33a0b8dfc8 100644 --- a/packages/rocketchat-slackbridge/server/slackbridge_import.server.js +++ b/packages/rocketchat-slackbridge/server/slackbridge_import.server.js @@ -1,5 +1,6 @@ /* globals msgStream */ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; function SlackBridgeImport(command, params, item) { if (command !== 'slackbridge-import' || !Match.test(params, String)) { diff --git a/packages/rocketchat-slashcommands-archiveroom/server/server.js b/packages/rocketchat-slashcommands-archiveroom/server/server.js index eb1da38b51eb..93436a758a89 100644 --- a/packages/rocketchat-slashcommands-archiveroom/server/server.js +++ b/packages/rocketchat-slashcommands-archiveroom/server/server.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; function Archive(command, params, item) { if (command !== 'archive' || !Match.test(params, String)) { diff --git a/packages/rocketchat-slashcommands-create/server/server.js b/packages/rocketchat-slashcommands-create/server/server.js index 29cf5b092ca8..0d86c318dbf6 100644 --- a/packages/rocketchat-slashcommands-create/server/server.js +++ b/packages/rocketchat-slashcommands-create/server/server.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; function Create(command, params, item) { function getParams(str) { diff --git a/packages/rocketchat-slashcommands-help/server.js b/packages/rocketchat-slashcommands-help/server.js index d615e0031256..19f054bb7e6c 100644 --- a/packages/rocketchat-slashcommands-help/server.js +++ b/packages/rocketchat-slashcommands-help/server.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; /* * Help is a named function that will replace /join commands diff --git a/packages/rocketchat-slashcommands-hide/server/hide.js b/packages/rocketchat-slashcommands-hide/server/hide.js index 1bb27d335f77..30e575704951 100644 --- a/packages/rocketchat-slashcommands-hide/server/hide.js +++ b/packages/rocketchat-slashcommands-hide/server/hide.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; /* * Hide is a named function that will replace /hide commands diff --git a/packages/rocketchat-slashcommands-invite/server/server.js b/packages/rocketchat-slashcommands-invite/server/server.js index 3769ae5fa1fa..b1847b6f95d6 100644 --- a/packages/rocketchat-slashcommands-invite/server/server.js +++ b/packages/rocketchat-slashcommands-invite/server/server.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; /* * Invite is a named function that will replace /invite commands diff --git a/packages/rocketchat-slashcommands-inviteall/server/server.js b/packages/rocketchat-slashcommands-inviteall/server/server.js index eafe53dc86b1..794e6b31e902 100644 --- a/packages/rocketchat-slashcommands-inviteall/server/server.js +++ b/packages/rocketchat-slashcommands-inviteall/server/server.js @@ -3,6 +3,7 @@ * @param {Object} message - The message object */ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; function inviteAll(type) { return function inviteAll(command, params, item) { diff --git a/packages/rocketchat-slashcommands-join/server/server.js b/packages/rocketchat-slashcommands-join/server/server.js index ba1a2f1a2238..d46e571b6817 100644 --- a/packages/rocketchat-slashcommands-join/server/server.js +++ b/packages/rocketchat-slashcommands-join/server/server.js @@ -4,6 +4,7 @@ * @param {Object} message - The message object */ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; RocketChat.slashCommands.add('join', function Join(command, params, item) { diff --git a/packages/rocketchat-slashcommands-kick/server/server.js b/packages/rocketchat-slashcommands-kick/server/server.js index 47c632778e0a..0699d4366c1c 100644 --- a/packages/rocketchat-slashcommands-kick/server/server.js +++ b/packages/rocketchat-slashcommands-kick/server/server.js @@ -1,6 +1,7 @@ // Kick is a named function that will replace /kick commands import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; const Kick = function(command, params, { rid }) { if (command !== 'kick' || !Match.test(params, String)) { diff --git a/packages/rocketchat-slashcommands-leave/leave.js b/packages/rocketchat-slashcommands-leave/leave.js index 9334fff969c4..d337c746576d 100644 --- a/packages/rocketchat-slashcommands-leave/leave.js +++ b/packages/rocketchat-slashcommands-leave/leave.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; /* * Leave is a named function that will replace /leave commands diff --git a/packages/rocketchat-slashcommands-msg/server.js b/packages/rocketchat-slashcommands-msg/server.js index 55693a1d69ff..faa6950d1a2f 100644 --- a/packages/rocketchat-slashcommands-msg/server.js +++ b/packages/rocketchat-slashcommands-msg/server.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; /* * Msg is a named function that will replace /msg commands diff --git a/packages/rocketchat-slashcommands-mute/server/mute.js b/packages/rocketchat-slashcommands-mute/server/mute.js index dde77211d543..4f51032ab878 100644 --- a/packages/rocketchat-slashcommands-mute/server/mute.js +++ b/packages/rocketchat-slashcommands-mute/server/mute.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; /* * Mute is a named function that will replace /mute commands diff --git a/packages/rocketchat-slashcommands-mute/server/unmute.js b/packages/rocketchat-slashcommands-mute/server/unmute.js index 150eacd10592..568d7e00ba1c 100644 --- a/packages/rocketchat-slashcommands-mute/server/unmute.js +++ b/packages/rocketchat-slashcommands-mute/server/unmute.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; /* * Unmute is a named function that will replace /unmute commands diff --git a/packages/rocketchat-slashcommands-unarchiveroom/server/server.js b/packages/rocketchat-slashcommands-unarchiveroom/server/server.js index c1847f1ec0b7..54e7a033dfab 100644 --- a/packages/rocketchat-slashcommands-unarchiveroom/server/server.js +++ b/packages/rocketchat-slashcommands-unarchiveroom/server/server.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; function Unarchive(command, params, item) { if (command !== 'unarchive' || !Match.test(params, String)) { diff --git a/packages/rocketchat-token-login/client/login_token_client.js b/packages/rocketchat-token-login/client/login_token_client.js index 9a850e3efe7c..d0c17e718b27 100644 --- a/packages/rocketchat-token-login/client/login_token_client.js +++ b/packages/rocketchat-token-login/client/login_token_client.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; Meteor.loginWithLoginToken = function(token) { Accounts.callLoginMethod({ diff --git a/packages/rocketchat-tokenpass/client/tokenChannelsList.js b/packages/rocketchat-tokenpass/client/tokenChannelsList.js index 44b33d61d5e3..505c3a1d7805 100644 --- a/packages/rocketchat-tokenpass/client/tokenChannelsList.js +++ b/packages/rocketchat-tokenpass/client/tokenChannelsList.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; Template.tokenChannelsList.helpers({ rooms() { diff --git a/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js b/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js index 39e1f5ff5e0d..8050e871b77a 100644 --- a/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js +++ b/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; Template.channelSettings__tokenpass.helpers({ addDisabled() { diff --git a/packages/rocketchat-tokenpass/server/functions/getProtectedTokenpassBalances.js b/packages/rocketchat-tokenpass/server/functions/getProtectedTokenpassBalances.js index ea2cc40c4f5e..6b1bc586f597 100644 --- a/packages/rocketchat-tokenpass/server/functions/getProtectedTokenpassBalances.js +++ b/packages/rocketchat-tokenpass/server/functions/getProtectedTokenpassBalances.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { HTTP } from 'meteor/http'; let userAgent = 'Meteor'; if (Meteor.release) { userAgent += `/${ Meteor.release }`; } diff --git a/packages/rocketchat-tokenpass/server/functions/getPublicTokenpassBalances.js b/packages/rocketchat-tokenpass/server/functions/getPublicTokenpassBalances.js index c58e80e2ea80..0083676c1b73 100644 --- a/packages/rocketchat-tokenpass/server/functions/getPublicTokenpassBalances.js +++ b/packages/rocketchat-tokenpass/server/functions/getPublicTokenpassBalances.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { HTTP } from 'meteor/http'; let userAgent = 'Meteor'; if (Meteor.release) { userAgent += `/${ Meteor.release }`; } diff --git a/packages/rocketchat-tokenpass/server/startup.js b/packages/rocketchat-tokenpass/server/startup.js index 97800dc2b274..883f2424062e 100644 --- a/packages/rocketchat-tokenpass/server/startup.js +++ b/packages/rocketchat-tokenpass/server/startup.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; RocketChat.settings.addGroup('OAuth', function() { this.section('Tokenpass', function() { diff --git a/packages/rocketchat-ui-account/client/accountPreferences.js b/packages/rocketchat-ui-account/client/accountPreferences.js index 140dba69f79f..03a5c77fed59 100644 --- a/packages/rocketchat-ui-account/client/accountPreferences.js +++ b/packages/rocketchat-ui-account/client/accountPreferences.js @@ -1,5 +1,6 @@ /* globals KonchatNotification */ 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-ui-account/client/accountProfile.js b/packages/rocketchat-ui-account/client/accountProfile.js index 74b530ee727e..7fdda834c7a3 100644 --- a/packages/rocketchat-ui-account/client/accountProfile.js +++ b/packages/rocketchat-ui-account/client/accountProfile.js @@ -1,3 +1,5 @@ +import { SHA256 } from 'meteor/sha'; +import { ReactiveVar } from 'meteor/reactive-var'; import { Meteor } from 'meteor/meteor'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-account/client/avatar/prompt.js b/packages/rocketchat-ui-account/client/avatar/prompt.js index d4c8965d1772..a3ac7cf4ea2b 100644 --- a/packages/rocketchat-ui-account/client/avatar/prompt.js +++ b/packages/rocketchat-ui-account/client/avatar/prompt.js @@ -1,6 +1,7 @@ /* globals fileUploadHandler */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import s from 'underscore.string'; import toastr from 'toastr'; import mime from 'mime-type/with-db'; diff --git a/packages/rocketchat-ui-admin/client/admin.js b/packages/rocketchat-ui-admin/client/admin.js index 3ad3b77d31d1..bd85ec706358 100644 --- a/packages/rocketchat-ui-admin/client/admin.js +++ b/packages/rocketchat-ui-admin/client/admin.js @@ -1,5 +1,7 @@ /* globals jscolor, i18nDefaultQuery */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; +import { Random } from 'meteor/random'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-admin/client/adminFlex.js b/packages/rocketchat-ui-admin/client/adminFlex.js index 93a12a2bac49..dc961f734a4c 100644 --- a/packages/rocketchat-ui-admin/client/adminFlex.js +++ b/packages/rocketchat-ui-admin/client/adminFlex.js @@ -1,3 +1,4 @@ +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-admin/client/adminInfo.js b/packages/rocketchat-ui-admin/client/adminInfo.js index 70877e0b428c..f6afb15fdb6b 100644 --- a/packages/rocketchat-ui-admin/client/adminInfo.js +++ b/packages/rocketchat-ui-admin/client/adminInfo.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import s from 'underscore.string'; import moment from 'moment'; diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js b/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js index 41121648ed4a..9b14332a5ecc 100644 --- a/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js +++ b/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js @@ -1,5 +1,6 @@ /* globals AdminChatRoom */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import toastr from 'toastr'; Template.adminRoomInfo.helpers({ selectedRoom() { diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRooms.js b/packages/rocketchat-ui-admin/client/rooms/adminRooms.js index d67267b336ae..0e9ca6da055e 100644 --- a/packages/rocketchat-ui-admin/client/rooms/adminRooms.js +++ b/packages/rocketchat-ui-admin/client/rooms/adminRooms.js @@ -1,5 +1,6 @@ /* globals AdminChatRoom, RocketChat */ import _ from 'underscore'; +import { ReactiveVar } from 'meteor/reactive-var'; import s from 'underscore.string'; import { RocketChatTabBar } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js b/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js index 1c1267cb99cf..4358bde620e6 100644 --- a/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js +++ b/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import toastr from 'toastr'; /* globals AdminChatRoom */ diff --git a/packages/rocketchat-ui-admin/client/users/adminInviteUser.js b/packages/rocketchat-ui-admin/client/users/adminInviteUser.js index 2fd4239fadad..f77303e9341a 100644 --- a/packages/rocketchat-ui-admin/client/users/adminInviteUser.js +++ b/packages/rocketchat-ui-admin/client/users/adminInviteUser.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-admin/client/users/adminUsers.js b/packages/rocketchat-ui-admin/client/users/adminUsers.js index 5bc453f3309c..e6637e38264f 100644 --- a/packages/rocketchat-ui-admin/client/users/adminUsers.js +++ b/packages/rocketchat-ui-admin/client/users/adminUsers.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-clean-history/client/views/cleanHistory.js b/packages/rocketchat-ui-clean-history/client/views/cleanHistory.js index 83f74d477486..d1e62a41b65a 100644 --- a/packages/rocketchat-ui-clean-history/client/views/cleanHistory.js +++ b/packages/rocketchat-ui-clean-history/client/views/cleanHistory.js @@ -1,5 +1,6 @@ /* globals AutoComplete */ import moment from 'moment'; +import { ReactiveVar } from 'meteor/reactive-var'; import { call } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-ui-flextab/client/flexTabBar.js b/packages/rocketchat-ui-flextab/client/flexTabBar.js index 19615939a7e1..1193c6c5ca25 100644 --- a/packages/rocketchat-ui-flextab/client/flexTabBar.js +++ b/packages/rocketchat-ui-flextab/client/flexTabBar.js @@ -1,5 +1,6 @@ /* globals popover */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; const commonHelpers = { diff --git a/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js b/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js index 731728f731fe..ada8c736badc 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js +++ b/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import toastr from 'toastr'; const acEvents = { diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.js b/packages/rocketchat-ui-flextab/client/tabs/membersList.js index 16ebe40bb050..0561bab537e7 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/membersList.js +++ b/packages/rocketchat-ui-flextab/client/tabs/membersList.js @@ -1,5 +1,6 @@ /* globals WebRTC popover isRtl */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import { getActions } from './userActions'; diff --git a/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js b/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js index a32fc21b7d28..cfbb4e17ebf1 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js +++ b/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js @@ -1,4 +1,5 @@ import { fixCordova } from 'meteor/rocketchat:lazy-load'; +import { ReactiveVar } from 'meteor/reactive-var'; import { DateFormat } from 'meteor/rocketchat:lib'; import _ from 'underscore'; diff --git a/packages/rocketchat-ui-flextab/client/tabs/userEdit.js b/packages/rocketchat-ui-flextab/client/tabs/userEdit.js index a2d08f6f92d7..ca4b53e15963 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/userEdit.js +++ b/packages/rocketchat-ui-flextab/client/tabs/userEdit.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; +import { Random } from 'meteor/random'; import toastr from 'toastr'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-flextab/client/tabs/userInfo.js b/packages/rocketchat-ui-flextab/client/tabs/userInfo.js index 4b00bf993dac..a9de0a497364 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/userInfo.js +++ b/packages/rocketchat-ui-flextab/client/tabs/userInfo.js @@ -1,5 +1,6 @@ /* globals RoomRoles UserRoles popover */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; diff --git a/packages/rocketchat-ui-login/client/login/footer.js b/packages/rocketchat-ui-login/client/login/footer.js index f73b9563be16..77ebc79fcbaf 100644 --- a/packages/rocketchat-ui-login/client/login/footer.js +++ b/packages/rocketchat-ui-login/client/login/footer.js @@ -1,3 +1,5 @@ +import { ReactiveVar } from 'meteor/reactive-var'; + Template.loginFooter.onCreated(function() { this.suggestedLanguage = new ReactiveVar(); diff --git a/packages/rocketchat-ui-login/client/login/form.js b/packages/rocketchat-ui-login/client/login/form.js index eff33471aba4..4afce63c4d9d 100644 --- a/packages/rocketchat-ui-login/client/login/form.js +++ b/packages/rocketchat-ui-login/client/login/form.js @@ -1,5 +1,6 @@ /* globals OnePassword, device */ 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-ui-login/client/reset-password/resetPassword.js b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js index 2406d3a0b8d2..73dc8ad1697b 100644 --- a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js +++ b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; import toastr from 'toastr'; Template.resetPassword.helpers({ diff --git a/packages/rocketchat-ui-login/client/username/username.js b/packages/rocketchat-ui-login/client/username/username.js index aa5bd4a5df51..f7c9c9a31270 100644 --- a/packages/rocketchat-ui-login/client/username/username.js +++ b/packages/rocketchat-ui-login/client/username/username.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; Template.username.onCreated(function() { diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js index 501d8c6ccfe5..be1701753980 100644 --- a/packages/rocketchat-ui-master/client/main.js +++ b/packages/rocketchat-ui-master/client/main.js @@ -1,5 +1,6 @@ /* globals toolbarSearch, menu, fireGlobalEvent, CachedChatSubscription, DynamicCss, popover */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import Clipboard from 'clipboard'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js index b8c11fdb495c..14b22f4f066a 100644 --- a/packages/rocketchat-ui-message/client/messageBox.js +++ b/packages/rocketchat-ui-message/client/messageBox.js @@ -1,5 +1,6 @@ /* globals fileUpload KonchatNotification chatMessages popover AudioRecorder chatMessages fileUploadHandler*/ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import toastr from 'toastr'; import moment from 'moment'; import _ from 'underscore'; diff --git a/packages/rocketchat-ui-message/client/popup/messagePopup.js b/packages/rocketchat-ui-message/client/popup/messagePopup.js index 94c9c845e4d5..902327d963b9 100644 --- a/packages/rocketchat-ui-message/client/popup/messagePopup.js +++ b/packages/rocketchat-ui-message/client/popup/messagePopup.js @@ -3,6 +3,7 @@ // it is just to improve readability in this file import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import { lazyloadtick } from 'meteor/rocketchat:lazy-load'; diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.js b/packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.js index f190d998ea52..4a809f0756b3 100644 --- a/packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.js +++ b/packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.js @@ -1,6 +1,7 @@ /* globals toolbarSearch */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; const keys = { diff --git a/packages/rocketchat-ui-message/startup/messageBoxActions.js b/packages/rocketchat-ui-message/startup/messageBoxActions.js index dc2daaff3b71..2c2d860f8f39 100644 --- a/packages/rocketchat-ui-message/startup/messageBoxActions.js +++ b/packages/rocketchat-ui-message/startup/messageBoxActions.js @@ -1,6 +1,7 @@ /* globals fileUpload device modal */ import { Meteor } from 'meteor/meteor'; +import { Random } from 'meteor/random'; import mime from 'mime-type/with-db'; import { VRecDialog } from 'meteor/rocketchat:ui-vrecord'; diff --git a/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js b/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js index 9e196372e80d..e9f932bb41b5 100644 --- a/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js +++ b/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; Template.createCombinedFlex.helpers({ diff --git a/packages/rocketchat-ui-sidenav/client/listChannelsFlex.js b/packages/rocketchat-ui-sidenav/client/listChannelsFlex.js index ce95e7eff142..8952e7a8c295 100644 --- a/packages/rocketchat-ui-sidenav/client/listChannelsFlex.js +++ b/packages/rocketchat-ui-sidenav/client/listChannelsFlex.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-sidenav/client/listCombinedFlex.js b/packages/rocketchat-ui-sidenav/client/listCombinedFlex.js index 4cfcd6f1d6b1..8dd2cc5df7dc 100644 --- a/packages/rocketchat-ui-sidenav/client/listCombinedFlex.js +++ b/packages/rocketchat-ui-sidenav/client/listCombinedFlex.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js b/packages/rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js index a3dff0b4248c..f7d707c80ee6 100644 --- a/packages/rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js +++ b/packages/rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js @@ -1,5 +1,6 @@ import _ from 'underscore'; import s from 'underscore.string'; +import { ReactiveVar } from 'meteor/reactive-var'; Template.listPrivateGroupsFlex.helpers({ groups() { diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.js b/packages/rocketchat-ui-sidenav/client/sideNav.js index 6d752fc05569..6d345faee18e 100644 --- a/packages/rocketchat-ui-sidenav/client/sideNav.js +++ b/packages/rocketchat-ui-sidenav/client/sideNav.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import { lazyloadtick } from 'meteor/rocketchat:lazy-load'; /* globals menu*/ diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.js b/packages/rocketchat-ui-sidenav/client/sidebarItem.js index 6de33f88e5aa..5f90c7c31c33 100644 --- a/packages/rocketchat-ui-sidenav/client/sidebarItem.js +++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.js @@ -1,5 +1,6 @@ /* globals menu popover renderMessageBody */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import moment from 'moment'; Template.sidebarItem.helpers({ diff --git a/packages/rocketchat-ui-sidenav/client/toolbar.js b/packages/rocketchat-ui-sidenav/client/toolbar.js index 93c04d84b97a..838494996070 100644 --- a/packages/rocketchat-ui-sidenav/client/toolbar.js +++ b/packages/rocketchat-ui-sidenav/client/toolbar.js @@ -1,6 +1,7 @@ /* global menu */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; let isLoading; diff --git a/packages/rocketchat-ui/client/components/selectDropdown.js b/packages/rocketchat-ui/client/components/selectDropdown.js index 7a08c1c7cc11..a8b239ef3826 100644 --- a/packages/rocketchat-ui/client/components/selectDropdown.js +++ b/packages/rocketchat-ui/client/components/selectDropdown.js @@ -1,3 +1,5 @@ +import { ReactiveVar } from 'meteor/reactive-var'; + Template.selectDropdown.events({ 'focus input'(e, i) { i.open.set(true); diff --git a/packages/rocketchat-ui/client/components/tabs.js b/packages/rocketchat-ui/client/components/tabs.js index e4968758c884..f9752e569698 100644 --- a/packages/rocketchat-ui/client/components/tabs.js +++ b/packages/rocketchat-ui/client/components/tabs.js @@ -1,3 +1,5 @@ +import { ReactiveVar } from 'meteor/reactive-var'; + Template.tabs.onCreated(function() { this.activeTab = new ReactiveVar(this.data.tabs.tabs.find((tab) => tab.active).value); }); diff --git a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js index 0281fb645be6..c8a4a14b84d6 100644 --- a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js +++ b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js @@ -1,5 +1,6 @@ /* globals readMessage UserRoles RoomRoles*/ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; export const upsertMessage = ({ msg, subscription }) => { diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js index 0a1d6b8ae04c..0a4e11960883 100644 --- a/packages/rocketchat-ui/client/lib/RoomManager.js +++ b/packages/rocketchat-ui/client/lib/RoomManager.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import { upsertMessage } from './RoomHistoryManager'; diff --git a/packages/rocketchat-ui/client/lib/accountBox.js b/packages/rocketchat-ui/client/lib/accountBox.js index 94bb707186bc..de096a06f023 100644 --- a/packages/rocketchat-ui/client/lib/accountBox.js +++ b/packages/rocketchat-ui/client/lib/accountBox.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; this.AccountBox = (function() { diff --git a/packages/rocketchat-ui/client/lib/accounts.js b/packages/rocketchat-ui/client/lib/accounts.js index 5380b57034d3..fa86205b546e 100644 --- a/packages/rocketchat-ui/client/lib/accounts.js +++ b/packages/rocketchat-ui/client/lib/accounts.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; import toastr from 'toastr'; Accounts.onEmailVerificationLink(function(token, done) { diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js index f248fce1f44e..7494bcec7662 100644 --- a/packages/rocketchat-ui/client/lib/chatMessages.js +++ b/packages/rocketchat-ui/client/lib/chatMessages.js @@ -1,5 +1,7 @@ /* globals MsgTyping */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; +import { Random } from 'meteor/random'; import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; diff --git a/packages/rocketchat-ui/client/lib/cordova/facebook-login.js b/packages/rocketchat-ui/client/lib/cordova/facebook-login.js index 51707369695a..32cf7486acfc 100644 --- a/packages/rocketchat-ui/client/lib/cordova/facebook-login.js +++ b/packages/rocketchat-ui/client/lib/cordova/facebook-login.js @@ -1,5 +1,6 @@ /* globals facebookConnectPlugin Facebook*/ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; Meteor.loginWithFacebookCordova = function(options, callback) { if (!callback && typeof options === 'function') { diff --git a/packages/rocketchat-ui/client/lib/msgTyping.js b/packages/rocketchat-ui/client/lib/msgTyping.js index 3941a9fbdb5c..621c5a623bb9 100644 --- a/packages/rocketchat-ui/client/lib/msgTyping.js +++ b/packages/rocketchat-ui/client/lib/msgTyping.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; export const MsgTyping = (function() { diff --git a/packages/rocketchat-ui/client/lib/notification.js b/packages/rocketchat-ui/client/lib/notification.js index 58b64ed16ba7..ba8796d41ad5 100644 --- a/packages/rocketchat-ui/client/lib/notification.js +++ b/packages/rocketchat-ui/client/lib/notification.js @@ -1,5 +1,7 @@ // @TODO implementar 'clicar na notificacao' abre a janela do chat import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; +import { Random } from 'meteor/random'; import _ from 'underscore'; import s from 'underscore.string'; import { e2e } from 'meteor/rocketchat:e2e'; diff --git a/packages/rocketchat-ui/client/lib/recorderjs/videoRecorder.js b/packages/rocketchat-ui/client/lib/recorderjs/videoRecorder.js index aa6c8882e633..3d0c88b0634d 100644 --- a/packages/rocketchat-ui/client/lib/recorderjs/videoRecorder.js +++ b/packages/rocketchat-ui/client/lib/recorderjs/videoRecorder.js @@ -1,3 +1,5 @@ +import { ReactiveVar } from 'meteor/reactive-var'; + this.VideoRecorder = new class { constructor() { this.started = false; diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js index 6cbf6140961e..c84097acb76d 100644 --- a/packages/rocketchat-ui/client/views/app/createChannel.js +++ b/packages/rocketchat-ui/client/views/app/createChannel.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; const acEvents = { diff --git a/packages/rocketchat-ui/client/views/app/directory.js b/packages/rocketchat-ui/client/views/app/directory.js index ed8733092df1..d206f0fb1d55 100644 --- a/packages/rocketchat-ui/client/views/app/directory.js +++ b/packages/rocketchat-ui/client/views/app/directory.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import { timeAgo } from './helpers'; diff --git a/packages/rocketchat-ui/client/views/app/popout.js b/packages/rocketchat-ui/client/views/app/popout.js index 9e2cc2dae4f5..eb704e739007 100644 --- a/packages/rocketchat-ui/client/views/app/popout.js +++ b/packages/rocketchat-ui/client/views/app/popout.js @@ -1,4 +1,5 @@ /* globals popout */ +import { ReactiveVar } from 'meteor/reactive-var'; this.popout = { context: null, diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js index 45430f09fb0c..a2030cdbbfe4 100644 --- a/packages/rocketchat-ui/client/views/app/room.js +++ b/packages/rocketchat-ui/client/views/app/room.js @@ -1,5 +1,7 @@ /* globals chatMessages, fileUpload , fireGlobalEvent , cordova , readMessage , RoomRoles, popover , device */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; +import { Random } from 'meteor/random'; import { RocketChatTabBar } from 'meteor/rocketchat:lib'; import _ from 'underscore'; diff --git a/packages/rocketchat-ui/client/views/app/secretURL.js b/packages/rocketchat-ui/client/views/app/secretURL.js index af32336689b4..5b67c656c43f 100644 --- a/packages/rocketchat-ui/client/views/app/secretURL.js +++ b/packages/rocketchat-ui/client/views/app/secretURL.js @@ -1,5 +1,6 @@ /* globals KonchatNotification */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; Template.secretURL.helpers({ registrationAllowed() { diff --git a/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js b/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js index f05aed90c741..cbde903391a5 100644 --- a/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js +++ b/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js @@ -1,5 +1,6 @@ /* globals WebRTC */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; Template.videoCall.onCreated(function() { return this.mainVideo = new ReactiveVar('$auto'); diff --git a/packages/rocketchat-ui/client/views/cmsPage.js b/packages/rocketchat-ui/client/views/cmsPage.js index d540a0fc4c5e..e2dc1d9299c7 100644 --- a/packages/rocketchat-ui/client/views/cmsPage.js +++ b/packages/rocketchat-ui/client/views/cmsPage.js @@ -1,3 +1,5 @@ +import { ReactiveVar } from 'meteor/reactive-var'; + Template.cmsPage.onCreated(function() { this.page = new ReactiveVar(''); return Tracker.autorun(() => { diff --git a/packages/rocketchat-webdav/client/addWebdavAccount.js b/packages/rocketchat-webdav/client/addWebdavAccount.js index db8c6358c064..d32572c005f7 100644 --- a/packages/rocketchat-webdav/client/addWebdavAccount.js +++ b/packages/rocketchat-webdav/client/addWebdavAccount.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/packages/rocketchat-webrtc/client/WebRTCClass.js b/packages/rocketchat-webrtc/client/WebRTCClass.js index 5919330d468a..adb6b79bc54f 100644 --- a/packages/rocketchat-webrtc/client/WebRTCClass.js +++ b/packages/rocketchat-webrtc/client/WebRTCClass.js @@ -1,5 +1,7 @@ /* globals chrome, ChromeScreenShare */ import { Meteor } from 'meteor/meteor'; +import { ReactiveVar } from 'meteor/reactive-var'; + class WebRTCTransportClass { constructor(webrtcInstance) { this.debug = false; diff --git a/packages/rocketchat_theme/server/server.js b/packages/rocketchat_theme/server/server.js index b2a6d8a5708b..dabeb874fcf3 100644 --- a/packages/rocketchat_theme/server/server.js +++ b/packages/rocketchat_theme/server/server.js @@ -1,5 +1,6 @@ /* globals WebAppHashing */ +import { WebApp } from 'meteor/webapp'; import { Meteor } from 'meteor/meteor'; import _ from 'underscore'; import less from 'less'; diff --git a/server/configuration/accounts_meld.js b/server/configuration/accounts_meld.js index d4f1280c03ca..777840e236fa 100644 --- a/server/configuration/accounts_meld.js +++ b/server/configuration/accounts_meld.js @@ -1,4 +1,5 @@ import _ from 'underscore'; +import { Accounts } from 'meteor/accounts-base'; const orig_updateOrCreateUserFromExternalService = Accounts.updateOrCreateUserFromExternalService; diff --git a/server/lib/accounts.js b/server/lib/accounts.js index 3d5670b2d692..145424cc3bd5 100644 --- a/server/lib/accounts.js +++ b/server/lib/accounts.js @@ -1,4 +1,5 @@ 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'; diff --git a/server/lib/cordova.js b/server/lib/cordova.js index 2677ebab7160..d57738d62f16 100644 --- a/server/lib/cordova.js +++ b/server/lib/cordova.js @@ -1,5 +1,6 @@ /* global Push, SystemLogger */ import { Meteor } from 'meteor/meteor'; +import { HTTP } from 'meteor/http'; Meteor.methods({ // log() { diff --git a/server/lib/cordova/facebook-login.js b/server/lib/cordova/facebook-login.js index 6ce9fd422c2e..1122635bfca9 100644 --- a/server/lib/cordova/facebook-login.js +++ b/server/lib/cordova/facebook-login.js @@ -1,4 +1,6 @@ import _ from 'underscore'; +import { Accounts } from 'meteor/accounts-base'; +import { HTTP } from 'meteor/http'; function getIdentity(accessToken) { try { diff --git a/server/methods/getAvatarSuggestion.js b/server/methods/getAvatarSuggestion.js index 49280f4ec706..3b831c5620b4 100644 --- a/server/methods/getAvatarSuggestion.js +++ b/server/methods/getAvatarSuggestion.js @@ -1,5 +1,6 @@ /* global Gravatar */ import { Meteor } from 'meteor/meteor'; +import { HTTP } from 'meteor/http'; function getAvatarSuggestionForUser(user) { check(user, Object); diff --git a/server/methods/registerUser.js b/server/methods/registerUser.js index 491aa23de9b7..8b85f6d8ef90 100644 --- a/server/methods/registerUser.js +++ b/server/methods/registerUser.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; import s from 'underscore.string'; import * as Mailer from 'meteor/rocketchat:mailer'; let verifyEmailTemplate = ''; diff --git a/server/methods/saveUserProfile.js b/server/methods/saveUserProfile.js index 4aeaf9c701d7..cf7724e9a955 100644 --- a/server/methods/saveUserProfile.js +++ b/server/methods/saveUserProfile.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; Meteor.methods({ saveUserProfile(settings, customFields) { diff --git a/server/methods/sendConfirmationEmail.js b/server/methods/sendConfirmationEmail.js index bbc82f58f163..5564d3908cb4 100644 --- a/server/methods/sendConfirmationEmail.js +++ b/server/methods/sendConfirmationEmail.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; import * as Mailer from 'meteor/rocketchat:mailer'; let subject = ''; diff --git a/server/methods/sendForgotPasswordEmail.js b/server/methods/sendForgotPasswordEmail.js index d763b495c019..10ae67042576 100644 --- a/server/methods/sendForgotPasswordEmail.js +++ b/server/methods/sendForgotPasswordEmail.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; import s from 'underscore.string'; import * as Mailer from 'meteor/rocketchat:mailer'; diff --git a/server/methods/setUserActiveStatus.js b/server/methods/setUserActiveStatus.js index 202f02d39e19..3b52365416fa 100644 --- a/server/methods/setUserActiveStatus.js +++ b/server/methods/setUserActiveStatus.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; import * as Mailer from 'meteor/rocketchat:mailer'; Meteor.methods({ diff --git a/server/methods/setUserPassword.js b/server/methods/setUserPassword.js index 7db9f90a3caf..3221f7ec17d7 100644 --- a/server/methods/setUserPassword.js +++ b/server/methods/setUserPassword.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; Meteor.methods({ setUserPassword(password) { diff --git a/server/startup/avatar.js b/server/startup/avatar.js index a3adb079854b..f1e66b5408da 100644 --- a/server/startup/avatar.js +++ b/server/startup/avatar.js @@ -1,4 +1,5 @@ /* globals FileUpload */ +import { WebApp } from 'meteor/webapp'; import { Meteor } from 'meteor/meteor'; import _ from 'underscore'; import sharp from 'sharp'; diff --git a/server/startup/cron.js b/server/startup/cron.js index f8fc79e57b9d..1c68fcf4df64 100644 --- a/server/startup/cron.js +++ b/server/startup/cron.js @@ -1,5 +1,6 @@ /* global SyncedCron */ import { Meteor } from 'meteor/meteor'; +import { HTTP } from 'meteor/http'; const logger = new Logger('SyncedCron'); diff --git a/server/startup/initialData.js b/server/startup/initialData.js index a502b3112cf1..9d3415bc4ec6 100644 --- a/server/startup/initialData.js +++ b/server/startup/initialData.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; import _ from 'underscore'; Meteor.startup(function() { diff --git a/server/startup/migrations/v004.js b/server/startup/migrations/v004.js index 63cb0c7182a8..40c00ac52fbc 100644 --- a/server/startup/migrations/v004.js +++ b/server/startup/migrations/v004.js @@ -1,3 +1,5 @@ +import { Random } from 'meteor/random'; + RocketChat.Migrations.add({ version: 4, up() { diff --git a/server/startup/migrations/v036.js b/server/startup/migrations/v036.js index 36bbff09376a..5fc1479cb6eb 100644 --- a/server/startup/migrations/v036.js +++ b/server/startup/migrations/v036.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { HTTP } from 'meteor/http'; import url from 'url'; RocketChat.Migrations.add({