Merge remote-tracking branch 'rocket.chat/develop' into HEAD

Author: SeRoNet Concourse

app/2fa/server/functions/resetTOTP.ts

@@ -60,7 +60,7 @@ export async function resetTOTP(userId: string, notifyUser = false): Promise<boo
 	const result = await Users.resetTOTPById(userId);
 
 	if (result?.modifiedCount === 1) {
-		await Users.removeResumeService(userId);
+		await Users.unsetLoginTokens(userId);
 		return true;
 	}
 

app/api/server/helpers/deprecationWarning.js

@@ -0,0 +1,15 @@
+import { API } from '../api';
+import { apiDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
+
+(API as any).helperMethods.set('deprecationWarning', function _deprecationWarning({ endpoint, versionWillBeRemoved, response }: { endpoint: string; versionWillBeRemoved: string; response: any }) {
+	const warningMessage = `The endpoint "${ endpoint }" is deprecated and will be removed after version ${ versionWillBeRemoved }`;
+	apiDeprecationLogger.warn(warningMessage);
+	if (process.env.NODE_ENV === 'development') {
+		return {
+			warning: warningMessage,
+			...response,
+		};
+	}
+
+	return response;
+});

app/api/server/helpers/deprecationWarning.ts

@@ -0,0 +1,13 @@
+import { parse } from 'cookie';
+
+import { API } from '../api';
+
+(API as any).helperMethods.set('isWidget', function _isWidget() {
+	// @ts-expect-error
+	const { headers } = this.request;
+
+	const { rc_room_type: roomType, rc_is_widget: isWidget } = parse(headers.cookie);
+
+	const isLivechatRoom = roomType && roomType === 'l';
+	return !!(isLivechatRoom && isWidget === 't');
+});

app/api/server/helpers/isWidget.ts

@@ -9,6 +9,7 @@ import './helpers/insertUserObject';
 import './helpers/isUserFromParams';
 import './helpers/parseJsonQuery';
 import './helpers/requestParams';
+import './helpers/isWidget';
 import './default/info';
 import './v1/assets';
 import './v1/channels';

app/api/server/index.js

@@ -1,12 +1,13 @@
 import { Promise } from 'meteor/promise';
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
+import { TextObjectType, BlockType } from '@rocket.chat/apps-engine/definition/uikit';
 
 import { API } from '../api';
 import { Banner } from '../../../../server/sdk';
-import { BannerPlatform } from '../../../../definition/IBanner';
+import { BannerPlatform, IBanner } from '../../../../definition/IBanner';
 
-API.v1.addRoute('banners.getNew', { authRequired: true }, {
+API.v1.addRoute('banners.getNew', { authRequired: true }, { // deprecated
 	get() {
 		check(this.queryParams, Match.ObjectIncluding({
 			platform: String,
@@ -22,12 +23,129 @@ API.v1.addRoute('banners.getNew', { authRequired: true }, {
 			throw new Meteor.Error('error-unknown-platform', 'Platform is unknown.');
 		}
 
-		const banners = Promise.await(Banner.getNewBannersForUser(this.userId, platform, bannerId));
+		const banners = Promise.await(Banner.getBannersForUser(this.userId, platform, bannerId));
 
 		return API.v1.success({ banners });
 	},
 });
 
+
+API.v1.addRoute('banners/:id', { authRequired: true }, {
+
+	get() {
+		check(this.urlParams, Match.ObjectIncluding({
+			id: String,
+		}));
+
+		const { platform } = this.queryParams;
+		if (!platform) {
+			throw new Meteor.Error('error-missing-param', 'The required "platform" param is missing.');
+		}
+
+		const { id } = this.urlParams;
+		if (!id) {
+			throw new Meteor.Error('error-missing-param', 'The required "id" param is missing.');
+		}
+
+		const banners = Promise.await(Banner.getBannersForUser(this.userId, platform, id));
+
+		return API.v1.success({ banners });
+	},
+});
+API.v1.addRoute('banners', { authRequired: true }, {
+
+	get() {
+		check(this.queryParams, Match.ObjectIncluding({
+			platform: String,
+		}));
+
+		const { platform } = this.queryParams;
+		if (!platform) {
+			throw new Meteor.Error('error-missing-param', 'The required "platform" param is missing.');
+		}
+
+		if (!Object.values(BannerPlatform).includes(platform)) {
+			throw new Meteor.Error('error-unknown-platform', 'Platform is unknown.');
+		}
+
+		const banners = Promise.await(Banner.getBannersForUser(this.userId, platform));
+
+		return API.v1.success({ banners });
+	},
+	...process.env.NODE_ENV !== 'production' && {
+		post(): {} {
+			check(this.bodyParams, Match.ObjectIncluding({
+				platform: Match.Maybe(String),
+				bid: String,
+			}));
+
+			const { platform = 'web', bid: bannerId } = this.bodyParams;
+
+			if (!platform) {
+				throw new Meteor.Error('error-missing-param', 'The required "platform" param is missing.');
+			}
+
+			if (!Object.values(BannerPlatform).includes(platform)) {
+				throw new Meteor.Error('error-unknown-platform', 'Platform is unknown.');
+			}
+			const b: IBanner = {
+				_id: bannerId,
+				platform: [platform],
+				expireAt: new Date(new Date().getTime() + (1000 * 60 * 60 * 24 * 7)),
+				startAt: new Date(),
+				roles: ['admin'],
+				createdBy: {
+					_id: this.userId,
+					username: this.userId,
+				},
+				createdAt: new Date(),
+				_updatedAt: new Date(),
+				view: {
+					viewId: '',
+					appId: '',
+					blocks: [{
+						type: BlockType.SECTION,
+						blockId: 'attention',
+						text: {
+							type: TextObjectType.PLAINTEXT,
+							text: 'Test',
+							emoji: false,
+						},
+					}],
+				},
+			};
+
+			const banners = Promise.await(Banner.create(b));
+
+			return API.v1.success({ banners });
+		},
+		delete(): {} {
+			check(this.bodyParams, Match.ObjectIncluding({
+				bid: String,
+			}));
+
+			const { bid } = this.bodyParams;
+
+			Promise.await(Banner.disable(bid));
+
+			return API.v1.success();
+		},
+
+		patch(): {} {
+			check(this.bodyParams, Match.ObjectIncluding({
+				bid: String,
+			}));
+
+			const { bid } = this.bodyParams;
+
+			Promise.await(Banner.enable(bid));
+
+			return API.v1.success();
+		},
+	},
+});
+
+
 API.v1.addRoute('banners.dismiss', { authRequired: true }, {
 	post() {
 		check(this.bodyParams, Match.ObjectIncluding({

app/api/server/v1/banners.ts

@@ -925,7 +925,7 @@ API.v1.addRoute('users.logout', { authRequired: true }, {
 		}
 
 		// this method logs the user out automatically, if successful returns 1, otherwise 0
-		if (!Users.removeResumeService(userId)) {
+		if (!Users.unsetLoginTokens(userId)) {
 			throw new Meteor.Error('error-invalid-user-id', 'Invalid user id');
 		}
 

app/api/server/v1/users.js

@@ -19,6 +19,7 @@ import {
 	LivechatRooms,
 } from '../../../models/server';
 import { AppServerOrchestrator } from '../orchestrator';
+import { OmnichannelSourceType } from '../../../../definition/IRoom';
 
 export class AppLivechatBridge extends LivechatBridge {
 	// eslint-disable-next-line no-empty-function
@@ -45,7 +46,13 @@ export class AppLivechatBridge extends LivechatBridge {
 			guest: this.orch.getConverters()?.get('visitors').convertAppVisitor(message.visitor),
 			message: this.orch.getConverters()?.get('messages').convertAppMessage(message),
 			agent: undefined,
-			roomInfo: undefined,
+			roomInfo: {
+				source: {
+					type: OmnichannelSourceType.APP,
+					id: appId,
+					alias: this.orch.getManager()?.getOneById(appId)?.getNameSlug(),
+				},
+			},
 		});
 
 		return msg._id;
@@ -81,7 +88,13 @@ export class AppLivechatBridge extends LivechatBridge {
 			guest: this.orch.getConverters()?.get('visitors').convertAppVisitor(visitor),
 			agent: agentRoom,
 			rid: Random.id(),
-			roomInfo: undefined,
+			roomInfo: {
+				source: {
+					type: OmnichannelSourceType.APP,
+					id: appId,
+					alias: this.orch.getManager()?.getOneById(appId)?.getNameSlug(),
+				},
+			},
 			extraParams: undefined,
 		});
 
@@ -167,10 +180,22 @@ export class AppLivechatBridge extends LivechatBridge {
 			type,
 		};
 
+		let userId;
+		let transferredTo;
+
+		if (targetAgent?.id) {
+			transferredTo = Users.findOneAgentById(targetAgent.id, { fields: { _id: 1, username: 1, name: 1 } });
+			if (!transferredTo) {
+				throw new Error('Invalid target agent, cannot transfer');
+			}
+
+			userId = transferredTo._id;
+		}
+
 		return Livechat.transfer(
 			this.orch.getConverters()?.get('rooms').convertAppRoom(currentRoom),
 			this.orch.getConverters()?.get('visitors').convertAppVisitor(visitor),
-			{ userId: targetAgent ? targetAgent.id : undefined, departmentId, transferredBy },
+			{ userId, departmentId, transferredBy, transferredTo },
 		);
 	}
 

app/apps/server/bridges/livechat.ts

@@ -12,18 +12,25 @@ import { AppMessagesConverter, AppRoomsConverter, AppSettingsConverter, AppUsers
 import { AppDepartmentsConverter } from './converters/departments';
 import { AppUploadsConverter } from './converters/uploads';
 import { AppVisitorsConverter } from './converters/visitors';
-import { AppRealLogsStorage, AppRealStorage } from './storage';
+import { AppRealLogsStorage, AppRealStorage, ConfigurableAppSourceStorage } from './storage';
 
 function isTesting() {
 	return process.env.TEST_MODE === 'true';
 }
 
+let appsSourceStorageType;
+let appsSourceStorageFilesystemPath;
+
 export class AppServerOrchestrator {
 	constructor() {
 		this._isInitialized = false;
 	}
 
 	initialize() {
+		if (this._isInitialized) {
+			return;
+		}
+
 		this._rocketchatLogger = new Logger('Rocket.Chat Apps');
 		Permissions.create('manage-apps', ['admin']);
 
@@ -38,6 +45,7 @@ export class AppServerOrchestrator {
 		this._persistModel = new AppsPersistenceModel();
 		this._storage = new AppRealStorage(this._model);
 		this._logStorage = new AppRealLogsStorage(this._logModel);
+		this._appSourceStorage = new ConfigurableAppSourceStorage(appsSourceStorageType, appsSourceStorageFilesystemPath);
 
 		this._converters = new Map();
 		this._converters.set('messages', new AppMessagesConverter(this));
@@ -50,7 +58,12 @@ export class AppServerOrchestrator {
 
 		this._bridges = new RealAppBridges(this);
 
-		this._manager = new AppManager(this._storage, this._logStorage, this._bridges);
+		this._manager = new AppManager({
+			metadataStorage: this._storage,
+			logStorage: this._logStorage,
+			bridges: this._bridges,
+			sourceStorage: this._appSourceStorage,
+		});
 
 		this._communicators = new Map();
 		this._communicators.set('methods', new AppMethods(this));
@@ -97,6 +110,10 @@ export class AppServerOrchestrator {
 		return this._manager.getExternalComponentManager().getProvidedComponents();
 	}
 
+	getAppSourceStorage() {
+		return this._appSourceStorage;
+	}
+
 	isInitialized() {
 		return this._isInitialized;
 	}
@@ -215,9 +232,48 @@ settings.addGroup('General', function() {
 			public: true,
 			hidden: false,
 		});
+
+		this.add('Apps_Framework_Source_Package_Storage_Type', 'gridfs', {
+			type: 'select',
+			values: [{
+				key: 'gridfs',
+				i18nLabel: 'GridFS',
+			}, {
+				key: 'filesystem',
+				i18nLabel: 'FileSystem',
+			}],
+			public: true,
+			hidden: false,
+			alert: 'Apps_Framework_Source_Package_Storage_Type_Alert',
+		});
+
+		this.add('Apps_Framework_Source_Package_Storage_FileSystem_Path', '', {
+			type: 'string',
+			public: true,
+			enableQuery: {
+				_id: 'Apps_Framework_Source_Package_Storage_Type',
+				value: 'filesystem',
+			},
+			alert: 'Apps_Framework_Source_Package_Storage_FileSystem_Alert',
+		});
 	});
 });
 
+settings.get('Apps_Framework_Source_Package_Storage_Type', (_, value) => {
+	if (!Apps.isInitialized()) {
+		appsSourceStorageType = value;
+	} else {
+		Apps.getAppSourceStorage().setStorage(value);
+	}
+});
+
+settings.get('Apps_Framework_Source_Package_Storage_FileSystem_Path', (_, value) => {
+	if (!Apps.isInitialized()) {
+		appsSourceStorageFilesystemPath = value;
+	} else {
+		Apps.getAppSourceStorage().setFileSystemStoragePath(value);
+	}
+});
 
 settings.get('Apps_Framework_enabled', (key, isEnabled) => {
 	// In case this gets called before `Meteor.startup`