Split imports

tassoevan · tassoevan · commit 00a546840524 · 2025-10-30T17:10:39.000-03:00
diff --git 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
@@ -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/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/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/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/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/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
@@ -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/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/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/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/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/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/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
@@ -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';
