Skip to content

Commit 0a97231

Browse files
committed
fix: restore scopes
Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>
1 parent 8b07c4b commit 0a97231

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'
@@ -30,7 +30,7 @@ export function v1Router(): Router {
3030
/^\/packages:batch-stewardship\/?$/,
3131
oauth2Middleware(AUTH0_CONFIG),
3232
packagesRateLimiter,
33-
requireScopes([SCOPES.READ_STEWARDSHIPS]),
33+
requireScopes([SCOPES.READ_PACKAGES, SCOPES.READ_STEWARDSHIPS], 'all'),
3434
safeWrap(batchGetStewardship),
3535
)
3636
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'
@@ -15,24 +15,11 @@ export function packagesRouter(): Router {
1515
const router = Router()
1616

1717
router.use(rateLimiter)
18+
router.use(requireScopes([SCOPES.READ_PACKAGES, SCOPES.READ_STEWARDSHIPS], 'all'))
1819

19-
router.get(
20-
'/',
21-
requireScopes([SCOPES.READ_PACKAGES, SCOPES.READ_STEWARDSHIPS], 'any'),
22-
safeWrap(listPackages),
23-
)
24-
25-
router.get(
26-
'/metrics',
27-
requireScopes([SCOPES.READ_PACKAGES, SCOPES.READ_STEWARDSHIPS], 'any'),
28-
safeWrap(getPackagesMetrics),
29-
)
30-
31-
router.get(
32-
'/detail',
33-
requireScopes([SCOPES.READ_PACKAGES, SCOPES.READ_STEWARDSHIPS], 'any'),
34-
safeWrap(getPackage),
35-
)
20+
router.get('/', safeWrap(listPackages))
21+
router.get('/metrics', safeWrap(getPackagesMetrics))
22+
router.get('/detail', safeWrap(getPackage))
3623

3724
return router
3825
}

0 commit comments

Comments
 (0)