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

app/i18n/locales/en.js

@@ -267,6 +267,7 @@ export default {
 	Invite_Link: 'Invite Link',
 	Invite_users: 'Invite users',
 	Join: 'Join',
+	Join_Code: '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

@@ -255,6 +255,7 @@ export default {
 	Invite_Link: 'Link de Convite',
 	Invite_users: 'Convidar usuários',
 	Join: 'Entrar',
+	Join_Code: 'Insira o Código da 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

@@ -109,4 +109,6 @@ export default class Subscription extends Model {
 	@json('livechat_data', sanitizer) livechatData;
 
 	@json('tags', sanitizer) tags;
+
+	@field('join_code') joinCode;
 }

app/lib/database/model/migrations.js

@@ -129,6 +129,17 @@ export default schemaMigrations({
 					]
 				})
 			]
+		},
+		{
+			toVersion: 10,
+			steps: [
+				addColumns({
+					table: 'subscriptions',
+					columns: [
+						{ name: 'join_code', type: 'string', isOptional: false }
+					]
+				})
+			]
 		}
 	]
 });

app/lib/database/schema/app.js

@@ -1,7 +1,7 @@
 import { appSchema, tableSchema } from '@nozbe/watermelondb';
 
 export default appSchema({
-	version: 9,
+	version: 10,
 	tables: [
 		tableSchema({
 			name: 'subscriptions',
@@ -49,7 +49,8 @@ export default appSchema({
 				{ name: 'department_id', type: 'string', isOptional: true },
 				{ name: 'served_by', type: 'string', isOptional: true },
 				{ name: 'livechat_data', type: 'string', isOptional: true },
-				{ name: 'tags', type: 'string', isOptional: true }
+				{ name: 'tags', type: 'string', isOptional: true },
+				{ name: 'join_code', type: 'string', isOptional: false }
 			]
 		}),
 		tableSchema({

app/lib/methods/helpers/findSubscriptionsRooms.js

@@ -49,7 +49,8 @@ export default async(subscriptions = [], rooms = []) => {
 			departmentId: s.departmentId,
 			servedBy: s.servedBy,
 			livechatData: s.livechatData,
-			tags: s.tags
+			tags: s.tags,
+			joinCode: s.joinCode
 		}));
 		subscriptions = subscriptions.concat(existingSubs);
 

app/lib/methods/subscriptions/rooms.js

@@ -32,7 +32,7 @@ const createOrUpdateSubscription = async(subscription, room) => {
 		const db = database.active;
 		const subCollection = db.collections.get('subscriptions');
 		const roomsCollection = db.collections.get('rooms');
-
+		subscription.joinCodeRequired = room.joinCodeRequired;
 		if (!subscription) {
 			try {
 				const s = await subCollection.find(room._id);
@@ -79,7 +79,8 @@ const createOrUpdateSubscription = async(subscription, room) => {
 					departmentId: s.departmentId,
 					servedBy: s.servedBy,
 					livechatData: s.livechatData,
-					tags: s.tags
+					tags: s.tags,
+					joinCode: s.joinCode
 				};
 			} catch (error) {
 				try {

app/lib/rocketchat.js

@@ -597,13 +597,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/RoomView/index.js

@@ -55,7 +55,7 @@ import Navigation from '../../lib/Navigation';
 import SafeAreaView from '../../containers/SafeAreaView';
 import { withDimensions } from '../../dimensions';
 import { getHeaderTitlePosition } from '../../containers/Header';
-
+import TextInput from '../../presentation/TextInput';
 import { takeInquiry } from '../../ee/omnichannel/lib';
 
 const stateAttrsUpdate = [
@@ -113,6 +113,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
@@ -688,12 +689,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
@@ -907,6 +908,14 @@ class RoomView extends React.Component {
 			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>
+					<TextInput
+						returnKeyType='default'
+						placeholder={I18n.t('Join_Code')}
+						onChangeText={(value) => { this.setState({ joinCode: value }); }}
+						underlineColorAndroid='transparent'
+						style={[styles.joinInput, { borderColor: theme === 'light' ? 'black' : 'white' }]}
+						theme={theme}
+					/>
 					<Touch
 						onPress={this.joinRoom}
 						style={[styles.joinRoomButton, { backgroundColor: themes[theme].actionTintColor }]}

app/views/RoomView/styles.js

@@ -70,5 +70,11 @@ export default StyleSheet.create({
 	previewMode: {
 		fontSize: 16,
 		...sharedStyles.textMedium
+	},
+	joinInput: {
+		marginTop: 10,
+		borderWidth: 2,
+		width: '90%',
+		textAlign: 'center'
 	}
 });