[FIX] Error when re-installing an App (#17789)

* Fix wrong method call on app installation * Update subscription check to take cancelled state into account
RocketChat · Jun 10, 2020 · af7b42d · af7b42d
1 parent aedce8c
commit af7b42d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/apps/client/admin/appManage.js b/app/apps/client/admin/appManage.js
@@ -405,7 +405,8 @@ Template.appManage.events({
 		_app.set('working', true);
 
 		try {
-			const { status } = await Apps.updateApp(appId, _app.get('marketplaceVersion'));
+			const method = _app.get('installed') ? 'updateApp' : 'installApp';
+			const { status } = await Apps[method](appId, _app.get('marketplaceVersion'));
 			warnStatusChange(_app.get('name'), status);
 		} catch (error) {
 			handleAPIError(error);

diff --git a/app/apps/client/admin/helpers.js b/app/apps/client/admin/helpers.js
@@ -19,6 +19,11 @@ const appErroredStatuses = [
 	AppStatus.INVALID_LICENSE_DISABLED,
 ];
 
+const subscriptionActiveStatuses = [
+	'trialing',
+	'active',
+];
+
 export const handleAPIError = (error) => {
 	console.error(error);
 	const message = (error.xhr && error.xhr.responseJSON && error.xhr.responseJSON.error) || error.message;
@@ -298,7 +303,7 @@ export const appButtonProps = ({
 		};
 	}
 
-	const canTrial = purchaseType === 'subscription' && !subscriptionInfo.status;
+	const canTrial = purchaseType === 'subscription' && !subscriptionActiveStatuses.includes(subscriptionInfo.status);
 	if (canTrial) {
 		return {
 			action: 'purchase',