Skip to content

Commit 29380bf

Browse files
Return all resources for resources with fullAccess
1 parent 39fd741 commit 29380bf

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

src/services/ResourceService.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,26 @@ async function getResources (currentUser, challengeId, roleId, page, perPage) {
5959
const mustQuery = []
6060
page = page || 1
6161
perPage = perPage || config.DEFAULT_PAGE_SIZE
62+
let hasFullAccess
63+
64+
// Check if the user has a resource with full access on the challenge
65+
if (currentUser) {
66+
const resources = await helper.query('Resource', { challengeId })
67+
try {
68+
await checkAccess(currentUser, resources)
69+
hasFullAccess = true
70+
} catch (e) {
71+
hasFullAccess = false
72+
}
73+
}
6274

6375
boolQuery.push({ match_phrase: { challengeId } })
6476

6577
// logger.warn('User Check')
6678
if (!currentUser) {
6779
// if the user is not logged in, only return resources with submitter role ID
6880
boolQuery.push({ match_phrase: { roleId: config.SUBMITTER_RESOURCE_ROLE_ID } })
69-
} else if ((!currentUser.isMachine && !helper.hasAdminRole(currentUser))) {
81+
} else if (!currentUser.isMachine && !helper.hasAdminRole(currentUser) && !hasFullAccess) {
7082
// await checkAccess(currentUser, resources)
7183
// if not admin, and not machine, only return submitters + all my roles
7284
boolQuery.push({

0 commit comments

Comments
 (0)