Skip to content

Regression: Reassessment of client helpers 'XYZ key should not contain .' #19310

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

Merged
ggazzo merged 1 commit into from
Oct 21, 2020
Merged

Regression: Reassessment of client helpers 'XYZ key should not contain .' #19310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 7 additions & 15 deletions client/lib/userData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Meteor } from 'meteor/meteor';
import { APIClient } from '../../app/utils/client';
import { Users } from '../../app/models/client';
import { Notifications } from '../../app/notifications/client';
import type { IUser } from '../../definition/IUser';
import type { IUser, IUserDataEvent } from '../../definition/IUser';

export const isSyncReady = new ReactiveVar(false);

Expand All @@ -27,29 +27,21 @@ const updateUser = (userData: IUser & { _updatedAt: Date }): void => {
Meteor.users.update({ _id: user._id }, { $set: userData });
};

type UserDataNotification = {
id: unknown;
}
& (
({ type: 'inserted' } & Meteor.User)
| ({ type: 'updated' } & Partial<Meteor.User>)
| ({ type: 'removed' })
)

export const synchronizeUserData = async (uid: Meteor.User['_id']): Promise<unknown> => {
if (!uid) {
return;
}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
await Notifications.onUser('userData', ({ type, id, ...data }: UserDataNotification) => {
switch (type) {
await Notifications.onUser('userData', (data: IUserDataEvent) => {
switch (data.type) {
case 'inserted':
Meteor.users.insert(data);
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { type, id, ...user } = data;
Meteor.users.insert(user);
break;

case 'updated':
Meteor.users.upsert({ _id: uid }, { $set: data });
Meteor.users.upsert({ _id: uid }, { $set: data.diff });
break;

case 'removed':
Expand Down
16 changes: 16 additions & 0 deletions definition/IUser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,19 @@ export interface IUser {
};
settings?: IUserSettings;
}

export type IUserDataEvent = {
id: unknown;
}
& (
({
type: 'inserted';
} & IUser)
| ({
type: 'removed';
})
| ({
type: 'updated';
diff: Partial<IUser>;
})
)