Regression: File upload via apps not working in some scenarios

app/apps/server/bridges/uploads.js

@@ -30,20 +30,40 @@ export class AppUploadBridge {
 		});
 	}
 
-	createUpload(details, buffer, appId) {
+	async createUpload(details, buffer, appId) {
 		this.orch.debugLog(`The App ${ appId } is creating an upload "${ details.name }"`);
 
-		details.type = determineFileType(buffer, details);
+		if (!details.userId && !details.visitorToken) {
+			throw new Error('Missing user to perform the upload operation');
+		}
+
+		if (details.visitorToken) {
+			delete details.userId;
+		}
 
 		const fileStore = FileUpload.getStore('Uploads');
-		const uploadedFile = fileStore.insertSync(details, buffer);
+		const insertSync = details.userId
+			? (...args) => Meteor.runAsUser(details.userId, () => fileStore.insertSync(...args))
+			: Meteor.wrapAsync(fileStore.insert.bind(fileStore));
 
-		if (details.userId) {
-			Meteor.runAsUser(details.userId, () => {
-				Meteor.call('sendFileMessage', details.rid, null, uploadedFile);
-			});
-		}
+		details.type = determineFileType(buffer, details);
+
+		return new Promise(Meteor.bindEnvironment((resolve, reject) => {
+			try {
+				const uploadedFile = insertSync(details, buffer);
+
+				if (details.visitorToken) {
+					Meteor.call('sendFileLivechatMessage', details.rid, details.visitorToken, uploadedFile);
+				} else {
+					Meteor.runAsUser(details.userId, () => {
+						Meteor.call('sendFileMessage', details.rid, null, uploadedFile);
+					});
+				}
 
-		return this.orch.getConverters().get('uploads').convertToApp(uploadedFile);
+				resolve(this.orch.getConverters().get('uploads').convertToApp(uploadedFile));
+			} catch (err) {
+				reject(err);
+			}
+		}));
 	}
 }

app/file-upload/server/lib/FileUpload.js

@@ -66,7 +66,7 @@ export const FileUpload = {
 		const room = Rooms.findOneById(file.rid);
 		const directMessageAllowed = settings.get('FileUpload_Enabled_Direct');
 		const fileUploadAllowed = settings.get('FileUpload_Enabled');
-		if (user.type !== 'app' && canAccessRoom(room, user, file) !== true) {
+		if (user?.type !== 'app' && canAccessRoom(room, user, file) !== true) {
 			return false;
 		}
 		const language = user ? user.language : 'en';

app/file-upload/server/methods/sendFileMessage.js

@@ -4,18 +4,21 @@ import { Random } from 'meteor/random';
 import _ from 'underscore';
 
 import { Uploads } from '../../../models';
+import { Rooms } from '../../../models/server/raw';
 import { callbacks } from '../../../callbacks';
 import { FileUpload } from '../lib/FileUpload';
+import { canAccessRoom } from '../../../authorization/server/functions/canAccessRoom';
 
 Meteor.methods({
 	async sendFileMessage(roomId, store, file, msgData = {}) {
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'sendFileMessage' });
 		}
 
-		const room = Meteor.call('canAccessRoom', roomId, Meteor.userId());
+		const room = await Rooms.findOneById(roomId);
+		const user = Meteor.user();
 
-		if (!room) {
+		if (user?.type !== 'app' && canAccessRoom(room, user) !== true) {
 			return false;
 		}
 
@@ -65,7 +68,6 @@ Meteor.methods({
 			attachment.video_size = file.size;
 		}
 
-		const user = Meteor.user();
 		let msg = Object.assign({
 			_id: Random.id(),
 			rid: roomId,

package.json

@@ -130,7 +130,7 @@
 		"@nivo/heatmap": "^0.61.0",
 		"@nivo/line": "^0.61.1",
 		"@nivo/pie": "^0.61.1",
-		"@rocket.chat/apps-engine": "1.18.0-beta.3861",
+		"@rocket.chat/apps-engine": "1.18.0-beta.3873",
 		"@rocket.chat/css-in-js": "^0.14.1",
 		"@rocket.chat/fuselage": "^0.14.1",
 		"@rocket.chat/fuselage-hooks": "^0.14.1",