File tree Expand file tree Collapse file tree 2 files changed +14
-6
lines changed Expand file tree Collapse file tree 2 files changed +14
-6
lines changed Original file line number Diff line number Diff line change @@ -158,20 +158,24 @@ export class UsersController {
158
158
return response ;
159
159
}
160
160
161
- private async shouldIncludeChannels ( user ?: User ) {
162
- if ( ! user ) {
161
+ private async shouldIncludeChannels (
162
+ currentUser ?: User ,
163
+ requestedUser ?: User ,
164
+ ) {
165
+ if ( ! currentUser ) {
163
166
return false ;
164
167
}
165
- if ( user . roles . includes ( Role . ADMIN ) ) {
168
+ if ( currentUser . roles . includes ( Role . ADMIN ) ) {
166
169
return true ;
167
170
}
168
171
const mentorships = await this . mentorshipsService . findMentorshipsByUser (
169
- user . _id ,
172
+ currentUser . _id ,
170
173
) ;
171
174
return mentorships . some (
172
175
( { mentee, mentor, status } ) =>
173
176
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 ) ) ,
175
179
) ;
176
180
}
177
181
@@ -190,7 +194,10 @@ export class UsersController {
190
194
throw new BadRequestException ( 'User not found' ) ;
191
195
}
192
196
const { channels, email, ...user } = requestedUser ;
193
- const showChannels = await this . shouldIncludeChannels ( current ) ;
197
+ const showChannels = await this . shouldIncludeChannels (
198
+ current ,
199
+ requestedUser ,
200
+ ) ;
194
201
const data = {
195
202
...user ,
196
203
email : current ?. roles ?. includes ( Role . ADMIN ) ? email : undefined ,
Original file line number Diff line number Diff line change 7
7
"rules" : {
8
8
"quotemark" : [true , " single" ],
9
9
"member-access" : [false ],
10
+ "no-console" : [false ],
10
11
"ordered-imports" : [false ],
11
12
"max-line-length" : [true , 150 ],
12
13
"member-ordering" : [false ],
You can’t perform that action at this time.
0 commit comments