Skip to content

Commit 92315c4

Browse files
authored
fix: channels visibility (#239)
1 parent f4a755a commit 92315c4

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

src/modules/users/users.controller.ts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,20 +158,24 @@ export class UsersController {
158158
return response;
159159
}
160160

161-
private async shouldIncludeChannels(user?: User) {
162-
if (!user) {
161+
private async shouldIncludeChannels(
162+
currentUser?: User,
163+
requestedUser?: User,
164+
) {
165+
if (!currentUser) {
163166
return false;
164167
}
165-
if (user.roles.includes(Role.ADMIN)) {
168+
if (currentUser.roles.includes(Role.ADMIN)) {
166169
return true;
167170
}
168171
const mentorships = await this.mentorshipsService.findMentorshipsByUser(
169-
user._id,
172+
currentUser._id,
170173
);
171174
return mentorships.some(
172175
({ mentee, mentor, status }) =>
173176
status === Status.APPROVED &&
174-
(mentor?._id.equals(user._id) || mentee?._id.equals(user._id)),
177+
(mentor?._id.equals(requestedUser._id) ||
178+
mentee?._id.equals(requestedUser._id)),
175179
);
176180
}
177181

@@ -190,7 +194,10 @@ export class UsersController {
190194
throw new BadRequestException('User not found');
191195
}
192196
const { channels, email, ...user } = requestedUser;
193-
const showChannels = await this.shouldIncludeChannels(current);
197+
const showChannels = await this.shouldIncludeChannels(
198+
current,
199+
requestedUser,
200+
);
194201
const data = {
195202
...user,
196203
email: current?.roles?.includes(Role.ADMIN) ? email : undefined,

tslint.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"rules": {
88
"quotemark": [true, "single"],
99
"member-access": [false],
10+
"no-console": [false],
1011
"ordered-imports": [false],
1112
"max-line-length": [true, 150],
1213
"member-ordering": [false],

0 commit comments

Comments
 (0)