Skip to content

Commit e7e314a

Browse files
Merge pull request #49 from StreetSupport/feature/3017-create-location-specific-content-management-system
3017 - Push yml file to check tests on pull request
2 parents 96ee881 + e9bd6cb commit e7e314a

File tree

3 files changed

+41
-4
lines changed

3 files changed

+41
-4
lines changed

.github/workflows/azure-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set up Node.js version
3131
uses: actions/setup-node@v3
3232
with:
33-
node-version: '20.x'
33+
node-version: 24
3434

3535
- name: Setup Sentry
3636
run: |
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Test
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- staging
7+
- main
8+
push:
9+
branches:
10+
- staging
11+
- main
12+
13+
jobs:
14+
test:
15+
name: test
16+
runs-on: ubuntu-latest
17+
permissions:
18+
contents: read
19+
20+
steps:
21+
- name: Checkout repository
22+
uses: actions/checkout@v4
23+
24+
- name: Setup Node.js
25+
uses: actions/setup-node@v4
26+
with:
27+
node-version: 24
28+
cache: 'npm'
29+
30+
- name: Install dependencies
31+
run: npm install
32+
33+
- name: Run ESLint
34+
run: npm run lint
35+
36+
- name: Run tests
37+
run: npm run test

src/middleware/authMiddleware.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,7 +1625,7 @@ export const requireLocationLogoAccess = asyncHandler(async (req: Request, res:
16251625
if (locationSlug) {
16261626
// Check if CityAdmin has access to this location
16271627
const locations = [locationSlug];
1628-
if (validateSwepAndCityAdminLocationsAccess(userAuthClaims, locations, res)) {
1628+
if (validateCityAdminLocationsAccess(userAuthClaims, locations, res)) {
16291629
return; // Access denied, response already sent
16301630
}
16311631
}
@@ -1675,10 +1675,10 @@ export const requireLocationLogoByFiltersAccess = (req: Request, res: Response,
16751675
// For location-based access, check the location and locations param
16761676
const locations = extractLocationsFromQuery(req);
16771677

1678-
if (validateSwepAndCityAdminLocationsAccess(userAuthClaims, locations, res)) {
1678+
if (validateCityAdminLocationsAccess(userAuthClaims, locations, res)) {
16791679
return; // Access denied, response already sent
16801680
}
1681-
1681+
16821682
next();
16831683
};
16841684

0 commit comments

Comments
 (0)