regression: Disable marketplace apps on license removal or downgrade (#33628)

apps/meteor/ee/server/apps/orchestrator.js

@@ -204,6 +204,12 @@ export class AppServerOrchestrator {
 		await Promise.all(apps.map((app) => this.getNotifier().appUpdated(app.getID())));
 	}
 
+	async disableMarketplaceApps() {
+		const apps = await this.getManager().get({ installationSource: 'marketplace' });
+
+		await Promise.all(apps.map((app) => this.getManager().disable(app.getID())));
+	}
+
 	async unload() {
 		// Don't try to unload it if it's already been
 		// unlaoded or wasn't unloaded to start with

apps/meteor/ee/server/startup/apps/trialExpiration.ts

@@ -4,12 +4,13 @@ import { Meteor } from 'meteor/meteor';
 import { Apps } from '../../apps';
 
 Meteor.startup(async () => {
-	const migratePrivateAppsCallback = async () => {
+	const updateAppsCallback = async () => {
 		if (!Apps.isInitialized) return;
 
 		void Apps.migratePrivateApps();
+		void Apps.disableMarketplaceApps();
 	};
 
-	License.onInvalidateLicense(migratePrivateAppsCallback);
-	License.onRemoveLicense(migratePrivateAppsCallback);
+	License.onInvalidateLicense(updateAppsCallback);
+	License.onRemoveLicense(updateAppsCallback);
 });