channels.delete

RocketChat · May 9, 2022 · a41e119 · a41e119
1 parent af443ef
commit a41e119
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 28 deletions.
diff --git a/apps/meteor/app/api/server/v1/channels.js b/apps/meteor/app/api/server/v1/channels.js
@@ -267,25 +267,6 @@ API.v1.addRoute(
 	},
 );
 
-API.v1.addRoute(
-	'channels.delete',
-	{ authRequired: true },
-	{
-		post() {
-			const room = findChannelByIdOrName({
-				params: this.requestParams(),
-				checkedArchived: false,
-			});
-
-			Meteor.runAsUser(this.userId, () => {
-				Meteor.call('eraseRoom', room._id);
-			});
-
-			return API.v1.success();
-		},
-	},
-);
-
 API.v1.addRoute(
 	'channels.files',
 	{ authRequired: true },
@@ -419,9 +400,7 @@ API.v1.addRoute(
 				return API.v1.failure('invalid-user-invite-list', 'Cannot invite if no users are provided');
 			}
 
-			Meteor.runAsUser(this.userId, () => {
-				Meteor.call('addUsersToRoom', { rid: findResult._id, users: users.map((u) => u.username) });
-			});
+			Meteor.call('addUsersToRoom', { rid: findResult._id, users: users.map((u) => u.username) });
 
 			return API.v1.success({
 				channel: findChannelByIdOrName({ params: this.requestParams(), userId: this.userId }),

diff --git a/apps/meteor/app/api/server/v1/channels.ts b/apps/meteor/app/api/server/v1/channels.ts
@@ -16,6 +16,7 @@ import {
 	isChannelsModeratorsProps,
 	isChannelsConvertToTeamProps,
 	isChannelsSetReadOnlyProps,
+	isChannelsDeleteProps,
 } from '@rocket.chat/rest-typings';
 
 import { Rooms, Subscriptions, Messages } from '../../../models/server';
@@ -444,6 +445,27 @@ API.v1.addRoute(
 	},
 );
 
+API.v1.addRoute(
+	'channels.delete',
+	{ authRequired: true },
+	{
+		post() {
+			if (!isChannelsDeleteProps(this.bodyParams)) {
+				throw new Meteor.Error('error-invalid-params', isChannelsDeleteProps.errors?.map((error: any) => error.message).join('\n '));
+			}
+			const { roomId } = this.bodyParams;
+			const room = findChannelByIdOrName({
+				params: { roomId },
+				checkedArchived: false,
+			});
+
+			Meteor.call('eraseRoom', room._id);
+
+			return API.v1.success();
+		},
+	},
+);
+
 API.v1.addRoute(
 	'channels.convertToTeam',
 	{ authRequired: true },

diff --git a/packages/rest-typings/src/helpers/PaginatedRequest.ts b/packages/rest-typings/src/helpers/PaginatedRequest.ts
@@ -3,5 +3,5 @@ export type PaginatedRequest<T = {}, S extends string = string> = {
 	offset?: number;
 	sort?: `{ "${S}": ${1 | -1} }` | string;
 	/* deprecated */
-	query: string;
+	query?: string;
 } & T;
diff --git a/packages/rest-typings/src/index.ts b/packages/rest-typings/src/index.ts
@@ -149,6 +149,7 @@ export * from './v1/channels/ChannelsGetAllUserMentionsByChannelProps';
 export * from './v1/channels/ChannelsModeratorsProps';
 export * from './v1/channels/ChannelsConvertToTeamProps';
 export * from './v1/channels/ChannelsSetReadOnlyProps';
+export * from './v1/channels/ChannelsDeleteProps';
 export * from './v1/oauthapps';
 export * from './helpers/PaginatedRequest';
 export * from './helpers/PaginatedResult';

diff --git a/packages/rest-typings/src/v1/channels/ChannelsAddAllProps.ts b/packages/rest-typings/src/v1/channels/ChannelsAddAllProps.ts
@@ -36,7 +36,6 @@ const channelsAddAllPropsSchema = {
 			additionalProperties: false,
 		},
 	],
-	additionalProperties: false,
 };
 
 export const isChannelsAddAllProps = ajv.compile<ChannelsAddAllProps>(channelsAddAllPropsSchema);
diff --git a/packages/rest-typings/src/v1/channels/ChannelsArchiveProps.ts b/packages/rest-typings/src/v1/channels/ChannelsArchiveProps.ts
@@ -26,7 +26,6 @@ const channelsArchivePropsSchema = {
 			additionalProperties: false,
 		},
 	],
-	additionalProperties: false,
 };
 
 export const isChannelsArchiveProps = ajv.compile<ChannelsArchiveProps>(channelsArchivePropsSchema);
diff --git a/packages/rest-typings/src/v1/channels/ChannelsDeleteProps.ts b/packages/rest-typings/src/v1/channels/ChannelsDeleteProps.ts
@@ -0,0 +1,18 @@
+import Ajv from 'ajv';
+
+const ajv = new Ajv();
+
+export type ChannelsDeleteProps = { roomId: string };
+
+const channelsDeletePropsSchema = {
+	type: 'object',
+	properties: {
+		roomId: {
+			type: 'string',
+		},
+	},
+	required: ['roomId'],
+	additionalProperties: false,
+};
+
+export const isChannelsDeleteProps = ajv.compile<ChannelsDeleteProps>(channelsDeletePropsSchema);
diff --git a/packages/rest-typings/src/v1/channels/ChannelsHistoryProps.ts b/packages/rest-typings/src/v1/channels/ChannelsHistoryProps.ts
@@ -48,6 +48,8 @@ const channelsHistoryPropsSchema = {
 			type: 'string',
 		},
 	},
+	required: ['roomId'],
+	additionalProperties: false,
 };
 
 export const isChannelsHistoryProps = ajv.compile<ChannelsHistoryProps>(channelsHistoryPropsSchema);
diff --git a/packages/rest-typings/src/v1/channels/ChannelsRolesProps.ts b/packages/rest-typings/src/v1/channels/ChannelsRolesProps.ts
@@ -26,7 +26,6 @@ const channelsRolesPropsSchema = {
 			additionalProperties: false,
 		},
 	],
-	additionalProperties: false,
 };
 
 export const isChannelsRolesProps = ajv.compile<ChannelsRolesProps>(channelsRolesPropsSchema);
diff --git a/packages/rest-typings/src/v1/channels/ChannelsSetReadOnlyProps.ts b/packages/rest-typings/src/v1/channels/ChannelsSetReadOnlyProps.ts
@@ -11,6 +11,7 @@ const channelsSetReadOnlyPropsSchema = {
 		readOnly: { type: 'boolean' },
 	},
 	required: ['roomId', 'readOnly'],
+	additionalProperties: false,
 };
 
 export const isChannelsSetReadOnlyProps = ajv.compile<ChannelsSetReadOnlyProps>(channelsSetReadOnlyPropsSchema);
diff --git a/packages/rest-typings/src/v1/channels/ChannelsUnarchiveProps.ts b/packages/rest-typings/src/v1/channels/ChannelsUnarchiveProps.ts
@@ -26,7 +26,6 @@ const channelsUnarchivePropsSchema = {
 			additionalProperties: false,
 		},
 	],
-	additionalProperties: false,
 };
 
 export const isChannelsUnarchiveProps = ajv.compile<ChannelsUnarchiveProps>(channelsUnarchivePropsSchema);
diff --git a/packages/rest-typings/src/v1/channels/channels.ts b/packages/rest-typings/src/v1/channels/channels.ts
@@ -85,7 +85,7 @@ export type ChannelsEndpoints = {
 		POST: (params: { roomId: string; userId: string }) => {};
 	};
 	'channels.delete': {
-		POST: (params: { roomId: string }) => {};
+		POST: (params: { roomId: string }) => void;
 	};
 	'channels.leave': {
 		POST: (params: { roomId: string }) => {};