Chore: convert e2e to ts

apps/meteor/app/api/server/v1/e2e.js → apps/meteor/app/api/server/v1/e2e.ts

@@ -1,16 +1,26 @@
+/* eslint-disable @typescript-eslint/camelcase */
 import { Meteor } from 'meteor/meteor';
+import {
+	ise2eGetUsersOfRoomWithoutKeyParamsGET,
+	ise2eSetRoomKeyIDParamsPOST,
+	ise2eSetUserPublicAndPrivateKeysParamsPOST,
+	ise2eUpdateGroupKeyParamsPOST,
+} from '@rocket.chat/rest-typings';
+import { IUser } from '@rocket.chat/core-typings';
 
 import { API } from '../api';
 
 API.v1.addRoute(
 	'e2e.fetchMyKeys',
-	{ authRequired: true },
+	{
+		authRequired: true,
+	},
 	{
 		get() {
-			let result;
-			Meteor.runAsUser(this.userId, () => {
-				result = Meteor.call('e2e.fetchMyKeys');
-			});
+			const result: {
+				public_key: string;
+				private_key: string;
+			} = Meteor.call('e2e.fetchMyKeys');
 
 			return API.v1.success(result);
 		},
@@ -19,15 +29,17 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'e2e.getUsersOfRoomWithoutKey',
-	{ authRequired: true },
+	{
+		authRequired: true,
+		validateParams: ise2eGetUsersOfRoomWithoutKeyParamsGET,
+	},
 	{
 		get() {
 			const { rid } = this.queryParams;
 
-			let result;
-			Meteor.runAsUser(this.userId, () => {
-				result = Meteor.call('e2e.getUsersOfRoomWithoutKey', rid);
-			});
+			const result: {
+				users: IUser[];
+			} = Meteor.call('e2e.getUsersOfRoomWithoutKey', rid);
 
 			return API.v1.success(result);
 		},
@@ -65,16 +77,18 @@ API.v1.addRoute(
  *              schema:
  *                $ref: '#/components/schemas/ApiFailureV1'
  */
+
 API.v1.addRoute(
 	'e2e.setRoomKeyID',
-	{ authRequired: true },
+	{
+		authRequired: true,
+		validateParams: ise2eSetRoomKeyIDParamsPOST,
+	},
 	{
 		post() {
 			const { rid, keyID } = this.bodyParams;
 
-			Meteor.runAsUser(this.userId, () => {
-				API.v1.success(Meteor.call('e2e.setRoomKeyID', rid, keyID));
-			});
+			Meteor.call('e2e.setRoomKeyID', rid, keyID);
 
 			return API.v1.success();
 		},
@@ -114,18 +128,17 @@ API.v1.addRoute(
  */
 API.v1.addRoute(
 	'e2e.setUserPublicAndPrivateKeys',
-	{ authRequired: true },
+	{
+		authRequired: true,
+		validateParams: ise2eSetUserPublicAndPrivateKeysParamsPOST,
+	},
 	{
 		post() {
-			const { public_key, private_key } = this.bodyParams;
-
-			Meteor.runAsUser(this.userId, () => {
-				API.v1.success(
-					Meteor.call('e2e.setUserPublicAndPrivateKeys', {
-						public_key,
-						private_key,
-					}),
-				);
+			const { public_key, private_key } = Meteor.call('e2e.fetchMyKeys');
+
+			Meteor.call('e2e.setUserPublicAndPrivateKeys', {
+				public_key,
+				private_key,
 			});
 
 			return API.v1.success();
@@ -168,14 +181,15 @@ API.v1.addRoute(
  */
 API.v1.addRoute(
 	'e2e.updateGroupKey',
-	{ authRequired: true },
+	{
+		authRequired: true,
+		validateParams: ise2eUpdateGroupKeyParamsPOST,
+	},
 	{
 		post() {
 			const { uid, rid, key } = this.bodyParams;
 
-			Meteor.runAsUser(this.userId, () => {
-				API.v1.success(Meteor.call('e2e.updateGroupKey', rid, uid, key));
-			});
+			Meteor.call('e2e.updateGroupKey', rid, uid, key);
 
 			return API.v1.success();
 		},

apps/meteor/client/sidebar/RoomMenu.tsx

@@ -202,7 +202,7 @@ const RoomMenu = ({ rid, unread, threadUnread, alert, roomOpen, type, cl, name =
 			aria-keyshortcuts='alt'
 			tabIndex={-1}
 			options={menuOptions}
-			renderItem={({ label: { label, icon }, ...props }) => <Option label={label} title={label} icon={icon} {...props} />}
+			renderItem={({ label: { label, icon }, ...props }): JSX.Element => <Option label={label} title={label} icon={icon} {...props} />}
 		/>
 	);
 };

apps/meteor/client/sidebar/search/SearchList.tsx

@@ -45,6 +45,7 @@ const shortcut = ((): string => {
 	return '(\u2303+K)';
 })();
 
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 const useSpotlight = (filterText: string, usernames: string[]) => {
 	const expression = /(@|#)?(.*)/i;
 	const [, mention, name] = filterText.match(expression) || [];

packages/rest-typings/src/index.ts

@@ -185,6 +185,10 @@ export * from './v1/users/UsersSetAvatarParamsPOST';
 export * from './v1/users/UsersSetPreferenceParamsPOST';
 export * from './v1/users/UsersUpdateOwnBasicInfoParamsPOST';
 export * from './v1/users/UsersUpdateParamsPOST';
+export * from './v1/e2e/e2eGetUsersOfRoomWithoutKeyParamsGET';
+export * from './v1/e2e/e2eSetRoomKeyIDParamsPOST';
+export * from './v1/e2e/e2eSetUserPublicAndPrivateKeysParamsPOST';
+export * from './v1/e2e/e2eUpdateGroupKeyParamsPOST';
 export * from './v1/import/UploadImportFileParamsPOST';
 export * from './v1/import/DownloadPublicImportFileParamsPOST';
 export * from './v1/import/StartImportParamsPOST';

packages/rest-typings/src/v1/e2e.ts

@@ -98,10 +98,10 @@ export type E2eEndpoints = {
 		};
 	};
 	'/v1/e2e.updateGroupKey': {
-		POST: (params: E2eUpdateGroupKeyProps) => {};
+		POST: (params: E2eUpdateGroupKeyProps) => void;
 	};
 	'/v1/e2e.setRoomKeyID': {
-		POST: (params: E2eSetRoomKeyIdProps) => {};
+		POST: (params: E2eSetRoomKeyIdProps) => void;
 	};
 	'/v1/e2e.fetchMyKeys': {
 		GET: () => { public_key: string; private_key: string };

packages/rest-typings/src/v1/e2e/e2eGetUsersOfRoomWithoutKeyParamsGET.ts

@@ -0,0 +1,24 @@
+import Ajv from 'ajv';
+
+const ajv = new Ajv({
+	coerceTypes: true,
+});
+
+export type e2eGetUsersOfRoomWithoutKeyParamsGET = {
+	rid: string;
+};
+
+const e2eGetUsersOfRoomWithoutKeyParamsGETSchema = {
+	type: 'object',
+	properties: {
+		rid: {
+			type: 'string',
+		},
+	},
+	additionalProperties: false,
+	required: ['rid'],
+};
+
+export const ise2eGetUsersOfRoomWithoutKeyParamsGET = ajv.compile<e2eGetUsersOfRoomWithoutKeyParamsGET>(
+	e2eGetUsersOfRoomWithoutKeyParamsGETSchema,
+);

packages/rest-typings/src/v1/e2e/e2eSetRoomKeyIDParamsPOST.ts

@@ -0,0 +1,26 @@
+import Ajv from 'ajv';
+
+const ajv = new Ajv({
+	coerceTypes: true,
+});
+
+export type e2eSetRoomKeyIDParamsPOST = {
+	rid: string;
+	keyID: string;
+};
+
+const e2eSetRoomKeyIDParamsPOSTSchema = {
+	type: 'object',
+	properties: {
+		rid: {
+			type: 'string',
+		},
+		keyID: {
+			type: 'string',
+		},
+	},
+	additionalProperties: false,
+	required: ['rid', 'keyID'],
+};
+
+export const ise2eSetRoomKeyIDParamsPOST = ajv.compile<e2eSetRoomKeyIDParamsPOST>(e2eSetRoomKeyIDParamsPOSTSchema);

packages/rest-typings/src/v1/e2e/e2eSetUserPublicAndPrivateKeysParamsPOST.ts

@@ -0,0 +1,29 @@
+/* eslint-disable @typescript-eslint/camelcase */
+import Ajv from 'ajv';
+
+const ajv = new Ajv({
+	coerceTypes: true,
+});
+
+export type e2eSetUserPublicAndPrivateKeysParamsPOST = {
+	public_key: string;
+	private_key: string;
+};
+
+const e2eSetUserPublicAndPrivateKeysParamsPOSTSchema = {
+	type: 'object',
+	properties: {
+		public_key: {
+			type: 'string',
+		},
+		private_key: {
+			type: 'string',
+		},
+	},
+	additionalProperties: false,
+	required: ['public_key', 'private_key'],
+};
+
+export const ise2eSetUserPublicAndPrivateKeysParamsPOST = ajv.compile<e2eSetUserPublicAndPrivateKeysParamsPOST>(
+	e2eSetUserPublicAndPrivateKeysParamsPOSTSchema,
+);

packages/rest-typings/src/v1/e2e/e2eUpdateGroupKeyParamsPOST.ts

@@ -0,0 +1,30 @@
+import Ajv from 'ajv';
+
+const ajv = new Ajv({
+	coerceTypes: true,
+});
+
+export type e2eUpdateGroupKeyParamsPOST = {
+	uid: string;
+	rid: string;
+	key: string;
+};
+
+const e2eUpdateGroupKeyParamsPOSTSchema = {
+	type: 'object',
+	properties: {
+		uid: {
+			type: 'string',
+		},
+		rid: {
+			type: 'string',
+		},
+		key: {
+			type: 'string',
+		},
+	},
+	additionalProperties: false,
+	required: ['uid', 'rid', 'key'],
+};
+
+export const ise2eUpdateGroupKeyParamsPOST = ajv.compile<e2eUpdateGroupKeyParamsPOST>(e2eUpdateGroupKeyParamsPOSTSchema);