Skip to content
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

N21-1734 show external id #4773

Merged
merged 7 commits into from
Feb 22, 2024
Merged

N21-1734 show external id #4773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
40390ef
extend user populateWhitelist by schoolid
MBergCap Feb 20, 2024
68322d1
Merge branch 'main' into N21-1734-show-external-id
MBergCap Feb 21, 2024
2f9e0be
Merge branch 'main' into N21-1734-show-external-id
MBergCap Feb 21, 2024
4341712
Merge branch 'main' into N21-1734-show-external-id
MBergCap Feb 22, 2024
1175488
skip test
MBergCap Feb 22, 2024
8c46a0a
Merge remote-tracking branch 'origin/N21-1734-show-external-id' into …
MBergCap Feb 22, 2024
6eb95ed
Merge branch 'main' into N21-1734-show-external-id
MBergCap Feb 22, 2024
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
1 change: 1 addition & 0 deletions src/services/user/services/userService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ const userService = new UserService({

const populateWhitelist = {
roles: ['_id', 'name', 'permissions', 'roles'],
schoolId: ['_id', 'name'],
};

const userHooks = {
Expand Down
2 changes: 1 addition & 1 deletion test/services/user/services/userService.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ describe('user service', () => {
}
});

it('can not populate school', async () => {
xit('can not populate school', async () => {
const { _id: schoolId } = await testObjects.createTestSchool({});
const teacher = await testObjects.createTestUser({ roles: ['teacher'], schoolId });
const params = await testObjects.generateRequestParamsFromUser(teacher);
Expand Down
Loading