diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index 7ee51f1..08bdad4 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -297,26 +297,17 @@ jobs: tags: ${{ steps.tags.outputs.tags }} 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] - if: ${{ always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') && gitea.event_name == 'push' }} - strategy: - fail-fast: false - matrix: - include: - - name: auth-api - need_job: build-auth-api - - name: employee-api - need_job: build-employee-api - - name: transit-api - 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' }} + needs: + [ + detect-changes, + build-auth-api, + build-employee-api, + build-transit-api, + build-error-log-api, + build-admin-ui, + build-monitoring-ui, + ] + 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') }} runs-on: ubuntu-latest steps: diff --git a/error_log_api/index.js b/error_log_api/index.js index 7dda828..b27b49e 100644 --- a/error_log_api/index.js +++ b/error_log_api/index.js @@ -58,7 +58,7 @@ function verifyAdmin(req, res, next) { try { const payload = jwt.verify(auth.slice(7), JWT_SECRET); - if (!payload?.isAdmin) { + if (!payload?.user.isAdmin) { return res.status(403).json({ error: toFriendlyError(403) }); }