chore(client): stop replacing Meteor.user (#32910)

apps/meteor/app/models/client/models/Users.ts

@@ -30,5 +30,13 @@ class UsersCollection extends Mongo.Collection<IUser> {
 	}
 }
 
+Object.assign(Meteor.users, {
+	_connection: undefined,
+	findOneById: UsersCollection.prototype.findOneById,
+	isUserInRole: UsersCollection.prototype.isUserInRole,
+	findUsersInRoles: UsersCollection.prototype.findUsersInRoles,
+	remove: UsersCollection.prototype.remove,
+});
+
 /** @deprecated */
-export const Users = new UsersCollection();
+export const Users = Meteor.users as UsersCollection;

apps/meteor/app/ui-cached-collection/client/models/CachedCollectionManager.ts

@@ -11,15 +11,12 @@ class CachedCollectionManager extends Emitter<{ reconnect: void; login: string |
 
 	private _syncEnabled: boolean;
 
-	private logged: boolean;
-
 	private step: number;
 
 	constructor() {
 		super();
 		this.items = [];
 		this._syncEnabled = false;
-		this.logged = false;
 
 		const { _unstoreLoginToken } = Accounts;
 		Accounts._unstoreLoginToken = (...args) => {
@@ -40,14 +37,6 @@ class CachedCollectionManager extends Emitter<{ reconnect: void; login: string |
 					return connected && this.emit('reconnect');
 			}
 		});
-
-		Tracker.autorun(() => {
-			const uid = Meteor.userId();
-			this.logged = uid !== null;
-			if (this.logged) {
-				this.emit('login', uid);
-			}
-		});
 	}
 
 	register(cachedCollection: CachedCollection<any>) {
@@ -80,10 +69,7 @@ class CachedCollectionManager extends Emitter<{ reconnect: void; login: string |
 	}
 
 	onLogin(cb: () => void) {
-		this.on('login', cb);
-		if (this.logged) {
-			cb();
-		}
+		Accounts.onLogin(cb);
 	}
 }
 

apps/meteor/client/startup/startup.ts

@@ -28,10 +28,15 @@ Meteor.startup(() => {
 			removeLocalUserData();
 			return;
 		}
+
 		if (!Meteor.status().connected) {
 			return;
 		}
 
+		if (Meteor.loggingIn()) {
+			return;
+		}
+
 		const user = await synchronizeUserData(uid);
 		if (!user) {
 			return;

apps/meteor/client/views/root/SAMLLoginRoute.tsx

@@ -1,5 +1,5 @@
 import type { LocationPathname } from '@rocket.chat/ui-contexts';
-import { useRouter, useToastMessageDispatch, useUserId, useAbsoluteUrl } from '@rocket.chat/ui-contexts';
+import { useRouter, useToastMessageDispatch, useAbsoluteUrl } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 import { useEffect } from 'react';
 
@@ -38,20 +38,6 @@ const SAMLLoginRoute = () => {
 		});
 	}, [dispatchToastMessage, rootUrl, router]);
 
-	const userId = useUserId();
-	useEffect(() => {
-		if (!userId) {
-			return;
-		}
-
-		router.navigate(
-			{
-				pathname: '/home',
-			},
-			{ replace: true },
-		);
-	}, [userId, router]);
-
 	return null;
 };
 

apps/meteor/tests/unit/client/views/root/SAMLLoginRoute.spec.tsx

@@ -19,7 +19,7 @@ describe('views/root/SAMLLoginRoute', () => {
 		loginWithSamlTokenStub.callsFake((_token, callback) => callback());
 	});
 
-	it('should redirect to /home when userId is not null', async () => {
+	it('should redirect to /home', async () => {
 		render(
 			<MockedServerContext>
 				<MockedUserContext>
@@ -30,7 +30,7 @@ describe('views/root/SAMLLoginRoute', () => {
 			</MockedServerContext>,
 		);
 
-		expect(navigateStub.calledTwice).toBe(true);
+		expect(navigateStub.calledOnce).toBe(true);
 		expect(
 			navigateStub.calledWith(
 				sinon.match({
@@ -40,7 +40,7 @@ describe('views/root/SAMLLoginRoute', () => {
 		).toBe(true);
 	});
 
-	it('should redirect to /home when userId is null and redirectUrl is not within the workspace domain', async () => {
+	it('should redirect to /home when redirectUrl is not within the workspace domain', async () => {
 		render(
 			<MockedServerContext>
 				<RouterContextMock searchParameters={{ redirectUrl: 'http://rocket.chat' }} navigate={navigateStub}>
@@ -58,7 +58,7 @@ describe('views/root/SAMLLoginRoute', () => {
 		).toBe(true);
 	});
 
-	it('should redirect to the provided redirectUrl when userId is null and redirectUrl is within the workspace domain', async () => {
+	it('should redirect to the provided redirectUrl when redirectUrl is within the workspace domain', async () => {
 		render(
 			<MockedServerContext>
 				<RouterContextMock searchParameters={{ redirectUrl: 'http://localhost:3000/invite/test' }} navigate={navigateStub}>