Review

Author: tassoevan

apps/meteor/client/meteor/startup/accounts.ts

@@ -5,12 +5,12 @@ 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 { getUserId, userIdStore } from '../../lib/user';
 import { useUserDataSyncReady } from '../../lib/userData';
 
 const whenMainReady = (): Promise<void> => {
 	const isMainReady = (): boolean => {
-		const uid = userIdStore.getState();
+		const uid = getUserId();
 		if (!uid) return true;
 
 		const subscriptionsReady = SubscriptionsCachedStore.useReady.getState();

apps/meteor/client/providers/UserProvider/UserProvider.tsx

@@ -24,7 +24,7 @@ import { useIdleConnection } from '../../hooks/useIdleConnection';
 import type { IDocumentMapStore } from '../../lib/cachedStores/DocumentMapStore';
 import { applyQueryOptions } from '../../lib/cachedStores/applyQueryOptions';
 import { createReactiveSubscriptionFactory } from '../../lib/createReactiveSubscriptionFactory';
-import { userIdStore } from '../../lib/user';
+import { getUser, userIdStore } from '../../lib/user';
 import { Users, Rooms, Subscriptions } from '../../stores';
 import { useSamlInviteToken } from '../../views/invite/hooks/useSamlInviteToken';
 
@@ -36,9 +36,7 @@ const ee = new Emitter();
 Accounts.onLogout(() => ee.emit('logout'));
 
 ee.on('logout', async () => {
-	const userId = userIdStore.getState();
-	if (!userId) return;
-	const user = Users.state.get(userId);
+	const user = getUser();
 	if (!user) return;
 
 	await afterLogoutCleanUpCallback.run(user);