Skip to content

Commit fbc995e

Browse files
fix: explicitly select user password for update checks and fetch test users by username for integration tests.
1 parent 1fc4a82 commit fbc995e

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

src/service/api/user/me.patch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const PATCH_Me = async (req: Request, res: Response): Promise<void> => {
7171
const protectedFields = Configuration.get("user.profile.update.protected-fields");
7272
const hasProtectedFields = protectedFields.some((field: string) => req.body[field] !== undefined);
7373
if (hasProtectedFields) {
74-
const user = await UserModel.findById(userId).exec();
74+
const user = await UserModel.findById(userId).select("+password").exec();
7575
if (!user) {
7676
res.status(statusCodes.unauthorized).json(new ErrorResponse(errorMessages.unauthorized));
7777
return;

test/integration/utils/records.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,23 @@ export const setupUsers = async () => {
3232
console.error(err);
3333
}
3434

35-
const users = await UserModel.find({});
36-
35+
const user1 = await UserModel.findOne({ username: mockData.users.user1.username });
3736
const user1password = MemoryStore.users.user1.password;
38-
(MemoryStore.users.user1 as any) = users[0];
37+
(MemoryStore.users.user1 as any) = user1;
3938
MemoryStore.users.user1.password = user1password;
4039
MemoryStore.users.user1._id = (MemoryStore.users.user1._id as any).toString();
4140
MemoryStore.users.user1.scope = ["*"];
4241

42+
const user2 = await UserModel.findOne({ username: mockData.users.user2.username });
4343
const user2password = MemoryStore.users.user2.password;
44-
(MemoryStore.users.user2 as any) = users[1];
44+
(MemoryStore.users.user2 as any) = user2;
4545
MemoryStore.users.user2.password = user2password;
4646
MemoryStore.users.user2._id = (MemoryStore.users.user2._id as any).toString();
4747
MemoryStore.users.user2.scope = ["*"];
4848

49+
const user3 = await UserModel.findOne({ username: mockData.users.user3.username });
4950
const user3password = MemoryStore.users.user3.password;
50-
(MemoryStore.users.user3 as any) = users[2];
51+
(MemoryStore.users.user3 as any) = user3;
5152
MemoryStore.users.user3.password = user3password;
5253
MemoryStore.users.user3._id = (MemoryStore.users.user3._id as any).toString();
5354
MemoryStore.users.user3.scope = ["*"];

0 commit comments

Comments
 (0)