Merge branch 'develop' into globals/remove-logger

.eslintrc

@@ -2,27 +2,43 @@
 	"extends": ["@rocket.chat/eslint-config"],
 	"parser": "babel-eslint",
 	"globals": {
+		"__meteor_bootstrap__"        : false,
 		"__meteor_runtime_config__"   : false,
 		"AccountBox"                  : false,
+		"alerts"                      : false,
 		"Apps"                        : false,
 		"Assets"                      : false,
+		"AudioRecorder"               : false,
 		"ChatMessage"                 : false,
 		"ChatMessages"                : false,
+		"chatMessages"                : false,
 		"ChatRoom"                    : false,
 		"ChatSubscription"            : false,
+		"cordova"                     : false,
+		"device"                      : false,
+		"facebookConnectPlugin"       : false,
 		"FileUpload"                  : false,
+		"fileUploadHandler"           : false,
+		"fireGlobalEvent"             : false,
 		"handleError"                 : false,
 		"getAvatarUrlFromUsername"    : false,
+		"getAvatarSuggestionForUser"  : false,
 		"modal"                       : false,
+		"menu"                        : false,
 		"Npm"                         : false,
+		"openRoom"                    : false,
 		"Package"                     : false,
 		"readMessage"                 : false,
 		"RocketChat"                  : true,
+		"roomExit"                    : true,
 		"RoomHistoryManager"          : false,
 		"RoomManager"                 : false,
+		"RoomRoles"                   : false,
 		"Settings"                    : false,
 		"SideNav"                     : false,
 		"t"                           : false,
+		"TwitterConnect"              : false,
+		"UserRoles"                   : false,
 		"VideoRecorder"               : false,
 		"VRecDialog"                  : false
 	}

client/notifications/notification.js

@@ -1,8 +1,8 @@
-/* globals KonchatNotification, fireGlobalEvent, readMessage, CachedChatSubscription */
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
+import { KonchatNotification, fireGlobalEvent, readMessage, CachedChatSubscription } from 'meteor/rocketchat:ui';
 
 // Show notifications and play a sound for new messages.
 // We trust the server to only send notifications for interesting messages, e.g. direct messages or

client/notifications/updateAvatar.js

@@ -1,5 +1,5 @@
-/* globals updateAvatarOfUsername */
 import { Meteor } from 'meteor/meteor';
+import { updateAvatarOfUsername } from 'meteor/rocketchat:ui';
 
 Meteor.startup(function() {
 	RocketChat.Notifications.onLogged('updateAvatar', function(data) {

client/notifications/updateUserState.js

@@ -1,5 +1,5 @@
-/* globals fireGlobalEvent */
 import { Meteor } from 'meteor/meteor';
+import { fireGlobalEvent } from 'meteor/rocketchat:ui';
 
 /* fire user state change globally, to listen on desktop electron client */
 Meteor.startup(function() {

client/routes/router.js

@@ -1,11 +1,11 @@
-/* globals KonchatNotification */
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { Tracker } from 'meteor/tracker';
 import { Blaze } from 'meteor/blaze';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 import { Session } from 'meteor/session';
+import { KonchatNotification } from 'meteor/rocketchat:ui';
 import s from 'underscore.string';
 
 Blaze.registerHelper('pathFor', function(path, kw) {

client/startup/i18n.js

@@ -1,8 +1,8 @@
-/* globals isRtl */
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { isRtl } from 'meteor/rocketchat:ui';
 import moment from 'moment';
 
 const currentLanguage = new ReactiveVar();

client/startup/startup.js

@@ -1,8 +1,9 @@
-/* globals UserPresence, fireGlobalEvent */
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 import { TimeSync } from 'meteor/mizzao:timesync';
+import { UserPresence } from 'meteor/konecty:user-presence';
+import { fireGlobalEvent } from 'meteor/rocketchat:ui';
 import toastr from 'toastr';
 import hljs from 'highlight.js';
 import 'highlight.js/styles/github.css';

client/startup/unread.js

@@ -1,9 +1,9 @@
-/* globals fireGlobalEvent, readMessage, favico, menu */
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Favico } from 'meteor/rocketchat:favico';
+import { fireGlobalEvent, readMessage } from 'meteor/rocketchat:ui';
 
 Meteor.startup(function() {
 	Tracker.autorun(function() {
@@ -77,8 +77,8 @@ Meteor.startup(function() {
 		const unread = Session.get('unread');
 		fireGlobalEvent('unread-changed', unread);
 
-		if (favico) {
-			favico.badge(unread, {
+		if (window.favico) {
+			window.favico.badge(unread, {
 				bgColor: typeof unread !== 'number' ? '#3d8a3a' : '#ac1b1b',
 			});
 		}

packages/meteor-accounts-saml/client/saml_client.js

@@ -1,4 +1,3 @@
-/* globals cordova */
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { Random } from 'meteor/random';

packages/rocketchat-apps/server/bridges/environmental.js

@@ -7,11 +7,11 @@ export class AppEnvironmentalVariableBridge {
 	async getValueByName(envVarName, appId) {
 		console.log(`The App ${ appId } is getting the environmental variable value ${ envVarName }.`);
 
-		if (this.isReadable(envVarName, appId)) {
-			return process.env[envVarName];
+		if (!(await this.isReadable(envVarName, appId))) {
+			throw new Error(`The environmental variable "${ envVarName }" is not readable.`);
 		}
 
-		throw new Error(`The environmental variable "${ envVarName }" is not readable.`);
+		return process.env[envVarName];
 	}
 
 	async isReadable(envVarName, appId) {
@@ -23,10 +23,10 @@ export class AppEnvironmentalVariableBridge {
 	async isSet(envVarName, appId) {
 		console.log(`The App ${ appId } is checking if the environmental variable is set ${ envVarName }.`);
 
-		if (this.isReadable(envVarName, appId)) {
-			return typeof process.env[envVarName] !== 'undefined';
+		if (!(await this.isReadable(envVarName, appId))) {
+			throw new Error(`The environmental variable "${ envVarName }" is not readable.`);
 		}
 
-		throw new Error(`The environmental variable "${ envVarName }" is not readable.`);
+		return typeof process.env[envVarName] !== 'undefined';
 	}
 }

packages/rocketchat-authorization/server/functions/canAccessRoom.js

@@ -1,4 +1,5 @@
-/* globals RocketChat */
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.authz.roomAccessValidators = [
 	function(room, user = {}) {
 		if (room && room.t === 'c') {

packages/rocketchat-channel-settings/client/views/channelSettings.js

@@ -1,8 +1,8 @@
-/* globals popover */
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { popover } from 'meteor/rocketchat:ui';
 import toastr from 'toastr';
 import moment from 'moment';
 import s from 'underscore.string';

packages/rocketchat-channel-settings/package.js

@@ -12,6 +12,7 @@ Package.onUse(function(api) {
 		'tracker',
 		'templating',
 		'rocketchat:lib',
+		'rocketchat:ui',
 	]);
 	api.addFiles('client/stylesheets/channel-settings.css', 'client');
 	api.mainModule('client/index.js', 'client');

packages/rocketchat-custom-oauth/client/custom_oauth_client.js

@@ -1,9 +1,9 @@
-/* globals OAuth*/
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
 import { Random } from 'meteor/random';
 import { ServiceConfiguration } from 'meteor/service-configuration';
+import { OAuth } from 'meteor/oauth';
 import s from 'underscore.string';
 
 // Request custom OAuth credentials for the user

packages/rocketchat-custom-oauth/server/custom_oauth_server.js

@@ -1,7 +1,7 @@
-/* globals OAuth*/
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
+import { OAuth } from 'meteor/oauth';
 import { HTTP } from 'meteor/http';
 import { ServiceConfiguration } from 'meteor/service-configuration';
 import { Logger } from 'meteor/rocketchat:logger';

packages/rocketchat-e2e/client/accountEncryption.js

@@ -1,4 +1,6 @@
-/* globals Template, t, ReactiveVar */
+
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
 import toastr from 'toastr';
 import s from 'underscore.string';
 import { RocketChat } from 'meteor/rocketchat:lib';

packages/rocketchat-e2e/client/rocketchat.e2e.js

@@ -1,4 +1,3 @@
-/* globals alerts, modal */
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import { ReactiveVar } from 'meteor/reactive-var';

packages/rocketchat-e2e/package.js

@@ -1,5 +1,3 @@
-/* globals Package: false */
-
 Package.describe({
 	name: 'rocketchat:e2e',
 	version: '0.0.1',

packages/rocketchat-emoji/client/keyboardFix.js

@@ -1,4 +1,3 @@
-/* global device */
 import { Meteor } from 'meteor/meteor';
 import { RocketChat } from 'meteor/rocketchat:lib';
 

packages/rocketchat-file-upload/client/lib/fileUploadHandler.js

@@ -1,8 +1,8 @@
-/* globals FileUploadBase, UploadFS, fileUploadHandler:true */
-/* exported fileUploadHandler */
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { Tracker } from 'meteor/tracker';
+import { UploadFS } from 'meteor/jalik:ufs';
+import { FileUploadBase } from '../../lib/FileUploadBase';
 
 new UploadFS.Store({
 	collection: RocketChat.models.Uploads.model,

packages/rocketchat-file-upload/globalFileRestrictions.js

@@ -1,6 +1,6 @@
-/* globals Slingshot */
 import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { Slingshot } from 'meteor/edgee:slingshot';
 
 import filesize from 'filesize';
 

packages/rocketchat-file-upload/lib/FileUpload.js

@@ -1,5 +1,3 @@
-/* globals FileUpload:true */
-/* exported FileUpload */
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { TAPi18n } from 'meteor/tap:i18n';

packages/rocketchat-file-upload/lib/FileUploadBase.js

@@ -1,7 +1,6 @@
-/* globals FileUploadBase:true, UploadFS */
-/* exported FileUploadBase */
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
+import { UploadFS } from 'meteor/jalik:ufs';
 import _ from 'underscore';
 
 UploadFS.config.defaultStorePermissions = new UploadFS.StorePermissions({
@@ -35,7 +34,7 @@ UploadFS.config.defaultStorePermissions = new UploadFS.StorePermissions({
 });
 
 
-FileUploadBase = class FileUploadBase {
+export class FileUploadBase {
 	constructor(store, meta, file) {
 		this.id = Random.id();
 		this.meta = meta;
@@ -77,4 +76,4 @@ FileUploadBase = class FileUploadBase {
 	stop() {
 		return this.handler.stop();
 	}
-};
+}

packages/rocketchat-file-upload/package.js

@@ -1,4 +1,3 @@
-/* globals Package */
 Package.describe({
 	name: 'rocketchat:file-upload',
 	version: '0.0.1',
@@ -20,6 +19,7 @@ Package.onUse(function(api) {
 	api.use('accounts-base');
 	api.use('tracker');
 	api.use('webapp');
+	api.use('konecty:multiple-instances-status');
 	api.use('rocketchat:e2e');
 
 	api.addFiles('globalFileRestrictions.js');

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

@@ -1,5 +1,3 @@
-/* globals FileUpload */
-
 import _ from 'underscore';
 import { FileUploadClass } from '../lib/FileUpload';
 import '../../ufs/AmazonS3/server.js';

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

@@ -1,6 +1,5 @@
-/* globals FileUpload, UploadFS */
-
 import { Meteor } from 'meteor/meteor';
+import { UploadFS } from 'meteor/jalik:ufs';
 import _ from 'underscore';
 import fs from 'fs';
 import { FileUploadClass } from '../lib/FileUpload';

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

@@ -1,5 +1,3 @@
-/* globals FileUpload */
-
 import _ from 'underscore';
 import { FileUploadClass } from '../lib/FileUpload';
 import '../../ufs/GoogleStorage/server.js';

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

@@ -1,4 +1,4 @@
-/* globals FileUpload, UploadFS */
+import { UploadFS } from 'meteor/jalik:ufs';
 import stream from 'stream';
 import zlib from 'zlib';
 import util from 'util';

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

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

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

@@ -1,5 +1,3 @@
-/* globals FileUpload */
-
 import _ from 'underscore';
 import { FileUploadClass } from '../lib/FileUpload';
 import '../../ufs/Webdav/server.js';

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

@@ -1,5 +1,4 @@
-/* globals UploadFS */
-
+import { UploadFS } from 'meteor/jalik:ufs';
 import _ from 'underscore';
 import './AmazonS3.js';
 import './FileSystem.js';

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

@@ -1,12 +1,11 @@
-/* globals UploadFS */
-
 import { Meteor } from 'meteor/meteor';
 import fs from 'fs';
 import stream from 'stream';
 import mime from 'mime-type/with-db';
 import Future from 'fibers/future';
 import sharp from 'sharp';
 import { Cookies } from 'meteor/ostrio:cookies';
+import { UploadFS } from 'meteor/jalik:ufs';
 
 const cookie = new Cookies();
 
@@ -129,8 +128,7 @@ Object.assign(FileUpload, {
 		const image = FileUpload.getStore('Uploads')._store.getReadStream(file._id, file);
 
 		const transformer = sharp()
-			.resize(32, 32)
-			.max()
+			.resize({ width: 32, height: 32, fit: 'inside' })
 			.jpeg()
 			.blur();
 		const result = transformer.toBuffer().then((out) => out.toString('base64'));

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

@@ -1,7 +1,7 @@
-/* globals UploadFS, InstanceStatus */
-
 import { Meteor } from 'meteor/meteor';
 import { WebApp } from 'meteor/webapp';
+import { UploadFS } from 'meteor/jalik:ufs';
+import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
 import { Logger } from 'meteor/rocketchat:logger';
 import http from 'http';
 import URL from 'url';

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

@@ -1,6 +1,5 @@
-/* globals FileUpload, WebApp */
-
 import { Meteor } from 'meteor/meteor';
+import { WebApp } from 'meteor/webapp';
 
 WebApp.connectHandlers.use('/file-upload/',	function(req, res, next) {
 

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

@@ -1,5 +1,5 @@
-/* globals UploadFS */
 import { Meteor } from 'meteor/meteor';
+import { UploadFS } from 'meteor/jalik:ufs';
 
 let protectedFiles;
 

packages/rocketchat-iframe-login/client/iframe_client.js

@@ -1,4 +1,3 @@
-/* globals facebookConnectPlugin, TwitterConnect */
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { RocketChat } from 'meteor/rocketchat:lib';

packages/rocketchat-internal-hubot/server/hubot.js

@@ -1,4 +1,3 @@
-/* globals __meteor_bootstrap__ */
 import { Meteor } from 'meteor/meteor';
 import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';