Skip to content

Commit b5e01b1

Browse files
author
James Cori
committed
Merge branch 'develop'
2 parents 4dd2518 + 1340d68 commit b5e01b1

10 files changed

+258
-203
lines changed

app.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ const app = express()
2222
// serve resources V5 API swagger definition
2323
app.use('/v5/resources/docs', swaggerUi.serve, swaggerUi.setup(resourcesAPISwaggerDoc))
2424

25-
app.use(cors())
25+
app.use(cors({
26+
// Allow browsers access pagination data in headers
27+
exposedHeaders: ['X-Page', 'X-Per-Page', 'X-Total', 'X-Total-Pages', 'X-Prev-Page', 'X-Next-Page']
28+
}))
2629
app.use(bodyParser.json())
2730
app.use(bodyParser.urlencoded({ extended: true }))
2831
app.set('port', config.PORT)

docs/swagger.yaml

+8-5
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ info:
66
77
88
GET/POST/DELETE `/Resources` endpoints can only be called from admins, via
9-
M2M, or users for whom there is at least one existing `Resource` where both
10-
`role.fullAccess` and `role.isActive` are `true`. Special Case: User can
11-
create/delte selfObtainable resource for its own.
9+
M2M, or users for whom there is at least one existing `Resource` where
10+
`role.fullReadAccess`, `role.fullWriteAccess` and `role.isActive` are `true`.
11+
Special Case: User can create/delte selfObtainable resource for its own.
1212
1313
`Resource Roles` POST and PUT endpoints can only be called from admins or
1414
via M2M.
@@ -493,7 +493,8 @@ definitions:
493493
type: object
494494
required:
495495
- name
496-
- fullAccess
496+
- fullReadccess
497+
- fullWriteAccess
497498
- isActive
498499
- selfObtainable
499500
properties:
@@ -504,7 +505,9 @@ definitions:
504505
name:
505506
type: string
506507
description: 'Unique resource role name, case in-sensitive'
507-
fullAccess:
508+
fullReadAccess:
509+
type: boolean
510+
fullWriteAccess:
508511
type: boolean
509512
isActive:
510513
type: boolean

0 commit comments

Comments
 (0)