Skip to content

chore: reorganize backend folder structure — Phase 6 (lib, hooks, feature code) #41315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sampaiodiego merged 10 commits into from
Jul 14, 2026
+1,495 −1,240
Merged

chore: reorganize backend folder structure — Phase 6 (lib, hooks, feature code) #41315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7a03866
chore: move auth providers to server/lib/auth-providers (Phase 6a)
sampaiodiego Jul 10, 2026
159959e
chore: move hooks to server/hooks (Phase 6b)
sampaiodiego Jul 10, 2026
04f79fd
chore: move notification and messaging libraries to server/lib (Phase…
sampaiodiego Jul 10, 2026
a10209f
chore: move media, import, search and remaining libraries to server/l…
sampaiodiego Jul 10, 2026
3956417
chore: move EE feature libs to ee/server/lib (Phase 6 EE mirror)
sampaiodiego Jul 10, 2026
3f78f41
chore: move linkedin and meteor-developer oauth providers to server/l…
sampaiodiego Jul 10, 2026
4b864ee
chore: fix stale test mocks and move file-upload ufs adapters (Phase …
sampaiodiego Jul 10, 2026
031daaf
chore: fix empty error message in check-broken-imports root-file scan
sampaiodiego Jul 11, 2026
125ee0b
remove not used addRoleRestrictions
sampaiodiego Jul 11, 2026
c6f1e22
chore: move clearIntegrationHistory function introduced by rebase to …
sampaiodiego Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 6 additions & 4 deletions apps/meteor/.mocharc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@ module.exports = {
'tests/unit/lib/**/*.tests.ts',
'server/routes/avatar/**/*.spec.ts',
'tests/unit/lib/**/*.spec.ts',
'tests/unit/server/**/*.tests.js',
'tests/unit/server/**/*.tests.ts',
'tests/unit/server/**/*.spec.ts',
'app/2fa/server/**/*.spec.ts',
'server/lib/2fa/**/*.spec.ts',
'server/api/lib/**/*.spec.ts',
'app/file-upload/server/**/*.spec.ts',
'app/statistics/server/**/*.spec.ts',
'server/lib/media/**/*.spec.ts',
'server/lib/statistics/**/*.spec.ts',
'server/meteor-methods/**/*.spec.ts',
'app/livechat/server/lib/**/*.spec.ts',
'app/push/server/**/*.spec.ts',
'server/lib/notifications/push/**/*.spec.ts',
'app/utils/server/**/*.spec.ts',
],
};
2 changes: 0 additions & 2 deletions apps/meteor/app/2fa/server/index.ts
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions apps/meteor/app/apple/server/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/cloud.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import { CloudWorkspaceBridge } from '@rocket.chat/apps/dist/server/bridges/CloudWorkspaceBridge';
import type { IWorkspaceToken } from '@rocket.chat/apps-engine/definition/cloud/IWorkspaceToken';

import { getWorkspaceAccessTokenWithScope } from '../../../cloud/server';
import { getWorkspaceAccessTokenWithScope } from '../../../../server/lib/cloud';

export class AppCloudBridge extends CloudWorkspaceBridge {
constructor(private readonly orch: IAppServerOrchestrator) {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/email.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import { EmailBridge } from '@rocket.chat/apps/dist/server/bridges/EmailBridge';
import type { IEmail } from '@rocket.chat/apps-engine/definition/email';

import * as Mailer from '../../../mailer/server/api';
import * as Mailer from '../../../../server/lib/notifications/email/api';
import { settings } from '../../../settings/server';

export class AppEmailBridge extends EmailBridge {
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/apps/server/bridges/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import { Users, Subscriptions } from '@rocket.chat/models';

import { deleteMessage } from '../../../../server/lib/messages/deleteMessage';
import { updateMessage } from '../../../../server/lib/messages/updateMessage';
import { executeSetReaction } from '../../../../server/lib/messaging/reactions/setReaction';
import notifications from '../../../../server/lib/notifications/core/lib/Notifications';
import { executeSendMessage } from '../../../../server/meteor-methods/messages/sendMessage';
import notifications from '../../../notifications/server/lib/Notifications';
import { executeSetReaction } from '../../../reactions/server/setReaction';

export class AppMessageBridge extends MessageBridge {
constructor(private readonly orch: IAppServerOrchestrator) {
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/apps/server/bridges/uploads.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import type { IUpload } from '@rocket.chat/apps-engine/definition/uploads';
import type { IUploadDetails } from '@rocket.chat/apps-engine/definition/uploads/IUploadDetails';

import { determineFileType } from '../../../../ee/lib/misc/determineFileType';
import { FileUpload } from '../../../../server/lib/media/file-upload';
import { sendFileMessage } from '../../../../server/meteor-methods/messages/sendFileMessage';
import { sendFileLivechatMessage } from '../../../../server/meteor-methods/omnichannel/sendFileLivechatMessage';
import { FileUpload } from '../../../file-upload/server';
import { sendFileMessage } from '../../../file-upload/server/methods/sendFileMessage';

const getUploadDetails = (details: IUploadDetails): Partial<IUploadDetails> => {
if (details.visitorToken) {
Expand Down
2 changes: 0 additions & 2 deletions apps/meteor/app/authentication/server/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions apps/meteor/app/crowd/server/index.ts
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions apps/meteor/app/custom-sounds/server/index.ts
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions apps/meteor/app/discussion/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/dolphin/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/drupal/server/index.ts
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions apps/meteor/app/emoji-custom/server/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions apps/meteor/app/emoji-native/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/emoji/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/github-enterprise/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/github/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/gitlab/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/iframe-login/server/index.ts
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions apps/meteor/app/integrations/server/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/meteor/app/invites/server/functions/sendInvitationEmail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { check } from 'meteor/check';
import { Meteor } from 'meteor/meteor';

import { hasPermissionAsync } from '../../../../server/lib/authorization/hasPermission';
import * as Mailer from '../../../../server/lib/notifications/email/api';
import { notifyOnSettingChanged } from '../../../lib/server/lib/notifyListener';
import * as Mailer from '../../../mailer/server/api';
import { settings } from '../../../settings/server';

let html = '';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/lib/server/functions/notifications/desktop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { api } from '@rocket.chat/core-services';
import type { IMessage, IRoom, IUser, AtLeast } from '@rocket.chat/core-typings';

import { metrics } from '../../../../../server/lib/metrics';
import { roomCoordinator } from '../../../../../server/lib/rooms/roomCoordinator';
import { metrics } from '../../../../metrics/server';
import { settings } from '../../../../settings/server';

/**
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/lib/server/functions/notifications/email.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { Meteor } from 'meteor/meteor';
import { ltrim } from '../../../../../lib/utils/stringUtils';
import { callbacks } from '../../../../../server/lib/callbacks';
import { i18n } from '../../../../../server/lib/i18n';
import { metrics } from '../../../../../server/lib/metrics';
import * as Mailer from '../../../../../server/lib/notifications/email/api';
import { roomCoordinator } from '../../../../../server/lib/rooms/roomCoordinator';
import * as Mailer from '../../../../mailer/server/api';
import { metrics } from '../../../../metrics/server';
import { settings } from '../../../../settings/server';
import { getURL } from '../../../../utils/server/getURL';

Expand Down
10 changes: 5 additions & 5 deletions apps/meteor/app/lib/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import '../lib/MessageTypes';
import './lib/bugsnag';
import './lib/debug';
import './lib/loginErrorMessageOverride';
import './oauth/oauth';
import './oauth/facebook';
import './oauth/google';
import './oauth/proxy';
import './oauth/twitter';
import '../../../server/lib/auth-providers/oauth/oauth';
import '../../../server/lib/auth-providers/oauth/facebook';
import '../../../server/lib/auth-providers/oauth/google';
import '../../../server/lib/auth-providers/oauth/proxy';
import '../../../server/lib/auth-providers/oauth/twitter';
import './startup/mentionUserNotInChannel';

export * from './lib';
2 changes: 1 addition & 1 deletion apps/meteor/app/lib/server/lib/debug.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { WebApp } from 'meteor/webapp';
import _ from 'underscore';

import { getMethodArgs } from '../../../../server/lib/logger/logPayloads';
import { metrics } from '../../../../server/lib/metrics';
import { getModifiedHttpHeaders } from '../../../../server/lib/shared/getModifiedHttpHeaders';
import { metrics } from '../../../metrics/server';
import { settings } from '../../../settings/server';

const logger = new Logger('Meteor');
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/lib/server/lib/deprecationWarningLogger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Logger } from '@rocket.chat/logger';
import type { PathPattern } from '@rocket.chat/rest-typings';
import semver from 'semver';

import { metrics } from '../../../metrics/server/lib/metrics';
import { metrics } from '../../../../server/lib/metrics/lib/metrics';

const deprecationLogger = new Logger('DeprecationWarning');

Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/lib/server/lib/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
library files.
*/
import './afterUserActions';
import './notifyUsersOnMessage';
import '../../../../server/hooks/messages/notifyUsersOnMessage';

export { sendNotification } from './sendNotificationsOnMessage';
export { sendNotification } from '../../../../server/hooks/messages/sendNotificationsOnMessage';
export { passwordPolicy } from './passwordPolicy';
export { validateEmailDomain } from './validateEmailDomain';
export { RateLimiterClass as RateLimiter } from './RateLimiter';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/lib/server/lib/msgStream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import notifications from '../../../notifications/server/lib/Notifications';
import notifications from '../../../../server/lib/notifications/core/lib/Notifications';

export const msgStream = notifications.streamRoomMessage;
2 changes: 1 addition & 1 deletion apps/meteor/app/lib/server/lib/processDirectEmail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import moment from 'moment';

import { hasPermissionAsync } from '../../../../server/lib/authorization/hasPermission';
import { sendMessage } from '../../../../server/lib/messages/sendMessage';
import { metrics } from '../../../../server/lib/metrics';
import { canAccessRoomAsync } from '../../../authorization/server';
import { metrics } from '../../../metrics/server';
import { settings } from '../../../settings/server';

const isParsedEmail = (email: ParsedMail): email is Required<ParsedMail> => 'date' in email && 'html' in email;
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/lib/server/startup/rateLimiter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { RateLimiter } from 'meteor/rate-limit';
import _ from 'underscore';

import { sleep } from '../../../../lib/utils/sleep';
import { metrics } from '../../../metrics/server';
import { metrics } from '../../../../server/lib/metrics';
import { settings } from '../../../settings/server';

const logger = new Logger('RateLimiter');
Expand Down
1 change: 0 additions & 1 deletion apps/meteor/app/linkedin/server/index.ts
View file
Open in desktop

This file was deleted.

28 changes: 14 additions & 14 deletions apps/meteor/app/livechat/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import './livechat';
import './startup';
import './hooks/leadCapture';
import './hooks/markRoomResponded';
import './hooks/offlineMessage';
import './hooks/offlineMessageToChannel';
import './hooks/saveAnalyticsData';
import './hooks/sendToCRM';
import './hooks/processRoomAbandonment';
import './hooks/saveLastVisitorMessageTs';
import './hooks/markRoomNotResponded';
import './hooks/sendEmailTranscriptOnClose';
import './hooks/saveLastMessageToInquiry';
import './hooks/afterUserActions';
import './hooks/afterAgentRemoved';
import './hooks/afterSaveOmnichannelMessage';
import '../../../server/hooks/omnichannel/leadCapture';
import '../../../server/hooks/omnichannel/markRoomResponded';
import '../../../server/hooks/omnichannel/offlineMessage';
import '../../../server/hooks/omnichannel/offlineMessageToChannel';
import '../../../server/hooks/omnichannel/saveAnalyticsData';
import '../../../server/hooks/omnichannel/sendToCRM';
import '../../../server/hooks/omnichannel/processRoomAbandonment';
import '../../../server/hooks/omnichannel/saveLastVisitorMessageTs';
import '../../../server/hooks/omnichannel/markRoomNotResponded';
import '../../../server/hooks/omnichannel/sendEmailTranscriptOnClose';
import '../../../server/hooks/omnichannel/saveLastMessageToInquiry';
import '../../../server/hooks/omnichannel/afterUserActions';
import '../../../server/hooks/omnichannel/afterAgentRemoved';
import '../../../server/hooks/omnichannel/afterSaveOmnichannelMessage';
import './lib/QueueManager';
import './lib/RoutingManager';
import './lib/routing/External';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/livechat/server/lib/guests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { livechatLogger } from './logger';
import { trim } from '../../../../lib/utils/stringUtils';
import { hasPermissionAsync } from '../../../../server/lib/authorization/hasPermission';
import { i18n } from '../../../../server/lib/i18n';
import { FileUpload } from '../../../file-upload/server';
import { FileUpload } from '../../../../server/lib/media/file-upload';
import {
notifyOnSubscriptionChanged,
notifyOnLivechatInquiryChanged,
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/livechat/server/lib/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import { LivechatContacts, LivechatDepartmentAgents, LivechatVisitors, Users } f
import { makeFunction } from '@rocket.chat/patch-injection';

import { setUserStatusLivechat } from './utils';
import { sendToCRM } from '../../../../server/hooks/omnichannel/sendToCRM';
import { callbacks } from '../../../../server/lib/callbacks';
import { notifyOnLivechatDepartmentAgentChangedByDepartmentId } from '../../../lib/server/lib/notifyListener';
import { settings } from '../../../settings/server';
import { sendToCRM } from '../hooks/sendToCRM';

export async function afterAgentUserActivated(user: IUser) {
if (!user.roles.includes('livechat-agent')) {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/livechat/server/lib/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { callbacks } from '../../../../server/lib/callbacks';
import { deleteMessage as deleteMessageFunc } from '../../../../server/lib/messages/deleteMessage';
import { sendMessage as sendMessageFunc } from '../../../../server/lib/messages/sendMessage';
import { updateMessage as updateMessageFunc } from '../../../../server/lib/messages/updateMessage';
import * as Mailer from '../../../mailer/server/api';
import * as Mailer from '../../../../server/lib/notifications/email/api';
import { settings } from '../../../settings/server';

const dnsResolveMx = util.promisify(dns.resolveMx);
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/livechat/server/lib/sendTranscript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import moment from 'moment-timezone';

import { callbacks } from '../../../../server/lib/callbacks';
import { i18n } from '../../../../server/lib/i18n';
import { FileUpload } from '../../../file-upload/server';
import * as Mailer from '../../../mailer/server/api';
import { FileUpload } from '../../../../server/lib/media/file-upload';
import * as Mailer from '../../../../server/lib/notifications/email/api';
import { settings } from '../../../settings/server';
import { getTimezone } from '../../../utils/server/lib/getTimezone';

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/livechat/server/lib/webhooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { serverFetch as fetch } from '@rocket.chat/server-fetch';
import type { Response } from '@rocket.chat/server-fetch';

import { webhooksLogger } from './logger';
import { metrics } from '../../../metrics/server';
import { metrics } from '../../../../server/lib/metrics';
import { settings } from '../../../settings/server';

const isRetryable = (status: number): boolean => status >= 500 || status === 429;
Expand Down
2 changes: 0 additions & 2 deletions apps/meteor/app/mentions/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/message-mark-as-unread/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/message-pin/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/message-star/server/index.ts
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions apps/meteor/app/meteor-accounts-saml/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/meteor-developer/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/reactions/server/index.ts
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions apps/meteor/app/search/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/threads/server/hooks/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/threads/server/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/token-login/server/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/meteor/app/utils/server/functions/normalizeMessageFileUpload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IMessage } from '@rocket.chat/core-typings';
import { Uploads } from '@rocket.chat/models';

import { FileUpload } from '../../../file-upload/server';
import { FileUpload } from '../../../../server/lib/media/file-upload';
import { getURL } from '../getURL';

export const normalizeMessageFileUpload = async (message: Omit<IMessage, '_updatedAt'>): Promise<Omit<IMessage, '_updatedAt'>> => {
Expand Down
1 change: 0 additions & 1 deletion apps/meteor/app/wordpress/server/index.ts
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions apps/meteor/ee/app/authorization/lib/addRoleRestrictions.ts
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions apps/meteor/ee/app/authorization/server/index.ts
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions apps/meteor/ee/app/canned-responses/server/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions apps/meteor/ee/app/license/server/index.ts
View file
Open in desktop

This file was deleted.

Loading
Loading