Skip to content

chore: More steps towards isolating client code from Meteor APIs #36858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tassoevan wants to merge 2 commits into
base: develop
Choose a base branch
from
+5 −7
Draft

chore: More steps towards isolating client code from Meteor APIs #36858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d72683
Move Meteor specific startup code
tassoevan Sep 3, 2025
4e4c4ce
Review
tassoevan Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/meteor/client/meteor/startup/accounts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 2 additions & 4 deletions apps/meteor/client/providers/UserProvider/UserProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/startup/startup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import moment from 'moment';

import 'highlight.js/styles/github.css';
import { sdk } from '../../app/utils/client/lib/SDKClient';
import { synchronizeUserData, removeLocalUserData } from '../lib/userData';
import { fireGlobalEvent } from '../lib/utils/fireGlobalEvent';
import { watchUserId } from '../meteor/user';
import 'highlight.js/styles/github.css';

Meteor.startup(() => {
fireGlobalEvent('startup', true);
Expand Down
Loading