From 82bc1bbf7bda857232734b108d285475b5912b01 Mon Sep 17 00:00:00 2001 From: Tasso Date: Tue, 14 Oct 2025 15:10:25 -0300 Subject: [PATCH 01/12] Move desktop injection --- apps/meteor/client/main.ts | 1 - .../client/{startup => meteor/overrides}/desktopInjection.ts | 4 ++-- apps/meteor/client/meteor/overrides/index.ts | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) rename apps/meteor/client/{startup => meteor/overrides}/desktopInjection.ts (89%) diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index 7edd934d5264d..ec0bfd17937eb 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -1,6 +1,5 @@ import './serviceWorker'; import './startup/accounts'; -import './startup/desktopInjection'; import('@rocket.chat/fuselage-polyfills') .then(() => import('./meteor/overrides')) diff --git a/apps/meteor/client/startup/desktopInjection.ts b/apps/meteor/client/meteor/overrides/desktopInjection.ts similarity index 89% rename from apps/meteor/client/startup/desktopInjection.ts rename to apps/meteor/client/meteor/overrides/desktopInjection.ts index f3d20b525e92f..9f835424c7644 100644 --- a/apps/meteor/client/startup/desktopInjection.ts +++ b/apps/meteor/client/meteor/overrides/desktopInjection.ts @@ -1,5 +1,5 @@ -import { watch } from '../meteor/watch'; -import { PublicSettings } from '../stores'; +import { PublicSettings } from '../../stores'; +import { watch } from '../watch'; if (window.RocketChatDesktop) { // backport of rocketchat:user-presence for the desktop app diff --git a/apps/meteor/client/meteor/overrides/index.ts b/apps/meteor/client/meteor/overrides/index.ts index 83ff25324adcf..b94ae0138c197 100644 --- a/apps/meteor/client/meteor/overrides/index.ts +++ b/apps/meteor/client/meteor/overrides/index.ts @@ -15,3 +15,4 @@ import './login/password'; import './login/saml'; import './login/twitter'; import './settings'; +import './desktopInjection'; From 8911c0d7e60974fc57785d2b2aa7919de8acc73b Mon Sep 17 00:00:00 2001 From: Tasso Date: Tue, 14 Oct 2025 16:29:24 -0300 Subject: [PATCH 02/12] Move Meteor startup module --- apps/meteor/client/main.ts | 2 +- apps/meteor/client/{ => meteor}/startup/accounts.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename apps/meteor/client/{ => meteor}/startup/accounts.ts (84%) diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index ec0bfd17937eb..5d09da31a5941 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -1,5 +1,5 @@ import './serviceWorker'; -import './startup/accounts'; +import './meteor/startup/accounts'; import('@rocket.chat/fuselage-polyfills') .then(() => import('./meteor/overrides')) diff --git a/apps/meteor/client/startup/accounts.ts b/apps/meteor/client/meteor/startup/accounts.ts similarity index 84% rename from apps/meteor/client/startup/accounts.ts rename to apps/meteor/client/meteor/startup/accounts.ts index d61734864823d..3fbb07686fcd9 100644 --- a/apps/meteor/client/startup/accounts.ts +++ b/apps/meteor/client/meteor/startup/accounts.ts @@ -1,12 +1,12 @@ import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; -import { sdk } from '../../app/utils/client/lib/SDKClient'; -import { t } from '../../app/utils/lib/i18n'; -import { PublicSettingsCachedStore, SubscriptionsCachedStore } from '../cachedStores'; -import { dispatchToastMessage } from '../lib/toast'; -import { userIdStore } from '../lib/user'; -import { useUserDataSyncReady } from '../lib/userData'; +import { sdk } from '../../../app/utils/client/lib/SDKClient'; +import { t } from '../../../app/utils/lib/i18n'; +import { PublicSettingsCachedStore, SubscriptionsCachedStore } from '../../cachedStores'; +import { dispatchToastMessage } from '../../lib/toast'; +import { userIdStore } from '../../lib/user'; +import { useUserDataSyncReady } from '../../lib/userData'; const whenMainReady = (): Promise => { const isMainReady = (): boolean => { From feff763be5d0b50ee5c59b94a8549ac229752f9a Mon Sep 17 00:00:00 2001 From: Tasso Date: Tue, 14 Oct 2025 17:13:37 -0300 Subject: [PATCH 03/12] Move another startup module --- apps/meteor/client/main.ts | 1 + apps/meteor/client/{ => meteor}/startup/absoluteUrl.ts | 2 +- apps/meteor/client/startup/index.ts | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) rename apps/meteor/client/{ => meteor}/startup/absoluteUrl.ts (67%) diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index 5d09da31a5941..36f0a3c09147a 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -1,4 +1,5 @@ import './serviceWorker'; +import './meteor/startup/absoluteUrl'; import './meteor/startup/accounts'; import('@rocket.chat/fuselage-polyfills') diff --git a/apps/meteor/client/startup/absoluteUrl.ts b/apps/meteor/client/meteor/startup/absoluteUrl.ts similarity index 67% rename from apps/meteor/client/startup/absoluteUrl.ts rename to apps/meteor/client/meteor/startup/absoluteUrl.ts index 04a698b6cc848..8e2578cad8b7b 100644 --- a/apps/meteor/client/startup/absoluteUrl.ts +++ b/apps/meteor/client/meteor/startup/absoluteUrl.ts @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { baseURI } from '../lib/baseURI'; +import { baseURI } from '../../lib/baseURI'; Meteor.absoluteUrl.defaultOptions.rootUrl = baseURI; diff --git a/apps/meteor/client/startup/index.ts b/apps/meteor/client/startup/index.ts index 9f5e4eb11b4cd..689d5cbe33aa0 100644 --- a/apps/meteor/client/startup/index.ts +++ b/apps/meteor/client/startup/index.ts @@ -1,5 +1,4 @@ import '../lib/rooms/roomTypes'; -import './absoluteUrl'; import './appRoot'; import './audit'; import './callbacks'; From cd867aee56aab593d541d79105bd04f8440762e3 Mon Sep 17 00:00:00 2001 From: Tasso Date: Wed, 15 Oct 2025 10:23:39 -0300 Subject: [PATCH 04/12] Use barrel export --- apps/meteor/client/main.ts | 3 +-- apps/meteor/client/meteor/startup/index.ts | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 apps/meteor/client/meteor/startup/index.ts diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index 36f0a3c09147a..d825101bda9a1 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -1,6 +1,5 @@ import './serviceWorker'; -import './meteor/startup/absoluteUrl'; -import './meteor/startup/accounts'; +import './meteor/startup'; import('@rocket.chat/fuselage-polyfills') .then(() => import('./meteor/overrides')) diff --git a/apps/meteor/client/meteor/startup/index.ts b/apps/meteor/client/meteor/startup/index.ts new file mode 100644 index 0000000000000..286913b22c6a4 --- /dev/null +++ b/apps/meteor/client/meteor/startup/index.ts @@ -0,0 +1,2 @@ +import './absoluteUrl'; +import './accounts'; From 60964c14456eec81a5046bcae4213e2b365736fb Mon Sep 17 00:00:00 2001 From: Tasso Date: Thu, 16 Oct 2025 01:38:32 -0300 Subject: [PATCH 05/12] Test import order --- apps/meteor/client/main.ts | 3 ++- apps/meteor/client/meteor/overrides/index.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index d825101bda9a1..1ff5be95755ee 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -1,5 +1,6 @@ -import './serviceWorker'; +import './meteor/overrides/oauthRedirectUri'; import './meteor/startup'; +import './serviceWorker'; import('@rocket.chat/fuselage-polyfills') .then(() => import('./meteor/overrides')) diff --git a/apps/meteor/client/meteor/overrides/index.ts b/apps/meteor/client/meteor/overrides/index.ts index b94ae0138c197..2500529673212 100644 --- a/apps/meteor/client/meteor/overrides/index.ts +++ b/apps/meteor/client/meteor/overrides/index.ts @@ -1,6 +1,6 @@ import './ddpOverREST'; import './totpOnCall'; -import './oauthRedirectUri'; +// import './oauthRedirectUri'; import './unstoreLoginToken'; import './userAndUsers'; import './login/cas'; From 19bc8fee32aac56e86855db60969a62f4e31179a Mon Sep 17 00:00:00 2001 From: Tasso Date: Fri, 17 Oct 2025 09:03:13 -0300 Subject: [PATCH 06/12] Test import order --- apps/meteor/client/main.ts | 1 + apps/meteor/client/meteor/overrides/index.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index 1ff5be95755ee..1117bd533d692 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -1,4 +1,5 @@ import './meteor/overrides/oauthRedirectUri'; +import './meteor/overrides/unstoreLoginToken'; import './meteor/startup'; import './serviceWorker'; diff --git a/apps/meteor/client/meteor/overrides/index.ts b/apps/meteor/client/meteor/overrides/index.ts index 2500529673212..d05c1ccc04be6 100644 --- a/apps/meteor/client/meteor/overrides/index.ts +++ b/apps/meteor/client/meteor/overrides/index.ts @@ -1,7 +1,7 @@ import './ddpOverREST'; import './totpOnCall'; // import './oauthRedirectUri'; -import './unstoreLoginToken'; +// import './unstoreLoginToken'; import './userAndUsers'; import './login/cas'; import './login/crowd'; From 8e9b11b6b7841b58c6cc65079da50a3f8f077771 Mon Sep 17 00:00:00 2001 From: Tasso Date: Tue, 21 Oct 2025 16:06:10 -0300 Subject: [PATCH 07/12] Test import order --- apps/meteor/client/main.ts | 1 + apps/meteor/client/meteor/overrides/index.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index 1117bd533d692..3f244dcdbc418 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -1,3 +1,4 @@ +import './meteor/overrides/ddpOverREST'; import './meteor/overrides/oauthRedirectUri'; import './meteor/overrides/unstoreLoginToken'; import './meteor/startup'; diff --git a/apps/meteor/client/meteor/overrides/index.ts b/apps/meteor/client/meteor/overrides/index.ts index d05c1ccc04be6..566d56146d777 100644 --- a/apps/meteor/client/meteor/overrides/index.ts +++ b/apps/meteor/client/meteor/overrides/index.ts @@ -1,4 +1,4 @@ -import './ddpOverREST'; +// import './ddpOverREST'; import './totpOnCall'; // import './oauthRedirectUri'; // import './unstoreLoginToken'; From 5455337847430a08ade4fe27291610bae6b7de0f Mon Sep 17 00:00:00 2001 From: Tasso Date: Wed, 22 Oct 2025 14:50:18 -0300 Subject: [PATCH 08/12] Test import order --- apps/meteor/client/main.ts | 1 + apps/meteor/client/meteor/overrides/index.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index 3f244dcdbc418..ece7b2de7a3bd 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -1,5 +1,6 @@ import './meteor/overrides/ddpOverREST'; import './meteor/overrides/oauthRedirectUri'; +import './meteor/overrides/totpOnCall'; import './meteor/overrides/unstoreLoginToken'; import './meteor/startup'; import './serviceWorker'; diff --git a/apps/meteor/client/meteor/overrides/index.ts b/apps/meteor/client/meteor/overrides/index.ts index 566d56146d777..af372f872adee 100644 --- a/apps/meteor/client/meteor/overrides/index.ts +++ b/apps/meteor/client/meteor/overrides/index.ts @@ -1,5 +1,5 @@ // import './ddpOverREST'; -import './totpOnCall'; +// import './totpOnCall'; // import './oauthRedirectUri'; // import './unstoreLoginToken'; import './userAndUsers'; From 4064b22b45cfb4d673591f924bdad057f5331cd8 Mon Sep 17 00:00:00 2001 From: Tasso Date: Wed, 22 Oct 2025 16:52:24 -0300 Subject: [PATCH 09/12] Test import order --- apps/meteor/client/main.ts | 1 + apps/meteor/client/meteor/overrides/index.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index ece7b2de7a3bd..2dab05d5696e4 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -2,6 +2,7 @@ import './meteor/overrides/ddpOverREST'; import './meteor/overrides/oauthRedirectUri'; import './meteor/overrides/totpOnCall'; import './meteor/overrides/unstoreLoginToken'; +import './meteor/overrides/userAndUsers'; import './meteor/startup'; import './serviceWorker'; diff --git a/apps/meteor/client/meteor/overrides/index.ts b/apps/meteor/client/meteor/overrides/index.ts index af372f872adee..b3028e8780e02 100644 --- a/apps/meteor/client/meteor/overrides/index.ts +++ b/apps/meteor/client/meteor/overrides/index.ts @@ -2,7 +2,7 @@ // import './totpOnCall'; // import './oauthRedirectUri'; // import './unstoreLoginToken'; -import './userAndUsers'; +// import './userAndUsers'; import './login/cas'; import './login/crowd'; import './login/facebook'; From 2a347205fa6b0fb7d390267c4c9ca8b7c79dd544 Mon Sep 17 00:00:00 2001 From: Tasso Date: Thu, 23 Oct 2025 10:31:48 -0300 Subject: [PATCH 10/12] Test import order --- apps/meteor/client/main.ts | 1 + apps/meteor/client/meteor/overrides/index.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index 2dab05d5696e4..207251400e1a8 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -1,3 +1,4 @@ +import './meteor/overrides/desktopInjection'; import './meteor/overrides/ddpOverREST'; import './meteor/overrides/oauthRedirectUri'; import './meteor/overrides/totpOnCall'; diff --git a/apps/meteor/client/meteor/overrides/index.ts b/apps/meteor/client/meteor/overrides/index.ts index b3028e8780e02..6ba9e0da8c610 100644 --- a/apps/meteor/client/meteor/overrides/index.ts +++ b/apps/meteor/client/meteor/overrides/index.ts @@ -15,4 +15,4 @@ import './login/password'; import './login/saml'; import './login/twitter'; import './settings'; -import './desktopInjection'; +// import './desktopInjection'; From 69c01c824cdd7e7d4ad5961496033d1217d83582 Mon Sep 17 00:00:00 2001 From: Tasso Date: Fri, 24 Oct 2025 23:14:50 -0300 Subject: [PATCH 11/12] Test import order --- apps/meteor/client/main.ts | 1 + apps/meteor/client/meteor/overrides/index.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index 207251400e1a8..991b5a862a956 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -1,6 +1,7 @@ import './meteor/overrides/desktopInjection'; import './meteor/overrides/ddpOverREST'; import './meteor/overrides/oauthRedirectUri'; +import './meteor/overrides/settings'; import './meteor/overrides/totpOnCall'; import './meteor/overrides/unstoreLoginToken'; import './meteor/overrides/userAndUsers'; diff --git a/apps/meteor/client/meteor/overrides/index.ts b/apps/meteor/client/meteor/overrides/index.ts index 6ba9e0da8c610..2d601bdafd901 100644 --- a/apps/meteor/client/meteor/overrides/index.ts +++ b/apps/meteor/client/meteor/overrides/index.ts @@ -14,5 +14,5 @@ import './login/oauth'; import './login/password'; import './login/saml'; import './login/twitter'; -import './settings'; +// import './settings'; // import './desktopInjection'; From 00a5468405247cfe23a492fe0388abe9a90bfc0f Mon Sep 17 00:00:00 2001 From: Tasso Date: Mon, 27 Oct 2025 17:00:07 -0300 Subject: [PATCH 12/12] Split imports --- .../client/lib/customOAuth/CustomOAuth.ts | 2 +- apps/meteor/client/main.ts | 10 ++------ .../meteor/{overrides => }/login/cas.ts | 4 +-- .../meteor/{overrides => }/login/crowd.ts | 2 +- .../meteor/{overrides => }/login/facebook.ts | 4 +-- .../meteor/{overrides => }/login/github.ts | 4 +-- .../meteor/{overrides => }/login/google.ts | 4 +-- apps/meteor/client/meteor/login/index.ts | 11 ++++++++ .../meteor/{overrides => }/login/ldap.ts | 2 +- .../login/meteorDeveloperAccount.ts | 4 +-- .../meteor/{overrides => }/login/oauth.ts | 6 ++--- .../meteor/{overrides => }/login/password.ts | 2 +- .../meteor/{overrides => }/login/saml.ts | 6 ++--- .../meteor/{overrides => }/login/twitter.ts | 4 +-- apps/meteor/client/meteor/overrides/index.ts | 25 ++++++------------- 15 files changed, 42 insertions(+), 48 deletions(-) rename apps/meteor/client/meteor/{overrides => }/login/cas.ts (83%) rename apps/meteor/client/meteor/{overrides => }/login/crowd.ts (96%) rename apps/meteor/client/meteor/{overrides => }/login/facebook.ts (93%) rename apps/meteor/client/meteor/{overrides => }/login/github.ts (90%) rename apps/meteor/client/meteor/{overrides => }/login/google.ts (95%) create mode 100644 apps/meteor/client/meteor/login/index.ts rename apps/meteor/client/meteor/{overrides => }/login/ldap.ts (96%) rename apps/meteor/client/meteor/{overrides => }/login/meteorDeveloperAccount.ts (91%) rename apps/meteor/client/meteor/{overrides => }/login/oauth.ts (94%) rename apps/meteor/client/meteor/{overrides => }/login/password.ts (93%) rename apps/meteor/client/meteor/{overrides => }/login/saml.ts (95%) rename apps/meteor/client/meteor/{overrides => }/login/twitter.ts (91%) diff --git a/apps/meteor/client/lib/customOAuth/CustomOAuth.ts b/apps/meteor/client/lib/customOAuth/CustomOAuth.ts index 7a0c1c3548d38..8ac31adc0a5ce 100644 --- a/apps/meteor/client/lib/customOAuth/CustomOAuth.ts +++ b/apps/meteor/client/lib/customOAuth/CustomOAuth.ts @@ -7,7 +7,7 @@ import { OAuth } from 'meteor/oauth'; import { isURL } from '../../../lib/utils/isURL'; import type { IOAuthProvider } from '../../definitions/IOAuthProvider'; -import { createOAuthTotpLoginMethod } from '../../meteor/overrides/login/oauth'; +import { createOAuthTotpLoginMethod } from '../../meteor/login/oauth'; import { overrideLoginMethod, type LoginCallback } from '../2fa/overrideLoginMethod'; import { loginServices } from '../loginServices'; import { CustomOAuthError } from './CustomOAuthError'; diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index 991b5a862a956..f6b040937176e 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -1,15 +1,9 @@ -import './meteor/overrides/desktopInjection'; -import './meteor/overrides/ddpOverREST'; -import './meteor/overrides/oauthRedirectUri'; -import './meteor/overrides/settings'; -import './meteor/overrides/totpOnCall'; -import './meteor/overrides/unstoreLoginToken'; -import './meteor/overrides/userAndUsers'; +import './meteor/overrides'; import './meteor/startup'; import './serviceWorker'; import('@rocket.chat/fuselage-polyfills') - .then(() => import('./meteor/overrides')) + .then(() => import('./meteor/login')) .then(() => import('./ecdh')) .then(() => import('./importPackages')) .then(() => import('./startup')) diff --git a/apps/meteor/client/meteor/overrides/login/cas.ts b/apps/meteor/client/meteor/login/cas.ts similarity index 83% rename from apps/meteor/client/meteor/overrides/login/cas.ts rename to apps/meteor/client/meteor/login/cas.ts index 9b753d5042943..93a9f1d5b2365 100644 --- a/apps/meteor/client/meteor/overrides/login/cas.ts +++ b/apps/meteor/client/meteor/login/cas.ts @@ -1,7 +1,7 @@ import { Random } from '@rocket.chat/random'; import { Meteor } from 'meteor/meteor'; -import { callLoginMethod } from '../../../lib/2fa/overrideLoginMethod'; +import { callLoginMethod } from '../../lib/2fa/overrideLoginMethod'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace @@ -12,7 +12,7 @@ declare module 'meteor/meteor' { Meteor.loginWithCas = (_, callback) => { const credentialToken = Random.id(); - import('../../../lib/openCASLoginPopup') + import('../../lib/openCASLoginPopup') .then(({ openCASLoginPopup }) => openCASLoginPopup(credentialToken)) .then(() => callLoginMethod({ methodArguments: [{ cas: { credentialToken } }] })) .then(() => callback?.()) diff --git a/apps/meteor/client/meteor/overrides/login/crowd.ts b/apps/meteor/client/meteor/login/crowd.ts similarity index 96% rename from apps/meteor/client/meteor/overrides/login/crowd.ts rename to apps/meteor/client/meteor/login/crowd.ts index a07a149c09be0..9b1d4b83d4025 100644 --- a/apps/meteor/client/meteor/overrides/login/crowd.ts +++ b/apps/meteor/client/meteor/login/crowd.ts @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { callLoginMethod, handleLogin, type LoginCallback } from '../../../lib/2fa/overrideLoginMethod'; +import { callLoginMethod, handleLogin, type LoginCallback } from '../../lib/2fa/overrideLoginMethod'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace diff --git a/apps/meteor/client/meteor/overrides/login/facebook.ts b/apps/meteor/client/meteor/login/facebook.ts similarity index 93% rename from apps/meteor/client/meteor/overrides/login/facebook.ts rename to apps/meteor/client/meteor/login/facebook.ts index 8fdeac364ff79..f13b22daec289 100644 --- a/apps/meteor/client/meteor/overrides/login/facebook.ts +++ b/apps/meteor/client/meteor/login/facebook.ts @@ -7,8 +7,8 @@ import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; import { createOAuthTotpLoginMethod } from './oauth'; -import { overrideLoginMethod } from '../../../lib/2fa/overrideLoginMethod'; -import { wrapRequestCredentialFn } from '../../../lib/wrapRequestCredentialFn'; +import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod'; +import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; const { loginWithFacebook } = Meteor; const loginWithFacebookAndTOTP = createOAuthTotpLoginMethod(Facebook); diff --git a/apps/meteor/client/meteor/overrides/login/github.ts b/apps/meteor/client/meteor/login/github.ts similarity index 90% rename from apps/meteor/client/meteor/overrides/login/github.ts rename to apps/meteor/client/meteor/login/github.ts index 2402ed858a959..98c8fb8fea76d 100644 --- a/apps/meteor/client/meteor/overrides/login/github.ts +++ b/apps/meteor/client/meteor/login/github.ts @@ -7,8 +7,8 @@ import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; import { createOAuthTotpLoginMethod } from './oauth'; -import { overrideLoginMethod } from '../../../lib/2fa/overrideLoginMethod'; -import { wrapRequestCredentialFn } from '../../../lib/wrapRequestCredentialFn'; +import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod'; +import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; const { loginWithGithub } = Meteor; const loginWithGithubAndTOTP = createOAuthTotpLoginMethod(Github); diff --git a/apps/meteor/client/meteor/overrides/login/google.ts b/apps/meteor/client/meteor/login/google.ts similarity index 95% rename from apps/meteor/client/meteor/overrides/login/google.ts rename to apps/meteor/client/meteor/login/google.ts index 01d7be4143b2d..9eaf46ac40b44 100644 --- a/apps/meteor/client/meteor/overrides/login/google.ts +++ b/apps/meteor/client/meteor/login/google.ts @@ -7,8 +7,8 @@ import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; import { createOAuthTotpLoginMethod } from './oauth'; -import { overrideLoginMethod, type LoginCallback } from '../../../lib/2fa/overrideLoginMethod'; -import { wrapRequestCredentialFn } from '../../../lib/wrapRequestCredentialFn'; +import { overrideLoginMethod, type LoginCallback } from '../../lib/2fa/overrideLoginMethod'; +import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace diff --git a/apps/meteor/client/meteor/login/index.ts b/apps/meteor/client/meteor/login/index.ts new file mode 100644 index 0000000000000..cef3570085f43 --- /dev/null +++ b/apps/meteor/client/meteor/login/index.ts @@ -0,0 +1,11 @@ +import './cas'; +import './crowd'; +import './facebook'; +import './github'; +import './google'; +import './ldap'; +import './meteorDeveloperAccount'; +import './oauth'; +import './password'; +import './saml'; +import './twitter'; diff --git a/apps/meteor/client/meteor/overrides/login/ldap.ts b/apps/meteor/client/meteor/login/ldap.ts similarity index 96% rename from apps/meteor/client/meteor/overrides/login/ldap.ts rename to apps/meteor/client/meteor/login/ldap.ts index 23238126ea5ea..77a16ce3675d4 100644 --- a/apps/meteor/client/meteor/overrides/login/ldap.ts +++ b/apps/meteor/client/meteor/login/ldap.ts @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { callLoginMethod, handleLogin, type LoginCallback } from '../../../lib/2fa/overrideLoginMethod'; +import { callLoginMethod, handleLogin, type LoginCallback } from '../../lib/2fa/overrideLoginMethod'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace diff --git a/apps/meteor/client/meteor/overrides/login/meteorDeveloperAccount.ts b/apps/meteor/client/meteor/login/meteorDeveloperAccount.ts similarity index 91% rename from apps/meteor/client/meteor/overrides/login/meteorDeveloperAccount.ts rename to apps/meteor/client/meteor/login/meteorDeveloperAccount.ts index 561d778ee52f3..1b499a00b7dec 100644 --- a/apps/meteor/client/meteor/overrides/login/meteorDeveloperAccount.ts +++ b/apps/meteor/client/meteor/login/meteorDeveloperAccount.ts @@ -5,8 +5,8 @@ import { MeteorDeveloperAccounts } from 'meteor/meteor-developer-oauth'; import { OAuth } from 'meteor/oauth'; import { createOAuthTotpLoginMethod } from './oauth'; -import { overrideLoginMethod } from '../../../lib/2fa/overrideLoginMethod'; -import { wrapRequestCredentialFn } from '../../../lib/wrapRequestCredentialFn'; +import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod'; +import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; const { loginWithMeteorDeveloperAccount } = Meteor; const loginWithMeteorDeveloperAccountAndTOTP = createOAuthTotpLoginMethod(MeteorDeveloperAccounts); diff --git a/apps/meteor/client/meteor/overrides/login/oauth.ts b/apps/meteor/client/meteor/login/oauth.ts similarity index 94% rename from apps/meteor/client/meteor/overrides/login/oauth.ts rename to apps/meteor/client/meteor/login/oauth.ts index cc31be9fb677d..a3f9d72c9cbf8 100644 --- a/apps/meteor/client/meteor/overrides/login/oauth.ts +++ b/apps/meteor/client/meteor/login/oauth.ts @@ -2,8 +2,8 @@ import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; -import type { IOAuthProvider } from '../../../definitions/IOAuthProvider'; -import type { LoginCallback } from '../../../lib/2fa/overrideLoginMethod'; +import type { IOAuthProvider } from '../../definitions/IOAuthProvider'; +import type { LoginCallback } from '../../lib/2fa/overrideLoginMethod'; const isLoginCancelledError = (error: unknown): error is Meteor.Error => error instanceof Meteor.Error && error.error === Accounts.LoginCancelledError.numericError; @@ -113,7 +113,7 @@ Accounts.onPageLoadLogin(async (loginAttempt: any) => { const { credentialToken, credentialSecret } = oAuthArgs.oauth; const cb = loginAttempt.userCallback; - const { process2faReturn } = await import('../../../lib/2fa/process2faReturn'); + const { process2faReturn } = await import('../../lib/2fa/process2faReturn'); await process2faReturn({ error: loginAttempt.error, diff --git a/apps/meteor/client/meteor/overrides/login/password.ts b/apps/meteor/client/meteor/login/password.ts similarity index 93% rename from apps/meteor/client/meteor/overrides/login/password.ts rename to apps/meteor/client/meteor/login/password.ts index 7074290b1f2c5..f1c6e32f2282b 100644 --- a/apps/meteor/client/meteor/overrides/login/password.ts +++ b/apps/meteor/client/meteor/login/password.ts @@ -1,7 +1,7 @@ import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; -import { overrideLoginMethod, type LoginCallback } from '../../../lib/2fa/overrideLoginMethod'; +import { overrideLoginMethod, type LoginCallback } from '../../lib/2fa/overrideLoginMethod'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace diff --git a/apps/meteor/client/meteor/overrides/login/saml.ts b/apps/meteor/client/meteor/login/saml.ts similarity index 95% rename from apps/meteor/client/meteor/overrides/login/saml.ts rename to apps/meteor/client/meteor/login/saml.ts index 052fa42033594..0561d6db13ad8 100644 --- a/apps/meteor/client/meteor/overrides/login/saml.ts +++ b/apps/meteor/client/meteor/login/saml.ts @@ -2,8 +2,8 @@ import { Random } from '@rocket.chat/random'; import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; -import { type LoginCallback, callLoginMethod, handleLogin } from '../../../lib/2fa/overrideLoginMethod'; -import { settings } from '../../../lib/settings'; +import { type LoginCallback, callLoginMethod, handleLogin } from '../../lib/2fa/overrideLoginMethod'; +import { settings } from '../../lib/settings'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace @@ -61,7 +61,7 @@ Meteor.logout = async function (...args) { if (provider && settings.peek('SAML_Custom_Default_idp_slo_redirect_url')) { console.info('SAML session terminated via SLO'); - const { sdk } = await import('../../../../app/utils/client/lib/SDKClient'); + const { sdk } = await import('../../../app/utils/client/lib/SDKClient'); sdk .call('samlLogout', provider) .then((result) => { diff --git a/apps/meteor/client/meteor/overrides/login/twitter.ts b/apps/meteor/client/meteor/login/twitter.ts similarity index 91% rename from apps/meteor/client/meteor/overrides/login/twitter.ts rename to apps/meteor/client/meteor/login/twitter.ts index f20de544b89b4..dc72000923d63 100644 --- a/apps/meteor/client/meteor/overrides/login/twitter.ts +++ b/apps/meteor/client/meteor/login/twitter.ts @@ -7,8 +7,8 @@ import { OAuth } from 'meteor/oauth'; import { Twitter } from 'meteor/twitter-oauth'; import { createOAuthTotpLoginMethod } from './oauth'; -import { overrideLoginMethod } from '../../../lib/2fa/overrideLoginMethod'; -import { wrapRequestCredentialFn } from '../../../lib/wrapRequestCredentialFn'; +import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod'; +import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; const { loginWithTwitter } = Meteor; const loginWithTwitterAndTOTP = createOAuthTotpLoginMethod(Twitter); diff --git a/apps/meteor/client/meteor/overrides/index.ts b/apps/meteor/client/meteor/overrides/index.ts index 2d601bdafd901..f3370db0592f5 100644 --- a/apps/meteor/client/meteor/overrides/index.ts +++ b/apps/meteor/client/meteor/overrides/index.ts @@ -1,18 +1,7 @@ -// import './ddpOverREST'; -// import './totpOnCall'; -// import './oauthRedirectUri'; -// import './unstoreLoginToken'; -// import './userAndUsers'; -import './login/cas'; -import './login/crowd'; -import './login/facebook'; -import './login/github'; -import './login/google'; -import './login/ldap'; -import './login/meteorDeveloperAccount'; -import './login/oauth'; -import './login/password'; -import './login/saml'; -import './login/twitter'; -// import './settings'; -// import './desktopInjection'; +import './ddpOverREST'; +import './desktopInjection'; +import './oauthRedirectUri'; +import './settings'; +import './totpOnCall'; +import './unstoreLoginToken'; +import './userAndUsers';