chore: Recolocate Meteor-related client-side modules under client/meteor

apps/meteor/app/authorization/client/hasPermission.ts

@@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { hasRole } from './hasRole';
 import { PermissionsCachedStore } from '../../../client/cachedStores';
-import { watch } from '../../../client/lib/cachedStores';
+import { watch } from '../../../client/meteor/watch';
 import { Permissions, Users } from '../../../client/stores';
 import { AuthorizationUtils } from '../lib/AuthorizationUtils';
 

apps/meteor/app/authorization/client/hasRole.ts

@@ -1,6 +1,6 @@
 import type { IUser, IRole, IRoom } from '@rocket.chat/core-typings';
 
-import { watch } from '../../../client/lib/cachedStores';
+import { watch } from '../../../client/meteor/watch';
 import { Roles, Subscriptions, Users } from '../../../client/stores';
 
 export const hasRole = (userId: IUser['_id'], roleId: IRole['_id'], scope?: IRoom['_id']): boolean => {

apps/meteor/client/lib/cachedStores/CachedStore.ts

@@ -10,10 +10,10 @@ import { baseURI } from '../baseURI';
 import { onLoggedIn } from '../loggedIn';
 import { CachedStoresManager } from './CachedStoresManager';
 import type { IDocumentMapStore } from './DocumentMapStore';
-import { watch } from './watch';
 import { sdk } from '../../../app/utils/client/lib/SDKClient';
 import { isTruthy } from '../../../lib/isTruthy';
 import { withDebouncing } from '../../../lib/utils/highOrderFunctions';
+import { watch } from '../../meteor/watch';
 import { getConfig } from '../utils/getConfig';
 
 type Name = 'rooms' | 'subscriptions' | 'permissions' | 'public-settings' | 'private-settings';

apps/meteor/client/lib/cachedStores/index.ts

@@ -3,6 +3,5 @@ export { pipe } from './pipe';
 export { applyQueryOptions } from './utils';
 export { createDocumentMapStore, type IDocumentMapStore } from './DocumentMapStore';
 export { MinimongoCollection } from './MinimongoCollection';
-export { watch } from './watch';
 export { PublicCachedStore, PrivateCachedStore } from './CachedStore';
 export { createGlobalStore } from './createGlobalStore';

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 '../../meteorOverrides/login/oauth';
+import { createOAuthTotpLoginMethod } from '../../meteor/overrides/login/oauth';
 import { overrideLoginMethod, type LoginCallback } from '../2fa/overrideLoginMethod';
 import { loginServices } from '../loginServices';
 import { CustomOAuthError } from './CustomOAuthError';

apps/meteor/client/lib/settings/settings.ts

@@ -1,7 +1,7 @@
 import type { SettingValue } from '@rocket.chat/core-typings';
 
+import { watch } from '../../meteor/watch';
 import { PublicSettings } from '../../stores';
-import { watch } from '../cachedStores';
 
 type SettingCallback = (key: string, value: SettingValue) => void;
 

apps/meteor/client/main.ts

@@ -3,7 +3,7 @@ import './startup/accounts';
 import './startup/fakeUserPresence';
 
 import('@rocket.chat/fuselage-polyfills')
-	.then(() => import('./meteorOverrides'))
+	.then(() => import('./meteor/overrides'))
 	.then(() => import('./ecdh'))
 	.then(() => import('./importPackages'))
 	.then(() => import('./startup'))

apps/meteor/client/meteorOverrides/ddpOverREST.ts → apps/meteor/client/meteor/overrides/ddpOverREST.ts

@@ -2,7 +2,7 @@ import { DDPCommon } from 'meteor/ddp-common';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
-import { sdk } from '../../app/utils/client/lib/SDKClient';
+import { sdk } from '../../../app/utils/client/lib/SDKClient';
 
 const bypassMethods: string[] = ['setUserStatus', 'logout'];
 

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

@@ -5,8 +5,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/meteorOverrides/login/github.ts → apps/meteor/client/meteor/overrides/login/github.ts

@@ -5,8 +5,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/meteorOverrides/login/google.ts → apps/meteor/client/meteor/overrides/login/google.ts

@@ -5,8 +5,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/meteorOverrides/login/ldap.ts → apps/meteor/client/meteor/overrides/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/meteorOverrides/login/meteorDeveloperAccount.ts → apps/meteor/client/meteor/overrides/login/meteorDeveloperAccount.ts

@@ -3,8 +3,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/meteorOverrides/login/oauth.ts → apps/meteor/client/meteor/overrides/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/meteorOverrides/login/password.ts → apps/meteor/client/meteor/overrides/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/meteorOverrides/login/saml.ts → apps/meteor/client/meteor/overrides/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/meteorOverrides/login/twitter.ts → apps/meteor/client/meteor/overrides/login/twitter.ts

@@ -5,8 +5,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/meteorOverrides/settings.ts → apps/meteor/client/meteor/overrides/settings.ts

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { PublicSettings } from '../stores';
+import { PublicSettings } from '../../stores';
 
 PublicSettings.use.subscribe((state) => {
 	const removedIds = new Set(Object.keys(Meteor.settings)).difference(new Set(state.records.keys()));

apps/meteor/client/meteorOverrides/totpOnCall.ts → apps/meteor/client/meteor/overrides/totpOnCall.ts

@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 
-import { t } from '../../app/utils/lib/i18n';
-import type { LoginCallback } from '../lib/2fa/overrideLoginMethod';
-import { process2faReturn, process2faAsyncReturn } from '../lib/2fa/process2faReturn';
-import { isTotpInvalidError } from '../lib/2fa/utils';
+import { t } from '../../../app/utils/lib/i18n';
+import type { LoginCallback } from '../../lib/2fa/overrideLoginMethod';
+import { process2faReturn, process2faAsyncReturn } from '../../lib/2fa/process2faReturn';
+import { isTotpInvalidError } from '../../lib/2fa/utils';
 
 const withSyncTOTP = (call: (name: string, ...args: any[]) => any) => {
 	const callWithTotp =

apps/meteor/client/meteorOverrides/unstoreLoginToken.ts → apps/meteor/client/meteor/overrides/unstoreLoginToken.ts

@@ -1,6 +1,6 @@
 import { Accounts } from 'meteor/accounts-base';
 
-import { CachedStoresManager } from '../lib/cachedStores';
+import { CachedStoresManager } from '../../lib/cachedStores';
 
 const { _unstoreLoginToken } = Accounts;
 Accounts._unstoreLoginToken = (...args) => {

apps/meteor/client/meteorOverrides/userAndUsers.ts → apps/meteor/client/meteor/overrides/userAndUsers.ts

@@ -1,7 +1,7 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Tracker } from 'meteor/tracker';
 
-import { Users } from '../stores/Users';
+import { Users } from '../../stores/Users';
 
 // assertion is needed because global Mongo.Collection differs from the `meteor/mongo` package's Mongo.Collection
 Meteor.users = Users.collection as typeof Meteor.users;

apps/meteor/client/startup/accounts.ts

@@ -5,9 +5,9 @@ import { Tracker } from 'meteor/tracker';
 import { sdk } from '../../app/utils/client/lib/SDKClient';
 import { t } from '../../app/utils/lib/i18n';
 import { PublicSettingsCachedStore, SubscriptionsCachedStore } from '../cachedStores';
-import { watch } from '../lib/cachedStores';
 import { dispatchToastMessage } from '../lib/toast';
 import { useUserDataSyncReady } from '../lib/userData';
+import { watch } from '../meteor/watch';
 
 const watchMainReady = () => {
 	const uid = Meteor.userId();

yarn.lock

@@ -9419,7 +9419,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.3
-    "@rocket.chat/ui-contexts": 22.0.0-rc.6
+    "@rocket.chat/ui-contexts": 22.0.0
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"