Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a5924086f4 |
@@ -297,26 +297,17 @@ jobs:
|
|||||||
tags: ${{ steps.tags.outputs.tags }}
|
tags: ${{ steps.tags.outputs.tags }}
|
||||||
|
|
||||||
deploy-test-node:
|
deploy-test-node:
|
||||||
needs: [detect-changes, build-auth-api, build-employee-api, build-transit-api, build-error-log-api, build-admin-ui, build-monitoring-ui]
|
needs:
|
||||||
if: ${{ always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') && gitea.event_name == 'push' }}
|
[
|
||||||
strategy:
|
detect-changes,
|
||||||
fail-fast: false
|
build-auth-api,
|
||||||
matrix:
|
build-employee-api,
|
||||||
include:
|
build-transit-api,
|
||||||
- name: auth-api
|
build-error-log-api,
|
||||||
need_job: build-auth-api
|
build-admin-ui,
|
||||||
- name: employee-api
|
build-monitoring-ui,
|
||||||
need_job: build-employee-api
|
]
|
||||||
- name: transit-api
|
if: ${{ always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') && gitea.event_name == 'push' && (gitea.ref_name == 'dev' || gitea.ref_name == 'main' || gitea.ref_name == 'develop' || gitea.ref_name == 'auth-api' || gitea.ref_name == 'employee-api' || gitea.ref_name == 'transit-api' || gitea.ref_name == 'error-log-api' || gitea.ref_name == 'admin-ui' || gitea.ref_name == 'monitoring-ui') }}
|
||||||
need_job: build-transit-api
|
|
||||||
- name: error-log-api
|
|
||||||
need_job: build-error-log-api
|
|
||||||
- name: admin-ui
|
|
||||||
need_job: build-admin-ui
|
|
||||||
- name: monitoring-ui
|
|
||||||
need_job: build-monitoring-ui
|
|
||||||
|
|
||||||
if: ${{ needs[matrix.value.need_job].result == 'success' }}
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ function verifyAdmin(req, res, next) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const payload = jwt.verify(auth.slice(7), JWT_SECRET);
|
const payload = jwt.verify(auth.slice(7), JWT_SECRET);
|
||||||
if (!payload?.isAdmin) {
|
if (!payload?.user.isAdmin) {
|
||||||
return res.status(403).json({ error: toFriendlyError(403) });
|
return res.status(403).json({ error: toFriendlyError(403) });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user