Skip to content

Commit 6cec15a

Browse files
committed
fix ts
1 parent a09e9af commit 6cec15a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
import type { IUser } from '@rocket.chat/core-typings';
22
import type { Updater } from '@rocket.chat/models';
3+
import type { ClientSession } from 'mongodb';
34

45
import { saveCustomFieldsWithoutValidation } from './saveCustomFieldsWithoutValidation';
56
import { validateCustomFields } from './validateCustomFields';
67
import { trim } from '../../../../lib/utils/stringUtils';
78
import { settings } from '../../../settings/server';
89

9-
export const saveCustomFields = async function (userId: string, formData: Record<string, any>, _updater?: Updater<IUser>): Promise<void> {
10+
export const saveCustomFields = async function (
11+
userId: string,
12+
formData: Record<string, any>,
13+
options?: { _updater?: Updater<IUser>; session?: ClientSession },
14+
): Promise<void> {
1015
if (trim(settings.get('Accounts_CustomFields')).length === 0) {
1116
return;
1217
}
1318

1419
validateCustomFields(formData);
15-
return saveCustomFieldsWithoutValidation(userId, formData, _updater);
20+
return saveCustomFieldsWithoutValidation(userId, formData, options);
1621
};

apps/meteor/app/lib/server/functions/saveUser/saveUser.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { Apps, AppEvents } from '@rocket.chat/apps';
22
import { isUserFederated } from '@rocket.chat/core-typings';
33
import type { IUser, IRole, IUserSettings, RequiredField } from '@rocket.chat/core-typings';
44
import { Users } from '@rocket.chat/models';
5-
import { Accounts } from 'meteor/accounts-base';
65
import { Meteor } from 'meteor/meteor';
76
import type { ClientSession } from 'mongodb';
87

@@ -152,7 +151,6 @@ const _saveUser = (session?: ClientSession) =>
152151
}
153152

154153
if (userData.customFields) {
155-
// pass session to side effects
156154
await saveCustomFields(userData._id, userData.customFields, { _updater: updater, session });
157155
}
158156

0 commit comments

Comments
 (0)