From bd4c71900d8f700d16f7b35af83797f6ea0d5dc3 Mon Sep 17 00:00:00 2001 From: Allan RIbeiro <35040806+AllanPazRibeiro@users.noreply.github.com> Date: Wed, 22 Mar 2023 18:32:44 -0300 Subject: [PATCH] fix: Changing the app's error verification (#28450) Co-authored-by: Douglas Gubert <1810309+d-gubert@users.noreply.github.com> --- apps/meteor/app/file-upload/server/lib/FileUpload.js | 2 +- .../meteor/app/lib/server/functions/addUserToRoom.ts | 6 +++--- .../app/lib/server/functions/createDirectRoom.ts | 2 +- apps/meteor/app/lib/server/functions/createRoom.ts | 2 +- .../app/lib/server/functions/removeUserFromRoom.ts | 4 ++-- apps/meteor/package.json | 2 +- yarn.lock | 12 ++++++------ 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/meteor/app/file-upload/server/lib/FileUpload.js b/apps/meteor/app/file-upload/server/lib/FileUpload.js index 4d068aef951..afaa29c7aa5 100644 --- a/apps/meteor/app/file-upload/server/lib/FileUpload.js +++ b/apps/meteor/app/file-upload/server/lib/FileUpload.js @@ -115,7 +115,7 @@ export const FileUpload = { try { Promise.await(Apps.triggerEvent(AppEvents.IPreFileUpload, { file, content })); } catch (error) { - if (error instanceof AppsEngineException) { + if (error.name === AppsEngineException.name) { throw new Meteor.Error('error-app-prevented', error.message); } diff --git a/apps/meteor/app/lib/server/functions/addUserToRoom.ts b/apps/meteor/app/lib/server/functions/addUserToRoom.ts index 447f3874096..e95e74a98a6 100644 --- a/apps/meteor/app/lib/server/functions/addUserToRoom.ts +++ b/apps/meteor/app/lib/server/functions/addUserToRoom.ts @@ -41,8 +41,8 @@ export const addUserToRoom = async function ( try { await Apps.triggerEvent(AppEvents.IPreRoomUserJoined, room, userToBeAdded, inviter); - } catch (error) { - if (error instanceof AppsEngineException) { + } catch (error: any) { + if (error.name === AppsEngineException.name) { throw new Meteor.Error('error-app-prevented', error.message); } @@ -58,7 +58,7 @@ export const addUserToRoom = async function ( } await Apps.triggerEvent(AppEvents.IPreRoomUserJoined, room, userToBeAdded, inviter).catch((error) => { - if (error instanceof AppsEngineException) { + if (error.name === AppsEngineException.name) { throw new Meteor.Error('error-app-prevented', error.message); } diff --git a/apps/meteor/app/lib/server/functions/createDirectRoom.ts b/apps/meteor/app/lib/server/functions/createDirectRoom.ts index d3471d54ea4..0782f143366 100644 --- a/apps/meteor/app/lib/server/functions/createDirectRoom.ts +++ b/apps/meteor/app/lib/server/functions/createDirectRoom.ts @@ -94,7 +94,7 @@ export async function createDirectRoom( }; const prevent = await Apps.triggerEvent('IPreRoomCreatePrevent', tmpRoom).catch((error) => { - if (error instanceof AppsEngineException) { + if (error.name === AppsEngineException.name) { throw new Meteor.Error('error-app-prevented', error.message); } diff --git a/apps/meteor/app/lib/server/functions/createRoom.ts b/apps/meteor/app/lib/server/functions/createRoom.ts index 0ceb4c16998..1dbe3c4d7c0 100644 --- a/apps/meteor/app/lib/server/functions/createRoom.ts +++ b/apps/meteor/app/lib/server/functions/createRoom.ts @@ -93,7 +93,7 @@ export const createRoom = async ( }; const prevent = await Apps.triggerEvent('IPreRoomCreatePrevent', tmp).catch((error) => { - if (error instanceof AppsEngineException) { + if (error.name === AppsEngineException.name) { throw new Meteor.Error('error-app-prevented', error.message); } diff --git a/apps/meteor/app/lib/server/functions/removeUserFromRoom.ts b/apps/meteor/app/lib/server/functions/removeUserFromRoom.ts index 7bdf20e3f9a..ca30503b826 100644 --- a/apps/meteor/app/lib/server/functions/removeUserFromRoom.ts +++ b/apps/meteor/app/lib/server/functions/removeUserFromRoom.ts @@ -21,8 +21,8 @@ export const removeUserFromRoom = async function ( try { await Apps.triggerEvent(AppEvents.IPreRoomUserLeave, room, user); - } catch (error) { - if (error instanceof AppsEngineException) { + } catch (error: any) { + if (error.name === AppsEngineException.name) { throw new Meteor.Error('error-app-prevented', error.message); } diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 81949fb5066..75e91bc9510 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -213,7 +213,7 @@ "@rocket.chat/account-utils": "workspace:^", "@rocket.chat/agenda": "workspace:^", "@rocket.chat/api-client": "workspace:^", - "@rocket.chat/apps-engine": "1.37.0-alpha.164", + "@rocket.chat/apps-engine": "1.37.1", "@rocket.chat/base64": "workspace:^", "@rocket.chat/cas-validate": "workspace:^", "@rocket.chat/core-services": "workspace:^", diff --git a/yarn.lock b/yarn.lock index 0ef1b027cc4..ce90de6c631 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6542,9 +6542,9 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/apps-engine@npm:1.37.0-alpha.164": - version: 1.37.0-alpha.164 - resolution: "@rocket.chat/apps-engine@npm:1.37.0-alpha.164" +"@rocket.chat/apps-engine@npm:1.37.1": + version: 1.37.1 + resolution: "@rocket.chat/apps-engine@npm:1.37.1" dependencies: adm-zip: ^0.5.9 cryptiles: ^4.1.3 @@ -6556,7 +6556,7 @@ __metadata: vm2: ^3.9.11 peerDependencies: "@rocket.chat/ui-kit": "*" - checksum: 8fb1318b411844f319ec9307917e471ceaafa49ba4479633c69417ce5351168c6743631bcba88939c0d63c79f19a71045313ff656e2afe4d8abb40edad3d8a1c + checksum: 21304a821f68d4d9cc08e9236e60a884e4928fe78ad258f07402afa66da2d03ca870188ca941cedb14bff6223d7bccf745ac858410a987804bd076a94a273bd9 languageName: node linkType: hard @@ -7296,7 +7296,7 @@ __metadata: "@rocket.chat/account-utils": "workspace:^" "@rocket.chat/agenda": "workspace:^" "@rocket.chat/api-client": "workspace:^" - "@rocket.chat/apps-engine": 1.37.0-alpha.164 + "@rocket.chat/apps-engine": 1.37.1 "@rocket.chat/base64": "workspace:^" "@rocket.chat/cas-validate": "workspace:^" "@rocket.chat/core-services": "workspace:^" @@ -26485,7 +26485,7 @@ __metadata: resolution: "lamejs@https://github.com/zhuker/lamejs.git#commit=582bbba6a12f981b984d8fb9e1874499fed85675" dependencies: use-strict: 1.0.1 - checksum: fa829e0c170a65573e653b4d908a44aaf06a50e1bbade3b1217a300a03ccd59a537e294e2d924a584f9d70c7726a12d4c3af9c675436d48d08be5fb94b5eb400 + checksum: ed7f6f1c9629b53c17023eb04b4fc5a222e9c34fcb4a2f61214488fc64e5cfea825e4588d959c5fb20f3a91f0120103fa60307dd43df995d498ff5ddb6200cd9 languageName: node linkType: hard