Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…

…nto rocketchat-lib

HISTORY.md

@@ -7,6 +7,8 @@
 - [NEW] Option to enable `Two Factor Authentication` in user's account preference
 - [FIX] Incoming integrations would break when trying to use the `Store` feature.
 - [FIX] Outgoing webhooks which have an error and they're retrying would still retry even if the integration was disabled. (#4835)
+- [FIX] Removed Deprecated Package rocketchat:sharedsecret.
+- [BREAK] `getUsersOfRoom` API to return array of objects with user and username, instead of array of strings
 
 ## 0.54.2 - 2017-Mar-24
 

README.md

@@ -15,7 +15,7 @@
 * [Mobile apps](#mobile-apps)
 * [Desktop apps](#desktop-apps)
 * [Deployment](#deployment)
-   * [Snaps](#instant-server-intallation-with-snaps)
+   * [Snaps](#instant-server-installation-with-snaps)
    * [Layershift](#layershift)
    * [Sandstorm.io](#sandstormio) 
    * [DPlatform](#dplatform) 
@@ -76,7 +76,7 @@ Now compatible with all Android devices as old as version 4.0.x - [download here
 
 # Deployment
 
-## Instant Server Intallation with Snaps
+## Instant Server Installation with Snaps
 
 Install Rocket.Chat in seconds on Linux (Ubuntu and others) with:
 

client/startup/startup.js

@@ -44,6 +44,7 @@ Meteor.startup(function() {
 		return RocketChat.settings.get('Language') || defaultAppLanguage();
 	};
 
+	const availableLanguages = TAPi18n.getLanguages();
 	const loadedLanguages = [];
 
 	window.setLanguage = function(language) {
@@ -63,7 +64,10 @@ Meteor.startup(function() {
 			$('html').removeClass('rtl');
 		}
 
-		language = language.split('-').shift();
+		if (!availableLanguages[language]) {
+			language = language.split('-').shift();
+		}
+
 		TAPi18n.setLanguage(language);
 
 		language = language.toLowerCase();

packages/rocketchat-api/server/settings.js

@@ -4,6 +4,8 @@ RocketChat.settings.addGroup('General', function() {
 		this.add('API_Default_Count', 50, { type: 'int', public: false });
 		this.add('API_Allow_Infinite_Count', true, { type: 'boolean', public: false });
 		this.add('API_Enable_Direct_Message_History_EndPoint', false, { type: 'boolean', public: false });
+		this.add('API_Enable_Shields', true, { type: 'boolean', public: false });
+		this.add('API_Shield_Types', '*', { type: 'string', public: false, enableQuery: { _id: 'API_Enable_Shields', value: true } });
 		this.add('API_Enable_CORS', false, { type: 'boolean', public: false });
 		this.add('API_CORS_Origin', '*', { type: 'string', public: false, enableQuery: { _id: 'API_Enable_CORS', value: true } });
 	});

packages/rocketchat-api/server/v1/misc.js

@@ -31,3 +31,72 @@ RocketChat.API.v1.addRoute('me', { authRequired: true }, {
 		]));
 	}
 });
+
+let onlineCache = 0;
+let onlineCacheDate = 0;
+const cacheInvalid = 60000; // 1 minute
+RocketChat.API.v1.addRoute('shield.svg', { authRequired: false }, {
+	get() {
+		const { type, channel, name, icon } = this.queryParams;
+		if (!RocketChat.settings.get('API_Enable_Shields')) {
+			throw new Meteor.Error('error-endpoint-disabled', 'This endpoint is disabled', { route: '/api/v1/shields.svg' });
+		}
+		const types = RocketChat.settings.get('API_Shield_Types');
+		if (type && (types !== '*' && !types.split(',').map((t) => t.trim()).includes(type))) {
+			throw new Meteor.Error('error-shield-disabled', 'This shield type is disabled', { route: '/api/v1/shields.svg' });
+		}
+		const hideIcon = icon === 'false';
+		if (hideIcon && (!name || !name.trim())) {
+			return RocketChat.API.v1.failure('Name cannot be empty when icon is hidden');
+		}
+		let text;
+		switch (type) {
+			case 'online':
+				if (Date.now() - onlineCacheDate > cacheInvalid) {
+					onlineCache = RocketChat.models.Users.findUsersNotOffline().count();
+					onlineCacheDate = Date.now();
+				}
+				text = `${ onlineCache } ${ TAPi18n.__('Online') }`;
+				break;
+			case 'channel':
+				if (!channel) {
+					return RocketChat.API.v1.failure('Shield channel is required for type "channel"');
+				}
+				text = `#${ channel }`;
+				break;
+			default:
+				text = TAPi18n.__('Join_Chat').toUpperCase();
+		}
+		const iconSize = hideIcon ? 7 : 24;
+		const leftSize = name ? name.length * 6 + 7 + iconSize : iconSize;
+		const rightSize = text.length * 6 + 20;
+		const width = leftSize + rightSize;
+		const height = 20;
+		return {
+			headers: { 'Content-Type': 'image/svg+xml;charset=utf-8' },
+			body: `
+				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="${ width }" height="${ height }">
+				  <linearGradient id="b" x2="0" y2="100%">
+				    <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+				    <stop offset="1" stop-opacity=".1"/>
+				  </linearGradient>
+				  <mask id="a">
+				    <rect width="${ width }" height="${ height }" rx="3" fill="#fff"/>
+				  </mask>
+				  <g mask="url(#a)">
+				    <path fill="#555" d="M0 0h${ leftSize }v${ height }H0z"/>
+				    <path fill="#4c1" d="M${ leftSize } 0h${ rightSize }v${ height }H${ leftSize }z"/>
+				    <path fill="url(#b)" d="M0 0h${ width }v${ height }H0z"/>
+				  </g>
+				    ${ hideIcon ? '' : '<image x="5" y="3" width="14" height="14" xlink:href="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfNSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiIHdpZHRoPSI1MTJweCIgaGVpZ2h0PSI1MTJweCIgdmlld0JveD0iMCAwIDUxMiA1MTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDUxMiA1MTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiNDMTI3MkQiIGQ9Ik01MDIuNTg2LDI1NS4zMjJjMC0yNS4yMzYtNy41NS00OS40MzYtMjIuNDQ1LTcxLjkzMmMtMTMuMzczLTIwLjE5NS0zMi4xMDktMzguMDcyLTU1LjY4Ny01My4xMzJDMzc4LjkzNywxMDEuMTgyLDMxOS4xMDgsODUuMTY4LDI1Niw4NS4xNjhjLTIxLjA3OSwwLTQxLjg1NSwxLjc4MS02Mi4wMDksNS4zMWMtMTIuNTA0LTExLjcwMi0yNy4xMzktMjIuMjMyLTQyLjYyNy0zMC41NkM2OC42MTgsMTkuODE4LDAsNTguOTc1LDAsNTguOTc1czYzLjc5OCw1Mi40MDksNTMuNDI0LDk4LjM1Yy0yOC41NDIsMjguMzEzLTQ0LjAxLDYyLjQ1My00NC4wMSw5Ny45OThjMCwwLjExMywwLjAwNiwwLjIyNiwwLjAwNiwwLjM0YzAsMC4xMTMtMC4wMDYsMC4yMjYtMC4wMDYsMC4zMzljMCwzNS41NDUsMTUuNDY5LDY5LjY4NSw0NC4wMSw5Ny45OTlDNjMuNzk4LDM5OS45NCwwLDQ1Mi4zNSwwLDQ1Mi4zNXM2OC42MTgsMzkuMTU2LDE1MS4zNjMtMC45NDNjMTUuNDg4LTguMzI3LDMwLjEyNC0xOC44NTcsNDIuNjI3LTMwLjU2YzIwLjE1NCwzLjUyOCw0MC45MzEsNS4zMSw2Mi4wMDksNS4zMWM2My4xMDgsMCwxMjIuOTM3LTE2LjAxNCwxNjguNDU0LTQ1LjA5MWMyMy41NzctMTUuMDYsNDIuMzEzLTMyLjkzNyw1NS42ODctNTMuMTMyYzE0Ljg5Ni0yMi40OTYsMjIuNDQ1LTQ2LjY5NSwyMi40NDUtNzEuOTMyYzAtMC4xMTMtMC4wMDYtMC4yMjYtMC4wMDYtMC4zMzlDNTAyLjU4LDI1NS41NDgsNTAyLjU4NiwyNTUuNDM2LDUwMi41ODYsMjU1LjMyMnoiLz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNMjU2LDEyMC44NDdjMTE2Ljg1NCwwLDIxMS41ODYsNjAuNTA5LDIxMS41ODYsMTM1LjE1NGMwLDc0LjY0MS05NC43MzEsMTM1LjE1NS0yMTEuNTg2LDEzNS4xNTVjLTI2LjAxOSwwLTUwLjkzNy0zLjAwOS03My45NTktOC40OTVjLTIzLjM5NiwyOC4xNDctNzQuODY4LDY3LjI4LTEyNC44NjksNTQuNjI5YzE2LjI2NS0xNy40Nyw0MC4zNjEtNDYuOTg4LDM1LjIwMS05NS42MDNjLTI5Ljk2OC0yMy4zMjItNDcuOTU5LTUzLjE2My00Ny45NTktODUuNjg2QzQ0LjQxNCwxODEuMzU2LDEzOS4xNDUsMTIwLjg0NywyNTYsMTIwLjg0NyIvPjxnPjxnPjxjaXJjbGUgZmlsbD0iI0MxMjcyRCIgY3g9IjI1NiIgY3k9IjI2MC4zNTIiIHI9IjI4LjEwNSIvPjwvZz48Zz48Y2lyY2xlIGZpbGw9IiNDMTI3MkQiIGN4PSIzNTMuNzI4IiBjeT0iMjYwLjM1MiIgcj0iMjguMTA0Ii8+PC9nPjxnPjxjaXJjbGUgZmlsbD0iI0MxMjcyRCIgY3g9IjE1OC4yNzIiIGN5PSIyNjAuMzUyIiByPSIyOC4xMDUiLz48L2c+PC9nPjxnPjxwYXRoIGZpbGw9IiNDQ0NDQ0MiIGQ9Ik0yNTYsMzczLjM3M2MtMjYuMDE5LDAtNTAuOTM3LTIuNjA3LTczLjk1OS03LjM2MmMtMjAuNjU5LDIxLjU0LTYzLjIwOSw1MC40OTYtMTA3LjMwNyw0OS40M2MtNS44MDYsOC44MDUtMTIuMTIxLDE2LjAwNi0xNy41NjIsMjEuODVjNTAsMTIuNjUxLDEwMS40NzMtMjYuNDgxLDEyNC44NjktNTQuNjI5YzIzLjAyMyw1LjQ4Niw0Ny45NDEsOC40OTUsNzMuOTU5LDguNDk1YzExNS45MTcsMCwyMTAuMDQ4LTU5LjU1LDIxMS41NTEtMTMzLjM2NEM0NjYuMDQ4LDMyMS43NjUsMzcxLjkxNywzNzMuMzczLDI1NiwzNzMuMzczeiIvPjwvZz48L3N2Zz4="/>' }
+				  <g fill="#fff" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
+						${ name ? `<text x="${ iconSize }" y="15" fill="#010101" fill-opacity=".3">${ name }</text>
+				    <text x="${ iconSize }" y="14">${ name }</text>` : '' }
+				    <text x="${ leftSize + 7 }" y="15" fill="#010101" fill-opacity=".3">${ text }</text>
+				    <text x="${ leftSize + 7 }" y="14">${ text }</text>
+				  </g>
+				</svg>
+			`.trim().replace(/\>[\s]+\</gm, '><')
+		};
+	}
+});

packages/rocketchat-cas/cas_server.js

@@ -188,7 +188,7 @@ Accounts.registerLoginHandler(function(options) {
 			logger.debug('Syncing user attributes');
 			// Update name
 			if (int_attrs.name) {
-				Meteor.users.update(user, { $set: { name: int_attrs.name }});
+				RocketChat._setRealName(user._id, int_attrs.name);
 			}
 
 			// Update email

packages/rocketchat-channel-settings-mail-messages/client/lib/startup.js

@@ -0,0 +1,12 @@
+import resetSelection from '../resetSelection';
+Meteor.startup(() => {
+	RocketChat.ChannelSettings.addOption({
+		group: ['room'],
+		id: 'mail-messages',
+		template: 'channelSettingsMailMessages',
+		validation() {
+			return RocketChat.authz.hasAllPermission('mail-messages');
+		}
+	});
+	RocketChat.callbacks.add('roomExit', () => resetSelection(false), RocketChat.callbacks.priority.MEDIUM, 'room-exit-mail-messages');
+});

packages/rocketchat-channel-settings-mail-messages/client/resetSelection.js

@@ -0,0 +1,11 @@
+export default function resetSelection(reset) {
+	const [el] = $('.messages-box');
+	if (!el) {
+		return;
+	}
+	const view = Blaze.getView(el);
+	if (view && typeof view.templateInstance === 'function') {
+		const {resetSelection} = view.templateInstance();
+		typeof resetSelection === 'function' && resetSelection(reset);
+	}
+}

packages/rocketchat-channel-settings-mail-messages/client/views/channelSettingsMailMessages.js

@@ -0,0 +1,17 @@
+import resetSelection from '../resetSelection';
+
+Template.channelSettingsMailMessages.helpers({
+	canSendEmail() {
+		return FlowRouter.getRouteName() !== 'admin-rooms';
+	}
+});
+
+Template.channelSettingsMailMessages.events({
+	'click button.mail-messages'() {
+		Session.set('channelSettingsMailMessages', Session.get('openedRoom'));
+		this.tabBar.setTemplate('mailMessagesInstructions');
+		resetSelection(true);
+	}
+});
+
+Template.channelSettingsMailMessages.onCreated(() =>resetSelection(false));