diff --git a/api/src/paths/draft.ts b/api/src/paths/draft.ts index b478c21e95..dbd62494b8 100644 --- a/api/src/paths/draft.ts +++ b/api/src/paths/draft.ts @@ -1,6 +1,6 @@ import { RequestHandler } from 'express'; import { Operation } from 'express-openapi'; -import { PROJECT_ROLE, SYSTEM_ROLE } from '../constants/roles'; +import { SYSTEM_ROLE } from '../constants/roles'; import { getDBConnection } from '../database/db'; import { HTTP400 } from '../errors/http-error'; import { draftResponseObject } from '../openapi/schemas/draft'; @@ -11,17 +11,12 @@ import { getLogger } from '../utils/logger'; const defaultLog = getLogger('paths/draft'); export const PUT: Operation = [ - authorizeRequestHandler((req) => { + authorizeRequestHandler(() => { return { - or: [ + and: [ { - validSystemRoles: [SYSTEM_ROLE.SYSTEM_ADMIN, SYSTEM_ROLE.DATA_ADMINISTRATOR], + validSystemRoles: [SYSTEM_ROLE.SYSTEM_ADMIN, SYSTEM_ROLE.PROJECT_CREATOR, SYSTEM_ROLE.DATA_ADMINISTRATOR], discriminator: 'SystemRole' - }, - { - validProjectRoles: [PROJECT_ROLE.PROJECT_LEAD], - projectId: Number(req.params.projectId), - discriminator: 'ProjectRole' } ] }; @@ -30,17 +25,12 @@ export const PUT: Operation = [ ]; export const POST: Operation = [ - authorizeRequestHandler((req) => { + authorizeRequestHandler(() => { return { - or: [ + and: [ { - validSystemRoles: [SYSTEM_ROLE.SYSTEM_ADMIN, SYSTEM_ROLE.DATA_ADMINISTRATOR], + validSystemRoles: [SYSTEM_ROLE.SYSTEM_ADMIN, SYSTEM_ROLE.PROJECT_CREATOR, SYSTEM_ROLE.DATA_ADMINISTRATOR], discriminator: 'SystemRole' - }, - { - validProjectRoles: [PROJECT_ROLE.PROJECT_LEAD], - projectId: Number(req.params.projectId), - discriminator: 'ProjectRole' } ] };