Merge pull request #8491 from RocketChat/hotfix/join-code

[FIX] Invalid Code message for password protected channel
RocketChat · Oct 17, 2017 · a38d917 · a38d917
1 parent 342ed3a
commit a38d917
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 41 deletions.
diff --git a/packages/rocketchat-lib/server/methods/joinRoom.js b/packages/rocketchat-lib/server/methods/joinRoom.js
@@ -18,7 +18,7 @@ Meteor.methods({
 		}
 
 		if ((room.joinCodeRequired === true) && (code !== room.joinCode) && !RocketChat.authz.hasPermission(Meteor.userId(), 'join-without-join-code')) {
-			throw new Meteor.Error('error-code-invalid', 'Invalid Code', { method: 'joinRoom' });
+			throw new Meteor.Error('error-code-invalid', 'Invalid Room Password', { method: 'joinRoom' });
 		}
 
 		return RocketChat.addUserToRoom(rid, Meteor.user());

diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
@@ -73,7 +73,7 @@
 					<div>
 						{{{_ "you_are_in_preview_mode_of" room_name=roomName}}}
 						{{#if joinCodeRequired}}
-							<input type="text" name="joinCode" placeholder="{{_ 'Code'}}" style="width: 100px">
+							<input type="text" name="joinCode" placeholder="{{_ 'Password'}}" style="width: 100px">
 						{{/if}}
 						<button class="button join"><span><i class="icon-login"></i> {{_ "join"}}</span></button>
 					</div>

diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
@@ -506,7 +506,9 @@ Meteor.startup(function() {
 	});
 	RocketChat.callbacks.add('enter-room', function() {
 		setTimeout(()=> {
-			chatMessages[RocketChat.openedRoom].input.focus();
+			if (chatMessages[RocketChat.openedRoom].input) {
+				chatMessages[RocketChat.openedRoom].input.focus();
+			}
 		}, 200);
 	});
 });
diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js
@@ -381,7 +381,7 @@ this.ChatMessages = class ChatMessages {
 
 	restoreText(rid) {
 		const text = localStorage.getItem(`messagebox_${ rid }`);
-		if (typeof text === 'string') {
+		if (typeof text === 'string' && this.input) {
 			this.input.value = text;
 		}
 	}

diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
@@ -955,8 +955,8 @@ Template.room.onRendered(function() {
 		}
 	});
 	Tracker.autorun(function() {
-		const subRoom = ChatSubscription.findOne({rid:template.data._id});
-		if (!subRoom) {
+		const room = RocketChat.models.Rooms.findOne({ _id: template.data._id });
+		if (!room) {
 			FlowRouter.go('home');
 		}
 	});

diff --git a/server/publications/room.js b/server/publications/room.js
@@ -1,47 +1,58 @@
-const options = {
-	fields: {
-		_id: 1,
-		name: 1,
-		fname: 1,
-		t: 1,
-		cl: 1,
-		u: 1,
-		// usernames: 1,
-		topic: 1,
-		announcement: 1,
-		muted: 1,
-		_updatedAt: 1,
-		archived: 1,
-		jitsiTimeout: 1,
-		description: 1,
-		default: 1,
-		customFields: 1,
-
-		// @TODO create an API to register this fields based on room type
-		livechatData: 1,
-		tags: 1,
-		sms: 1,
-		code: 1,
-		open: 1,
-		v: 1,
-		label: 1,
-		ro: 1,
-		sentiment: 1
-	}
+const fields = {
+	_id: 1,
+	name: 1,
+	fname: 1,
+	t: 1,
+	cl: 1,
+	u: 1,
+	// usernames: 1,
+	topic: 1,
+	announcement: 1,
+	muted: 1,
+	_updatedAt: 1,
+	archived: 1,
+	jitsiTimeout: 1,
+	description: 1,
+	default: 1,
+	customFields: 1,
+
+	// @TODO create an API to register this fields based on room type
+	livechatData: 1,
+	tags: 1,
+	sms: 1,
+	code: 1,
+	joinCodeRequired: 1,
+	open: 1,
+	v: 1,
+	label: 1,
+	ro: 1,
+	sentiment: 1
 };
 
 
-const roomMap = (record) => {
+const roomMap = (record, fields) => {
 	if (record._room) {
-		return _.pick(record._room, ...Object.keys(options.fields));
+		return _.pick(record._room, ...Object.keys(fields));
 	}
 	console.log('Empty Room for Subscription', record);
 	return {};
 };
 
+function getFieldsForUserId(userId) {
+	if (RocketChat.authz.hasPermission(userId, 'view-join-code')) {
+		return {
+			...fields,
+			joinCode: 1
+		};
+	}
+
+	return fields;
+}
 
 Meteor.methods({
 	'rooms/get'(updatedAt) {
+		let options = {fields};
+
 		if (!Meteor.userId()) {
 			if (RocketChat.settings.get('Accounts_AllowAnonymousRead') === true) {
 				return RocketChat.models.Rooms.findByDefaultAndTypes(true, ['c'], options).fetch();
@@ -51,6 +62,10 @@ Meteor.methods({
 
 		this.unblock();
 
+		options = {
+			fields: getFieldsForUserId(this.userId)
+		};
+
 		if (updatedAt instanceof Date) {
 			return {
 				update: RocketChat.models.Rooms.findBySubscriptionUserIdUpdatedAfter(Meteor.userId(), updatedAt, options).fetch(),
@@ -84,22 +99,22 @@ Meteor.methods({
 			throw new Meteor.Error('error-no-permission', 'No permission', { method: 'getRoomByTypeAndName' });
 		}
 
-		return roomMap({_room: room});
+		return roomMap({_room: room}, getFieldsForUserId(this.userId));
 	}
 });
 
 RocketChat.models.Rooms.cache.on('sync', (type, room/*, diff*/) => {
 	const records = RocketChat.models.Subscriptions.findByRoomId(room._id).fetch();
 	for (const record of records) {
-		RocketChat.Notifications.notifyUserInThisInstance(record.u._id, 'rooms-changed', type, roomMap({_room: room}));
+		RocketChat.Notifications.notifyUserInThisInstance(record.u._id, 'rooms-changed', type, roomMap({_room: room}, getFieldsForUserId(record.u._id)));
 	}
 });
 
 RocketChat.models.Subscriptions.on('changed', (type, subscription/*, diff*/) => {
 	if (type === 'inserted' || type === 'removed') {
 		const room = RocketChat.models.Rooms.findOneById(subscription.rid);
 		if (room) {
-			RocketChat.Notifications.notifyUserInThisInstance(subscription.u._id, 'rooms-changed', type, roomMap({_room: room}));
+			RocketChat.Notifications.notifyUserInThisInstance(subscription.u._id, 'rooms-changed', type, roomMap({_room: room}, getFieldsForUserId(subscription.u._id)));
 		}
 	}
 });