NEW: Apps enable after install (#15202)

* Add auto enable after install * Change status text for apps in INVALID_SETTINGS_DISABLED state * Prevent errors when Apps are disabled
RocketChat · Aug 20, 2019 · 429b1ee · 429b1ee
1 parent adcc398
commit 429b1ee
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/app/apps/client/admin/helpers.js b/app/apps/client/admin/helpers.js
@@ -335,7 +335,7 @@ export const appStatusSpanProps = ({
 		return {
 			type: 'failed',
 			icon: 'warning',
-			label: 'Failed',
+			label: status === AppStatus.INVALID_SETTINGS_DISABLED ? 'Config Needed' : 'Failed',
 		};
 	}
 

diff --git a/app/apps/server/communication/rest.js b/app/apps/server/communication/rest.js
@@ -227,7 +227,7 @@ export class AppsRestApi {
 					return API.v1.failure({ error: 'Failed to get a file to install for the App. ' });
 				}
 
-				const aff = Promise.await(manager.add(buff.toString('base64'), false, marketplaceInfo));
+				const aff = Promise.await(manager.add(buff.toString('base64'), true, marketplaceInfo));
 				const info = aff.getAppInfo();
 
 				if (aff.hasStorageError()) {

diff --git a/app/apps/server/cron.js b/app/apps/server/cron.js
@@ -10,10 +10,14 @@ import { Settings, Users, Roles } from '../../models/server';
 
 
 const notifyAdminsAboutInvalidApps = Meteor.bindEnvironment(function _notifyAdminsAboutInvalidApps(apps) {
+	if (!apps) {
+		return;
+	}
+
 	const hasInvalidApps = !!apps.find((app) => app.getLatestLicenseValidationResult().hasErrors);
 
 	if (!hasInvalidApps) {
-		return apps;
+		return;
 	}
 
 	const id = 'someAppInInvalidState';
@@ -50,6 +54,10 @@ const notifyAdminsAboutInvalidApps = Meteor.bindEnvironment(function _notifyAdmi
 });
 
 const notifyAdminsAboutRenewedApps = Meteor.bindEnvironment(function _notifyAdminsAboutRenewedApps(apps) {
+	if (!apps) {
+		return;
+	}
+
 	const renewedApps = apps.filter((app) => app.getStatus() === AppStatus.DISABLED && app.getPreviousStatus() === AppStatus.INVALID_LICENSE_DISABLED);
 
 	if (renewedApps.length === 0) {