From 06e68a73f8b27f7a5297598cb938ca7ef5ee4d4c Mon Sep 17 00:00:00 2001 From: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:42:10 -0300 Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=20Private=20apps=20restrictions?= =?UTF-8?q?=20are=20not=20applied=20on=20license=20removal=20(#3=E2=80=A6"?= =?UTF-8?q?=20(#33409)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6c43d22c8a2c9edea65d8b23f05884ccbdf9708c. --- .changeset/eighty-items-behave.md | 5 ----- apps/meteor/ee/server/startup/apps/trialExpiration.ts | 9 +++------ 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 .changeset/eighty-items-behave.md diff --git a/.changeset/eighty-items-behave.md b/.changeset/eighty-items-behave.md deleted file mode 100644 index db8bc26e564..00000000000 --- a/.changeset/eighty-items-behave.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Adds missing readjustment to private apps restrictions on license removal diff --git a/apps/meteor/ee/server/startup/apps/trialExpiration.ts b/apps/meteor/ee/server/startup/apps/trialExpiration.ts index 46ccac7ee81..e6bb9e47c74 100644 --- a/apps/meteor/ee/server/startup/apps/trialExpiration.ts +++ b/apps/meteor/ee/server/startup/apps/trialExpiration.ts @@ -1,12 +1,9 @@ import { License } from '@rocket.chat/license'; import { Meteor } from 'meteor/meteor'; -Meteor.startup(async () => { - const { Apps } = await import('../../apps'); - License.onInvalidateLicense(() => { - void Apps.disableApps(); - }); - License.onRemoveLicense(() => { +Meteor.startup(() => { + License.onInvalidateLicense(async () => { + const { Apps } = await import('../../apps'); void Apps.disableApps(); }); });