Skip to content

Commit 9e9e4a1

Browse files
committed
Fix oldUserData check
1 parent 02b0a26 commit 9e9e4a1

File tree

1 file changed

+8
-1
lines changed
  • apps/meteor/app/lib/server/functions/saveUser

1 file changed

+8
-1
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Apps, AppEvents } from '@rocket.chat/apps';
2+
import { MeteorError } from '@rocket.chat/core-services';
23
import { isUserFederated } from '@rocket.chat/core-typings';
34
import type { IUser, IRole, IUserSettings, RequiredField } from '@rocket.chat/core-typings';
45
import { Users } from '@rocket.chat/models';
@@ -86,11 +87,17 @@ const _saveUser = (session?: ClientSession) =>
8687
delete userData.setRandomPassword;
8788
}
8889

89-
if (!isUpdateUserData(userData) || !oldUserData) {
90+
if (!isUpdateUserData(userData)) {
9091
// TODO audit new users
9192
return saveNewUser(userData, sendPassword);
9293
}
9394

95+
if (!oldUserData) {
96+
throw new MeteorError('error-user-not-found', 'User not found', {
97+
method: 'saveUser',
98+
});
99+
}
100+
94101
options?.auditStore?.setOriginalUser(oldUserData);
95102

96103
await validateUserEditing(userId, userData);

0 commit comments

Comments
 (0)