Merge remote-tracking branch 'origin/develop' into type-indicator

app/apps/server/communication/rest.js

@@ -178,7 +178,7 @@ export class AppsRestApi {
 					const downloadPromise = new Promise((resolve, reject) => {
 						const token = getWorkspaceAccessToken(true, 'marketplace:download', false);
 
-						HTTP.get(`${ baseUrl }/v1/apps/${ this.bodyParams.appId }/download/${ this.bodyParams.version }?token=${ token }`, {
+						HTTP.get(`${ baseUrl }/v2/apps/${ this.bodyParams.appId }/download/${ this.bodyParams.version }?token=${ token }`, {
 							headers,
 							npmRequestOptions: { encoding: null },
 						}, (error, result) => {
@@ -228,17 +228,13 @@ 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'), true, marketplaceInfo));
+				const aff = Promise.await(manager.add(buff, true, marketplaceInfo));
 				const info = aff.getAppInfo();
 
 				if (aff.hasStorageError()) {
 					return API.v1.failure({ status: 'storage_error', messages: [aff.getStorageError()] });
 				}
 
-				if (aff.getCompilerErrors().length) {
-					return API.v1.failure({ status: 'compiler_error', messages: aff.getCompilerErrors() });
-				}
-
 				if (aff.hasAppUserError()) {
 					return API.v1.failure({
 						status: 'app_user_error',
@@ -433,7 +429,7 @@ export class AppsRestApi {
 
 					let result;
 					try {
-						result = HTTP.get(`${ baseUrl }/v1/apps/${ this.bodyParams.appId }/download/${ this.bodyParams.version }`, {
+						result = HTTP.get(`${ baseUrl }/v2/apps/${ this.bodyParams.appId }/download/${ this.bodyParams.version }`, {
 							headers,
 							npmRequestOptions: { encoding: null },
 						});

package.json

@@ -133,7 +133,7 @@
 		"@nivo/heatmap": "^0.61.0",
 		"@nivo/line": "^0.61.1",
 		"@nivo/pie": "^0.61.1",
-		"@rocket.chat/apps-engine": "1.19.0-alpha.3941",
+		"@rocket.chat/apps-engine": "1.19.0-alpha.3984",
 		"@rocket.chat/css-in-js": "^0.17.0",
 		"@rocket.chat/fuselage": "^0.17.0",
 		"@rocket.chat/fuselage-hooks": "^0.17.0",

tests/data/apps/apps-data.js

@@ -1,4 +1,4 @@
-export const APP_URL = 'https://github.com/RocketChat/Apps.RocketChat.Tester/blob/master/dist/appsrocketchattester_0.0.1.zip?raw=true';
+export const APP_URL = 'https://github.com/RocketChat/Apps.RocketChat.Tester/blob/master/dist/appsrocketchattester_0.0.2.zip?raw=true';
 export const APP_NAME = 'Apps.RocketChat.Tester';
 export const APP_USERNAME = 'appsrocketchattester.bot';
 export const apps = (path = '') => `/api/apps${ path }`;