[FIX] App not prompting join code for password protected channels

app/i18n/locales/en.js

@@ -282,6 +282,8 @@ export default {
 	Invite_Link: 'Invite Link',
 	Invite_users: 'Invite users',
 	Join: 'Join',
+	Join_Code: 'Join Code',
+	Insert_Join_Code: 'Insert Join code',
 	Join_our_open_workspace: 'Join our open workspace',
 	Join_your_workspace: 'Join your workspace',
 	Just_invited_people_can_access_this_channel: 'Just invited people can access this channel',

app/i18n/locales/pt-BR.js

@@ -268,6 +268,8 @@ export default {
 	Invite_Link: 'Link de Convite',
 	Invite_users: 'Convidar usuários',
 	Join: 'Entrar',
+	Join_Code: 'Insira o Código da sala',
+	Insert_Join_Code: 'Insira o código para entrar na sala',
 	Join_our_open_workspace: 'Entra na nossa workspace pública',
 	Join_your_workspace: 'Entre na sua workspace',
 	Just_invited_people_can_access_this_channel: 'Apenas as pessoas convidadas podem acessar este canal',

app/lib/database/model/Subscription.js

@@ -64,8 +64,6 @@ export default class Subscription extends Model {
 
 	@field('archived') archived;
 
-	@field('join_code_required') joinCodeRequired;
-
 	@field('notifications') notifications;
 
 	@json('muted', sanitizer) muted;
@@ -110,6 +108,8 @@ export default class Subscription extends Model {
 
 	@json('tags', sanitizer) tags;
 
+	@field('join_code_required') joinCodeRequired;
+
 	@field('e2e_key') E2EKey;
 
 	@field('encrypted') encrypted;

app/lib/database/model/migrations.js

@@ -136,6 +136,7 @@ export default schemaMigrations({
 				addColumns({
 					table: 'subscriptions',
 					columns: [
+						{ name: 'join_code_required', type: 'boolean' },
 						{ name: 'e2e_key', type: 'string', isOptional: true },
 						{ name: 'encrypted', type: 'boolean', isOptional: true },
 						{ name: 'e2e_key_id', type: 'string', isOptional: true }

app/lib/database/schema/app.js

@@ -32,7 +32,6 @@ export default appSchema({
 				{ name: 'blocker', type: 'boolean', isOptional: true },
 				{ name: 'react_when_read_only', type: 'boolean', isOptional: true },
 				{ name: 'archived', type: 'boolean' },
-				{ name: 'join_code_required', type: 'boolean', isOptional: true },
 				{ name: 'muted', type: 'string', isOptional: true },
 				{ name: 'broadcast', type: 'boolean', isOptional: true },
 				{ name: 'prid', type: 'string', isOptional: true },
@@ -50,6 +49,7 @@ export default appSchema({
 				{ name: 'served_by', type: 'string', isOptional: true },
 				{ name: 'livechat_data', type: 'string', isOptional: true },
 				{ name: 'tags', type: 'string', isOptional: true },
+				{ name: 'join_code_required', type: 'boolean' },
 				{ name: 'e2e_key', type: 'string', isOptional: true },
 				{ name: 'encrypted', type: 'boolean', isOptional: true },
 				{ name: 'e2e_key_id', type: 'string', isOptional: true }

app/lib/methods/helpers/findSubscriptionsRooms.js

@@ -33,7 +33,6 @@ export default async(subscriptions = [], rooms = []) => {
 			blocker: s.blocker,
 			reactWhenReadOnly: s.reactWhenReadOnly,
 			archived: s.archived,
-			joinCodeRequired: s.joinCodeRequired,
 			muted: s.muted,
 			broadcast: s.broadcast,
 			prid: s.prid,
@@ -50,6 +49,7 @@ export default async(subscriptions = [], rooms = []) => {
 			servedBy: s.servedBy,
 			livechatData: s.livechatData,
 			tags: s.tags,
+			joinCodeRequired: s.joinCodeRequired,
 			encrypted: s.encrypted,
 			e2eKeyId: s.e2eKeyId,
 			E2EKey: s.E2EKey
@@ -66,7 +66,6 @@ export default async(subscriptions = [], rooms = []) => {
 			announcement: r.announcement,
 			reactWhenReadOnly: r.reactWhenReadOnly,
 			archived: r.archived,
-			joinCodeRequired: r.joinCodeRequired,
 			jitsiTimeout: r.jitsiTimeout,
 			usernames: r.usernames,
 			uids: r.uids,
@@ -79,6 +78,7 @@ export default async(subscriptions = [], rooms = []) => {
 			servedBy: r.servedBy,
 			livechatData: r.livechatData,
 			tags: r.tags,
+			joinCodeRequired: r.joinCodeRequired,
 			encrypted: r.encrypted,
 			e2eKeyId: r.e2eKeyId
 		}));

app/lib/methods/helpers/mergeSubscriptionsRooms.js

@@ -27,6 +27,7 @@ export const merge = (subscription, room) => {
 			subscription.uids = room.uids;
 		}
 		subscription.ro = room.ro;
+		subscription.joinCodeRequired = room.joinCodeRequired;
 		subscription.broadcast = room.broadcast;
 		subscription.encrypted = room.encrypted;
 		subscription.e2eKeyId = room.e2eKeyId;

app/lib/methods/subscriptions/rooms.js

@@ -34,7 +34,6 @@ const createOrUpdateSubscription = async(subscription, room) => {
 		const db = database.active;
 		const subCollection = db.collections.get('subscriptions');
 		const roomsCollection = db.collections.get('rooms');
-
 		if (!subscription) {
 			try {
 				const s = await subCollection.find(room._id);
@@ -64,7 +63,6 @@ const createOrUpdateSubscription = async(subscription, room) => {
 					blocker: s.blocker,
 					reactWhenReadOnly: s.reactWhenReadOnly,
 					archived: s.archived,
-					joinCodeRequired: s.joinCodeRequired,
 					muted: s.muted,
 					broadcast: s.broadcast,
 					prid: s.prid,
@@ -82,6 +80,7 @@ const createOrUpdateSubscription = async(subscription, room) => {
 					servedBy: s.servedBy,
 					livechatData: s.livechatData,
 					tags: s.tags,
+					joinCodeRequired: s.joinCodeRequired,
 					encrypted: s.encrypted,
 					e2eKeyId: s.e2eKeyId,
 					E2EKey: s.E2EKey
@@ -116,7 +115,8 @@ const createOrUpdateSubscription = async(subscription, room) => {
 					broadcast: r.broadcast,
 					customFields: r.customFields,
 					departmentId: r.departmentId,
-					livechatData: r.livechatData
+					livechatData: r.livechatData,
+					joinCodeRequired: r.joinCodeRequired
 				};
 			} catch (error) {
 				// Do nothing

app/lib/rocketchat.js

@@ -616,13 +616,13 @@ const RocketChat = {
 		});
 	},
 
-	joinRoom(roomId, type) {
+	joinRoom(roomId, joinCode, type) {
 		// TODO: join code
 		// RC 0.48.0
 		if (type === 'p') {
 			return this.methodCallWrapper('joinRoom', roomId);
 		}
-		return this.post('channels.join', { roomId });
+		return this.post('channels.join', { roomId, joinCode });
 	},
 	triggerBlockAction,
 	triggerSubmitView,

app/views/DirectoryView/index.js

@@ -149,8 +149,9 @@ class DirectoryView extends React.Component {
 				this.goRoom({ rid: result.room._id, name: item.username, t: 'd' });
 			}
 		} else {
+			const { room } = await RocketChat.getRoomInfo(item._id);
 			this.goRoom({
-				rid: item._id, name: item.name, t: 'c', search: true
+				rid: item._id, name: item.name, joinCodeRequired: room.joinCodeRequired, t: 'c', search: true
 			});
 		}
 	}

app/views/RoomView/index.js

@@ -56,6 +56,7 @@ import Navigation from '../../lib/Navigation';
 import SafeAreaView from '../../containers/SafeAreaView';
 import { withDimensions } from '../../dimensions';
 import { getHeaderTitlePosition } from '../../containers/Header';
+import TextInput from '../../containers/TextInput';
 import { E2E_MESSAGE_TYPE, E2E_STATUS } from '../../lib/encryption/constants';
 
 import { takeInquiry } from '../../ee/omnichannel/lib';
@@ -73,7 +74,7 @@ const stateAttrsUpdate = [
 	'readOnly',
 	'member'
 ];
-const roomAttrsUpdate = ['f', 'ro', 'blocked', 'blocker', 'archived', 'muted', 'jitsiTimeout', 'announcement', 'sysMes', 'topic', 'name', 'fname', 'roles', 'bannerClosed', 'visitor'];
+const roomAttrsUpdate = ['f', 'ro', 'blocked', 'blocker', 'archived', 'muted', 'jitsiTimeout', 'announcement', 'sysMes', 'topic', 'name', 'fname', 'roles', 'bannerClosed', 'visitor', 'joinCodeRequired'];
 
 class RoomView extends React.Component {
 	static propTypes = {
@@ -115,6 +116,7 @@ class RoomView extends React.Component {
 		const search = props.route.params?.search;
 		const prid = props.route.params?.prid;
 		this.state = {
+			joinCode: '',
 			joined: true,
 			room: room || {
 				rid: this.rid, t: this.t, name, fname, prid
@@ -706,12 +708,12 @@ class RoomView extends React.Component {
 	joinRoom = async() => {
 		logEvent(events.ROOM_JOIN);
 		try {
-			const { room } = this.state;
+			const { room, joinCode } = this.state;
 
 			if (this.isOmnichannel) {
 				await takeInquiry(room._id);
 			} else {
-				await RocketChat.joinRoom(this.rid, this.t);
+				await RocketChat.joinRoom(this.rid, joinCode, this.t);
 			}
 			this.internalSetState({
 				joined: true
@@ -919,14 +921,31 @@ class RoomView extends React.Component {
 			joined, room, selectedMessage, editing, replying, replyWithMention, readOnly
 		} = this.state;
 		const { navigation, theme } = this.props;
+		const { joinCodeRequired } = room;
 
 		if (!this.rid) {
 			return null;
 		}
 		if (!joined && !this.tmid) {
 			return (
 				<View style={styles.joinRoomContainer} key='room-view-join' testID='room-view-join'>
-					<Text accessibilityLabel={I18n.t('You_are_in_preview_mode')} style={[styles.previewMode, { color: themes[theme].titleText }]}>{I18n.t('You_are_in_preview_mode')}</Text>
+					{
+						joinCodeRequired
+							? (
+								<>
+									<Text accessibilityLabel={I18n.t('Insert_Join_Code')} style={[styles.previewMode, { color: themes[theme].titleText }]}>{I18n.t('Insert_Join_Code')}</Text>
+									<TextInput
+										returnKeyType='default'
+										placeholder={I18n.t('Join_Code')}
+										onChangeText={(value) => { this.setState({ joinCode: value }); }}
+										underlineColorAndroid='transparent'
+										containerStyle={styles.joinCodeInput}
+										theme={theme}
+									/>
+								</>
+							)
+							: <Text accessibilityLabel={I18n.t('You_are_in_preview_mode')} style={[styles.previewMode, { color: themes[theme].titleText }]}>{I18n.t('You_are_in_preview_mode')}</Text>
+					}
 					<Touch
 						onPress={this.joinRoom}
 						style={[styles.joinRoomButton, { backgroundColor: themes[theme].actionTintColor }]}

app/views/RoomView/styles.js

@@ -70,5 +70,8 @@ export default StyleSheet.create({
 	previewMode: {
 		fontSize: 16,
 		...sharedStyles.textMedium
+	},
+	joinCodeInput: {
+		padding: 8
 	}
 });