Skip to content

Commit 65d8016

Browse files
committed
fix: restore scopes
Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>
1 parent c1159dd commit 65d8016

2 files changed

Lines changed: 7 additions & 20 deletions

File tree

backend/src/api/public/v1/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { NotFoundError } from '@crowd/common'
44

55
import { createRateLimiter } from '@/api/apiRateLimiter'
66
import { safeWrap } from '@/middlewares/errorMiddleware'
7-
87
import { SCOPES } from '@/security/scopes'
8+
99
import { AUTH0_CONFIG } from '../../../conf'
1010
import { oauth2Middleware } from '../middlewares/oauth2Middleware'
1111
import { requireScopes } from '../middlewares/requireScopes'
@@ -34,7 +34,7 @@ export function v1Router(): Router {
3434
/^\/packages:batch-stewardship\/?$/,
3535
oauth2Middleware(AUTH0_CONFIG),
3636
packagesRateLimiter,
37-
requireScopes([SCOPES.READ_STEWARDSHIPS]),
37+
requireScopes([SCOPES.READ_PACKAGES, SCOPES.READ_STEWARDSHIPS], 'all'),
3838
safeWrap(batchGetStewardship),
3939
)
4040
router.use('/packages', oauth2Middleware(AUTH0_CONFIG), packagesRouter())

backend/src/api/public/v1/packages/index.ts

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { Router } from 'express'
33
import { createRateLimiter } from '@/api/apiRateLimiter'
44
import { requireScopes } from '@/api/public/middlewares/requireScopes'
55
import { safeWrap } from '@/middlewares/errorMiddleware'
6-
76
import { SCOPES } from '@/security/scopes'
7+
88
import { getPackage } from './getPackage'
99
import { getPackagesMetrics } from './getPackagesMetrics'
1010
import { listPackages } from './listPackages'
@@ -20,24 +20,11 @@ export function packagesRouter(): Router {
2020
const router = Router()
2121

2222
router.use(rateLimiter)
23+
router.use(requireScopes([SCOPES.READ_PACKAGES, SCOPES.READ_STEWARDSHIPS], 'all'))
2324

24-
router.get(
25-
'/',
26-
requireScopes([SCOPES.READ_PACKAGES, SCOPES.READ_STEWARDSHIPS], 'any'),
27-
safeWrap(listPackages),
28-
)
29-
30-
router.get(
31-
'/metrics',
32-
requireScopes([SCOPES.READ_PACKAGES, SCOPES.READ_STEWARDSHIPS], 'any'),
33-
safeWrap(getPackagesMetrics),
34-
)
35-
36-
router.get(
37-
'/detail',
38-
requireScopes([SCOPES.READ_PACKAGES, SCOPES.READ_STEWARDSHIPS], 'any'),
39-
safeWrap(getPackage),
40-
)
25+
router.get('/', safeWrap(listPackages))
26+
router.get('/metrics', safeWrap(getPackagesMetrics))
27+
router.get('/detail', safeWrap(getPackage))
4128

4229
return router
4330
}

0 commit comments

Comments
 (0)