chore: Move Meteor specific startup code

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';

apps/meteor/client/main.ts

@@ -1,9 +1,9 @@
+import './meteor/overrides';
+import './meteor/startup';
 import './serviceWorker';
-import './startup/accounts';
-import './startup/desktopInjection';
 
 import('@rocket.chat/fuselage-polyfills')
-	.then(() => import('./meteor/overrides'))
+	.then(() => import('./meteor/login'))
 	.then(() => import('./ecdh'))
 	.then(() => import('./importPackages'))
 	.then(() => import('./startup'))

apps/meteor/client/meteor/overrides/login/cas.ts → 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?.())

apps/meteor/client/meteor/overrides/login/crowd.ts → 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

apps/meteor/client/meteor/overrides/login/facebook.ts → 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);

apps/meteor/client/meteor/overrides/login/github.ts → 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);

apps/meteor/client/meteor/overrides/login/google.ts → 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

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';

apps/meteor/client/meteor/overrides/login/ldap.ts → 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

apps/meteor/client/meteor/overrides/login/meteorDeveloperAccount.ts → 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);

apps/meteor/client/meteor/overrides/login/oauth.ts → 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,

apps/meteor/client/meteor/overrides/login/password.ts → 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

apps/meteor/client/meteor/overrides/login/saml.ts → 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) => {

apps/meteor/client/meteor/overrides/login/twitter.ts → 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);

apps/meteor/client/startup/desktopInjection.ts → 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

apps/meteor/client/meteor/overrides/index.ts

@@ -1,17 +1,7 @@
 import './ddpOverREST';
-import './totpOnCall';
+import './desktopInjection';
 import './oauthRedirectUri';
+import './settings';
+import './totpOnCall';
 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';

apps/meteor/client/startup/absoluteUrl.ts → 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;

apps/meteor/client/startup/accounts.ts → 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<void> => {
 	const isMainReady = (): boolean => {

apps/meteor/client/meteor/startup/index.ts

@@ -0,0 +1,2 @@
+import './absoluteUrl';
+import './accounts';

apps/meteor/client/startup/index.ts

@@ -1,5 +1,4 @@
 import '../lib/rooms/roomTypes';
-import './absoluteUrl';
 import './appRoot';
 import './audit';
 import './callbacks';