From 82439159a528eae27216fa3fec2c22f3095649e7 Mon Sep 17 00:00:00 2001
From: Gleidson Daniel Silva <gleidson10daniel@hotmail.com>
Date: Mon, 7 Mar 2022 09:44:11 -0300
Subject: [PATCH] Chore: Migrate REST API - removeUserFromRoom to Typescript
 (#3837)

---
 app/definitions/rest/v1/channels.ts    | 3 +++
 app/definitions/rest/v1/groups.ts      | 3 +++
 app/definitions/rest/v1/im.ts          | 3 +++
 app/lib/rocketchat/services/restApi.ts | 4 +---
 app/views/RoomMembersView/index.tsx    | 4 +++-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/definitions/rest/v1/channels.ts b/app/definitions/rest/v1/channels.ts
index 51a6a8e27..e00ba347f 100644
--- a/app/definitions/rest/v1/channels.ts
+++ b/app/definitions/rest/v1/channels.ts
@@ -52,6 +52,9 @@ export type ChannelsEndpoints = {
 	'channels.convertToTeam': {
 		POST: (params: { channelId: string; channelName: string }) => { team: ITeam };
 	};
+	'channels.kick': {
+		POST: (params: { roomId: string; userId: string }) => {};
+	};
 	'channels.delete': {
 		POST: (params: { roomId: string }) => {};
 	};
diff --git a/app/definitions/rest/v1/groups.ts b/app/definitions/rest/v1/groups.ts
index ba40d2cb3..daf95517b 100644
--- a/app/definitions/rest/v1/groups.ts
+++ b/app/definitions/rest/v1/groups.ts
@@ -46,6 +46,9 @@ export type GroupsEndpoints = {
 	'groups.convertToTeam': {
 		POST: (params: { roomId: string; roomName: string }) => { team: ITeam };
 	};
+	'groups.kick': {
+		POST: (params: { roomId: string; userId: string }) => {};
+	};
 	'groups.delete': {
 		POST: (params: { roomId: string }) => {};
 	};
diff --git a/app/definitions/rest/v1/im.ts b/app/definitions/rest/v1/im.ts
index 5dd3238cf..8888f0baa 100644
--- a/app/definitions/rest/v1/im.ts
+++ b/app/definitions/rest/v1/im.ts
@@ -38,6 +38,9 @@ export type ImEndpoints = {
 			messages: IMessageFromServer[];
 		};
 	};
+	'im.kick': {
+		POST: (params: { roomId: string; userId: string }) => {};
+	};
 	'im.delete': {
 		POST: (params: { roomId: string }) => {};
 	};
diff --git a/app/lib/rocketchat/services/restApi.ts b/app/lib/rocketchat/services/restApi.ts
index 46ad6190d..7dcfc086b 100644
--- a/app/lib/rocketchat/services/restApi.ts
+++ b/app/lib/rocketchat/services/restApi.ts
@@ -514,10 +514,8 @@ export const toggleRoomModerator = ({
 	return sdk.post(`${roomTypeToApiType(t)}.removeModerator`, { roomId, userId });
 };
 
-export const removeUserFromRoom = ({ roomId, t, userId }: { roomId: string; t: SubscriptionType; userId: string }): any =>
+export const removeUserFromRoom = ({ roomId, t, userId }: { roomId: string; t: RoomTypes; userId: string }) =>
 	// RC 0.48.0
-	// TODO: missing definitions from server
-	// @ts-ignore
 	sdk.post(`${roomTypeToApiType(t)}.kick`, { roomId, userId });
 
 export const ignoreUser = ({ rid, userId, ignore }: { rid: string; userId: string; ignore: boolean }): any =>
diff --git a/app/views/RoomMembersView/index.tsx b/app/views/RoomMembersView/index.tsx
index 92d459963..c967515f0 100644
--- a/app/views/RoomMembersView/index.tsx
+++ b/app/views/RoomMembersView/index.tsx
@@ -28,6 +28,7 @@ import { goRoom, TGoRoomItem } from '../../utils/goRoom';
 import { showConfirmationAlert, showErrorAlert } from '../../utils/info';
 import log from '../../utils/log';
 import scrollPersistTaps from '../../utils/scrollPersistTaps';
+import { RoomTypes } from '../../lib/rocketchat/methods/roomTypeToApiType';
 import styles from './styles';
 
 const PAGE_SIZE = 25;
@@ -590,7 +591,8 @@ class RoomMembersView extends React.Component<IRoomMembersViewProps, IRoomMember
 		try {
 			const { room, members, membersFiltered } = this.state;
 			const userId = selectedUser._id;
-			await RocketChat.removeUserFromRoom({ roomId: room.rid, t: room.t, userId });
+			// TODO: interface SubscriptionType on IRoom is wrong
+			await RocketChat.removeUserFromRoom({ roomId: room.rid, t: room.t as RoomTypes, userId });
 			const message = I18n.t('User_has_been_removed_from_s', { s: RocketChat.getRoomTitle(room) });
 			EventEmitter.emit(LISTENER, { message });
 			this.setState({