Skip to content

Commit 64b84b0

Browse files
committed
Handle mahcine auth while cleansing Reviews
1 parent 392d70b commit 64b84b0

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

src/common/helper.js

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -556,24 +556,29 @@ function * postToBusApi (payload) {
556556

557557
/**
558558
* Function to remove metadata details from reviews for members who shouldn't see them
559-
* @param {Array} reviews
560-
* @param {Array} roles
559+
* @param {Array} reviews The reviews to remove metadata from
560+
* @param {Object} authUser The authenticated user details
561561
*/
562-
function cleanseReviews (reviews, roles) {
562+
function cleanseReviews (reviews, authUser) {
563563
const cleansedReviews = []
564564

565-
_.forEach(reviews, (review) => {
566-
const admin = _.filter(roles, role => role.toLowerCase() === 'Administrator'.toLowerCase())
567-
const copilot = _.filter(roles, role => role.toLowerCase() === 'Copilot'.toLowerCase())
565+
if (!authUser.scopes) {
566+
_.forEach(reviews, (review) => {
567+
const admin = _.filter(authUser.roles, role => role.toLowerCase() === 'Administrator'.toLowerCase())
568+
const copilot = _.filter(authUser.roles, role => role.toLowerCase() === 'Copilot'.toLowerCase())
568569

569-
// User is neither admin nor copilot
570-
if (admin.length === 0 && copilot.length === 0) {
571-
_.unset(review, 'metadata')
572-
}
570+
// User is neither admin nor copilot
571+
if (admin.length === 0 && copilot.length === 0) {
572+
_.unset(review, 'metadata')
573+
}
573574

574-
cleansedReviews.push(review)
575-
})
576-
return cleansedReviews
575+
cleansedReviews.push(review)
576+
})
577+
578+
return cleansedReviews
579+
} else {
580+
return reviews
581+
}
577582
}
578583

579584
module.exports = {

src/services/SubmissionService.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ function * listSubmissions (authUser, query) {
182182
const data = yield helper.fetchFromES(query, helper.camelize(table))
183183
data.rows = _.map(data.rows, (submission) => {
184184
if (submission.review) {
185-
submission.review = helper.cleanseReviews(submission.review, authUser.roles)
185+
submission.review = helper.cleanseReviews(submission.review, authUser)
186186
}
187187
return submission
188188
})

0 commit comments

Comments
 (0)