[BREAK] Marketplace standalone page and app request flow

apps/meteor/app/apps/server/bridges/activation.ts

@@ -3,7 +3,7 @@ import type { ProxiedApp } from '@rocket.chat/apps-engine/server/ProxiedApp';
 import type { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
 import { Users } from '@rocket.chat/models';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
 export class AppActivationBridge extends ActivationBridge {
 	// eslint-disable-next-line no-empty-function

apps/meteor/app/apps/server/bridges/api.ts

@@ -7,7 +7,7 @@ import type { IApiRequest, IApiEndpoint, IApi } from '@rocket.chat/apps-engine/d
 import type { AppApi } from '@rocket.chat/apps-engine/server/managers/AppApi';
 import type { RequestMethod } from '@rocket.chat/apps-engine/definition/accessors';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 import { authenticationMiddleware } from '../../../api/server/middlewares/authentication';
 
 const apiServer = express();
@@ -55,7 +55,7 @@ export class AppApisBridge extends ApiBridge {
 		});
 	}
 
-	public registerApi({ api, computedPath, endpoint }: AppApi, appId: string): void {
+	public async registerApi({ api, computedPath, endpoint }: AppApi, appId: string): Promise<void> {
 		this.orch.debugLog(`The App ${appId} is registering the api: "${endpoint.path}" (${computedPath})`);
 
 		this._verifyApi(api, endpoint);
@@ -79,7 +79,7 @@ export class AppApisBridge extends ApiBridge {
 		}
 	}
 
-	public unregisterApis(appId: string): void {
+	public async unregisterApis(appId: string): Promise<void> {
 		this.orch.debugLog(`The App ${appId} is unregistering all apis`);
 
 		if (this.appRouters.get(appId)) {

apps/meteor/app/apps/server/bridges/bridges.js

@@ -20,6 +20,7 @@ import { UiInteractionBridge } from './uiInteraction';
 import { AppSchedulerBridge } from './scheduler';
 import { AppVideoConferenceBridge } from './videoConferences';
 import { AppOAuthAppsBridge } from './oauthApps';
+import { AppInternalFederationBridge } from './internalFederation';
 
 export class RealAppBridges extends AppBridges {
 	constructor(orch) {
@@ -45,6 +46,7 @@ export class RealAppBridges extends AppBridges {
 		this._cloudWorkspaceBridge = new AppCloudBridge(orch);
 		this._videoConfBridge = new AppVideoConferenceBridge(orch);
 		this._oAuthBridge = new AppOAuthAppsBridge(orch);
+		this._internalFedBridge = new AppInternalFederationBridge(orch);
 	}
 
 	getCommandBridge() {
@@ -126,4 +128,8 @@ export class RealAppBridges extends AppBridges {
 	getOAuthAppsBridge() {
 		return this._oAuthBridge;
 	}
+
+	getInternalFederationBridge() {
+		return this._internalFedBridge;
+	}
 }

apps/meteor/app/apps/server/bridges/cloud.ts

@@ -3,7 +3,7 @@ import { CloudWorkspaceBridge } from '@rocket.chat/apps-engine/server/bridges/Cl
 import type { IWorkspaceToken } from '@rocket.chat/apps-engine/definition/cloud/IWorkspaceToken';
 
 import { getWorkspaceAccessTokenWithScope } from '../../../cloud/server';
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
 const boundGetWorkspaceAccessToken = Meteor.bindEnvironment(getWorkspaceAccessTokenWithScope);
 

apps/meteor/app/apps/server/bridges/commands.ts

@@ -5,8 +5,8 @@ import { CommandBridge } from '@rocket.chat/apps-engine/server/bridges/CommandBr
 import type { IMessage, RequiredField, SlashCommand } from '@rocket.chat/core-typings';
 
 import { slashCommands } from '../../../utils/server';
-import { Utilities } from '../../lib/misc/Utilities';
-import type { AppServerOrchestrator } from '../orchestrator';
+import { Utilities } from '../../../../ee/lib/misc/Utilities';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 import { parseParameters } from '../../../../lib/utils/parseParameters';
 
 export class AppCommandsBridge extends CommandBridge {
@@ -18,7 +18,7 @@ export class AppCommandsBridge extends CommandBridge {
 		this.disabledCommands = new Map();
 	}
 
-	protected doesCommandExist(command: string, appId: string): boolean {
+	protected async doesCommandExist(command: string, appId: string): Promise<boolean> {
 		this.orch.debugLog(`The App ${appId} is checking if "${command}" command exists.`);
 
 		if (typeof command !== 'string' || command.length === 0) {
@@ -30,7 +30,7 @@ export class AppCommandsBridge extends CommandBridge {
 		return typeof slashCommands.commands[cmd] === 'object' || this.disabledCommands.has(cmd);
 	}
 
-	protected enableCommand(command: string, appId: string): void {
+	protected async enableCommand(command: string, appId: string): Promise<void> {
 		this.orch.debugLog(`The App ${appId} is attempting to enable the command: "${command}"`);
 
 		if (typeof command !== 'string' || command.trim().length === 0) {
@@ -48,7 +48,7 @@ export class AppCommandsBridge extends CommandBridge {
 		this.orch.getNotifier().commandUpdated(cmd);
 	}
 
-	protected disableCommand(command: string, appId: string): void {
+	protected async disableCommand(command: string, appId: string): Promise<void> {
 		this.orch.debugLog(`The App ${appId} is attempting to disable the command: "${command}"`);
 
 		if (typeof command !== 'string' || command.trim().length === 0) {
@@ -74,7 +74,7 @@ export class AppCommandsBridge extends CommandBridge {
 	}
 
 	// command: { command, paramsExample, i18nDescription, executor: function }
-	protected modifyCommand(command: ISlashCommand, appId: string): void {
+	protected async modifyCommand(command: ISlashCommand, appId: string): Promise<void> {
 		this.orch.debugLog(`The App ${appId} is attempting to modify the command: "${command}"`);
 
 		this._verifyCommand(command);
@@ -99,7 +99,7 @@ export class AppCommandsBridge extends CommandBridge {
 		this.orch.getNotifier().commandUpdated(cmd);
 	}
 
-	protected registerCommand(command: ISlashCommand, appId: string): void {
+	protected async registerCommand(command: ISlashCommand, appId: string): Promise<void> {
 		this.orch.debugLog(`The App ${appId} is registering the command: "${command.command}"`);
 
 		this._verifyCommand(command);
@@ -122,7 +122,7 @@ export class AppCommandsBridge extends CommandBridge {
 		this.orch.getNotifier().commandAdded(command.command.toLowerCase());
 	}
 
-	protected unregisterCommand(command: string, appId: string): void {
+	protected async unregisterCommand(command: string, appId: string): Promise<void> {
 		this.orch.debugLog(`The App ${appId} is unregistering the command: "${command}"`);
 
 		if (typeof command !== 'string' || command.trim().length === 0) {

apps/meteor/app/apps/server/bridges/details.ts

@@ -1,7 +1,7 @@
 import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
 import { AppDetailChangesBridge as DetailChangesBridge } from '@rocket.chat/apps-engine/server/bridges/AppDetailChangesBridge';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
 export class AppDetailChangesBridge extends DetailChangesBridge {
 	// eslint-disable-next-line no-empty-function

apps/meteor/app/apps/server/bridges/environmental.ts

@@ -1,6 +1,6 @@
 import { EnvironmentalVariableBridge } from '@rocket.chat/apps-engine/server/bridges/EnvironmentalVariableBridge';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
 export class AppEnvironmentalVariableBridge extends EnvironmentalVariableBridge {
 	allowed: Array<string>;

apps/meteor/app/apps/server/bridges/http.ts

@@ -2,7 +2,7 @@ import { HttpBridge } from '@rocket.chat/apps-engine/server/bridges/HttpBridge';
 import type { IHttpResponse } from '@rocket.chat/apps-engine/definition/accessors';
 import type { IHttpBridgeRequestInfo } from '@rocket.chat/apps-engine/server/bridges';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 import { fetch } from '../../../../server/lib/http/fetch';
 
 const isGetOrHead = (method: string): boolean => ['GET', 'HEAD'].includes(method.toUpperCase());

apps/meteor/app/apps/server/bridges/internal.ts

@@ -3,7 +3,7 @@ import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
 import type { ISubscription } from '@rocket.chat/core-typings';
 import { Settings } from '@rocket.chat/models';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 import { Subscriptions } from '../../../models/server';
 
 export class AppInternalBridge extends InternalBridge {

apps/meteor/app/apps/server/bridges/internalFederation.ts

@@ -0,0 +1,12 @@
+import type { IInternalFederationBridge } from '@rocket.chat/apps-engine/server/bridges/IInternalFederationBridge';
+import { FederationKeys } from '@rocket.chat/models';
+
+export class AppInternalFederationBridge implements IInternalFederationBridge {
+	async getPrivateKey(): Promise<string | null> {
+		return FederationKeys.getKey('private');
+	}
+
+	async getPublicKey(): Promise<string | null> {
+		return FederationKeys.getKey('public');
+	}
+}

apps/meteor/app/apps/server/bridges/livechat.ts

@@ -16,7 +16,7 @@ import { LivechatVisitors } from '@rocket.chat/models';
 import { getRoom } from '../../../livechat/server/api/lib/livechat';
 import { Livechat } from '../../../livechat/server/lib/Livechat';
 import { Users, LivechatDepartment, LivechatRooms } from '../../../models/server';
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 import { Livechat as LivechatTyped } from '../../../livechat/server/lib/LivechatTyped';
 
 export class AppLivechatBridge extends LivechatBridge {

apps/meteor/app/apps/server/bridges/messages.ts

@@ -10,7 +10,7 @@ import { Messages, Users, Subscriptions } from '../../../models/server';
 import { updateMessage } from '../../../lib/server/functions/updateMessage';
 import { executeSendMessage } from '../../../lib/server/methods/sendMessage';
 import notifications from '../../../notifications/server/lib/Notifications';
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
 export class AppMessageBridge extends MessageBridge {
 	// eslint-disable-next-line no-empty-function

apps/meteor/app/apps/server/bridges/oauthApps.ts

@@ -5,7 +5,7 @@ import { OAuthApps, Users } from '@rocket.chat/models';
 import { Random } from 'meteor/random';
 import { v4 as uuidv4 } from 'uuid';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
 export class AppOAuthAppsBridge extends OAuthAppsBridge {
 	constructor(private readonly orch: AppServerOrchestrator) {

apps/meteor/app/apps/server/bridges/persistence.ts

@@ -1,7 +1,7 @@
 import { PersistenceBridge } from '@rocket.chat/apps-engine/server/bridges/PersistenceBridge';
 import type { RocketChatAssociationRecord } from '@rocket.chat/apps-engine/definition/metadata';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
 export class AppPersistenceBridge extends PersistenceBridge {
 	// eslint-disable-next-line no-empty-function

apps/meteor/app/apps/server/bridges/rooms.ts

@@ -6,7 +6,7 @@ import type { IMessage } from '@rocket.chat/apps-engine/definition/messages';
 import { Meteor } from 'meteor/meteor';
 import type { ISubscription, IUser as ICoreUser } from '@rocket.chat/core-typings';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 import { Rooms, Subscriptions, Users } from '../../../models/server';
 import { addUserToRoom } from '../../../lib/server/functions/addUserToRoom';
 

apps/meteor/app/apps/server/bridges/scheduler.ts

@@ -6,7 +6,7 @@ import type { IProcessor, IOnetimeSchedule, IRecurringSchedule, IJobContext } fr
 import { StartupType } from '@rocket.chat/apps-engine/definition/scheduler';
 import { SchedulerBridge } from '@rocket.chat/apps-engine/server/bridges/SchedulerBridge';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
 function _callProcessor(processor: IProcessor['processor']): (job: Job) => Promise<void> {
 	return (job) => {

apps/meteor/app/apps/server/bridges/settings.ts

@@ -2,7 +2,7 @@ import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
 import { ServerSettingBridge } from '@rocket.chat/apps-engine/server/bridges/ServerSettingBridge';
 import { Settings } from '@rocket.chat/models';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
 export class AppSettingBridge extends ServerSettingBridge {
 	// eslint-disable-next-line no-empty-function

apps/meteor/app/apps/server/bridges/uiInteraction.ts

@@ -3,7 +3,7 @@ import type { IUIKitInteraction } from '@rocket.chat/apps-engine/definition/uiki
 import type { IUser } from '@rocket.chat/apps-engine/definition/users';
 import { api } from '@rocket.chat/core-services';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
 export class UiInteractionBridge extends UiIntBridge {
 	// eslint-disable-next-line no-empty-function

apps/meteor/app/apps/server/bridges/uploads.ts

@@ -4,8 +4,8 @@ import type { IUpload } from '@rocket.chat/apps-engine/definition/uploads';
 import type { IUploadDetails } from '@rocket.chat/apps-engine/definition/uploads/IUploadDetails';
 
 import { FileUpload } from '../../../file-upload/server';
-import { determineFileType } from '../../lib/misc/determineFileType';
-import type { AppServerOrchestrator } from '../orchestrator';
+import { determineFileType } from '../../../../ee/lib/misc/determineFileType';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
 const getUploadDetails = (details: IUploadDetails): Partial<IUploadDetails> => {
 	if (details.visitorToken) {

apps/meteor/app/apps/server/bridges/users.ts

@@ -5,7 +5,7 @@ import { Subscriptions, Users as UsersRaw } from '@rocket.chat/models';
 
 import { setUserAvatar, checkUsernameAvailability, deleteUser, getUserCreatedByApp } from '../../../lib/server/functions';
 import { Users } from '../../../models/server';
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
 export class AppUserBridge extends UserBridge {
 	// eslint-disable-next-line no-empty-function

apps/meteor/app/apps/server/bridges/videoConferences.ts

@@ -3,7 +3,7 @@ import type { AppVideoConference, VideoConference } from '@rocket.chat/apps-engi
 import type { IVideoConfProvider } from '@rocket.chat/apps-engine/definition/videoConfProviders';
 import { VideoConf } from '@rocket.chat/core-services';
 
-import type { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 import { videoConfProviders } from '../../../../server/lib/videoConfProviders';
 import type { AppVideoConferencesConverter } from '../converters/videoConferences';
 

apps/meteor/app/apps/server/converters/departments.js

@@ -1,5 +1,5 @@
 import LivechatDepartment from '../../../models/server/models/LivechatDepartment';
-import { transformMappedData } from '../../lib/misc/transformMappedData';
+import { transformMappedData } from '../../../../ee/lib/misc/transformMappedData';
 
 export class AppDepartmentsConverter {
 	constructor(orch) {