fix: Changing the app's error verification (#28450)

Co-authored-by: Douglas Gubert <1810309+d-gubert@users.noreply.github.com>
pull/28568/head
Allan RIbeiro 3 years ago committed by Douglas Gubert
parent 715ca5da3f
commit 99edebf0ec
  1. 2
      apps/meteor/app/file-upload/server/lib/FileUpload.js
  2. 6
      apps/meteor/app/lib/server/functions/addUserToRoom.ts
  3. 2
      apps/meteor/app/lib/server/functions/createDirectRoom.ts
  4. 2
      apps/meteor/app/lib/server/functions/createRoom.ts
  5. 4
      apps/meteor/app/lib/server/functions/removeUserFromRoom.ts
  6. 2
      apps/meteor/package.json
  7. 10
      yarn.lock

@ -114,7 +114,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);
}

@ -41,8 +41,8 @@ export const addUserToRoom = function (
try {
Promise.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);
}
@ -59,7 +59,7 @@ export const addUserToRoom = function (
Promise.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);
}

@ -91,7 +91,7 @@ export const createDirectRoom = function (
const prevent = Promise.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);
}

@ -88,7 +88,7 @@ export const createRoom = function <T extends RoomType>(
const prevent = Promise.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);
}

@ -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);
}

@ -211,7 +211,7 @@
"@react-pdf/renderer": "^3.1.3",
"@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/cas-validate": "workspace:^",
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",

@ -6530,9 +6530,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
@ -6544,7 +6544,7 @@ __metadata:
vm2: ^3.9.11
peerDependencies:
"@rocket.chat/ui-kit": "*"
checksum: 8fb1318b411844f319ec9307917e471ceaafa49ba4479633c69417ce5351168c6743631bcba88939c0d63c79f19a71045313ff656e2afe4d8abb40edad3d8a1c
checksum: 21304a821f68d4d9cc08e9236e60a884e4928fe78ad258f07402afa66da2d03ca870188ca941cedb14bff6223d7bccf745ac858410a987804bd076a94a273bd9
languageName: node
linkType: hard
@ -7266,7 +7266,7 @@ __metadata:
"@react-pdf/renderer": ^3.1.3
"@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/cas-validate": "workspace:^"
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"

Loading…
Cancel
Save