@@ -10,7 +10,6 @@ import {
10
10
SUBMITTER_ROLE_UUID ,
11
11
READ_ONLY_ROLES ,
12
12
ALLOWED_DOWNLOAD_SUBMISSIONS_ROLES ,
13
- ALLOWED_ACCEPT_PROJECT_ROLES ,
14
13
ALLOWED_EDIT_RESOURCE_ROLES
15
14
} from '../config/constants'
16
15
import _ from 'lodash'
@@ -195,13 +194,10 @@ export const checkEditResourceRoles = resourceRoles => {
195
194
* Checks if token has any of the admin roles
196
195
* @param token
197
196
*/
198
- export const checkAdmin = ( token , project ) => {
197
+ export const checkAdmin = ( token ) => {
199
198
const tokenData = decodeToken ( token )
200
199
const roles = _ . get ( tokenData , 'roles' )
201
- const isAdmin = roles . some ( val => ADMIN_ROLES . indexOf ( val . toLowerCase ( ) ) > - 1 )
202
- const canManageProject = ! project || _ . isEmpty ( project ) || ALLOWED_ACCEPT_PROJECT_ROLES . includes ( _ . get ( _ . find ( project . members , { userId : tokenData . userId } ) , 'role' ) )
203
-
204
- return isAdmin && canManageProject
200
+ return roles . some ( val => ADMIN_ROLES . indexOf ( val . toLowerCase ( ) ) > - 1 )
205
201
}
206
202
207
203
/**
@@ -224,11 +220,11 @@ export const checkCopilot = (token, project) => {
224
220
export const checkAdminOrCopilot = ( token , project ) => {
225
221
const tokenData = decodeToken ( token )
226
222
const roles = _ . get ( tokenData , 'roles' )
227
- const allowedRoles = [ ... ADMIN_ROLES , ... COPILOT_ROLES ]
228
- const isAdminOrCopilot = roles . some ( val => allowedRoles . indexOf ( val . toLowerCase ( ) ) > - 1 )
223
+ const isAdmin = roles . some ( val => ADMIN_ROLES . indexOf ( val . toLowerCase ( ) ) > - 1 )
224
+ const isCopilot = roles . some ( val => COPILOT_ROLES . indexOf ( val . toLowerCase ( ) ) > - 1 )
229
225
const canManageProject = ! project || _ . isEmpty ( project ) || ALLOWED_EDIT_RESOURCE_ROLES . includes ( _ . get ( _ . find ( project . members , { userId : tokenData . userId } ) , 'role' ) )
230
226
231
- return isAdminOrCopilot && canManageProject
227
+ return isAdmin || ( isCopilot && canManageProject )
232
228
}
233
229
234
230
/**
0 commit comments