noah/noahspan-flying
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 8 Wiki Activity

133-read-role-returns-500-from-api #135

Merged
noah merged 3 commits from 133-read-role-returns-500-from-api into main 2026-05-20 23:10:54 -04:00
Conversation 0 Commits 3 Files Changed 4 +7 -9
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitea/workflows/build_and_test.yaml
View File

@@ -45,8 +45,8 @@ jobs:
- name: Build Client - name: Build Client
env: env:
VITE_API_URL: ${{ vars.VITE_API_URL }} VITE_API_URL: ${{ vars.VITE_API_URL }}
VITE_BASE_URL: ${{ vars.VITE_BASE_URL }} VITE_BASE_URL: ${{ case(inputs.environment_name === 'test', vars.VITE_BASE_URL_TEST, vars.VITE_BASE_URL_PROD) }}
VITE_CLIENT_ID: ${{ vars.VITE_CLIENT_ID }} VITE_CLIENT_ID: ${{ case(inputs.environment_name === 'test', vars.VITE_CLIENT_ID_TEST, vars.VITE_CLIENT_ID_PROD) }}
VITE_ISSUER_URI: ${{ vars.VITE_ISSUER_URI }} VITE_ISSUER_URI: ${{ vars.VITE_ISSUER_URI }}
VITE_TENANT_ID: ${{ vars.VITE_TENANT_ID }} VITE_TENANT_ID: ${{ vars.VITE_TENANT_ID }}
run: | run: |

6
.gitea/workflows/deploy.yaml
View File

@@ -21,11 +21,9 @@ jobs:
environment: ${{ inputs.environment_name }} environment: ${{ inputs.environment_name }}
steps: steps:
- name: Log in to Azure - name: Log in to Azure
uses: azure/login@v2 uses: azure/login@v3
with: with:
client-id: ${{ vars.AZURE_CLIENT_ID }} creds: '{"clientId":"${{ vars.AZURE_CLIENT_ID }}","clientSecret":"${{ secrets.AZURE_CLIENT_SECRET }}","subscriptionId":"${{ secrets.AZURE_SUBSCRIPTION_ID }}","tenantId":"${{ vars.AZURE_TENANT_ID }}"}'
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
tenant-id: ${{ vars.AZURE_TENANT_ID }}
- name: Azure CLI script - name: Azure CLI script
uses: azure/cli@v2 uses: azure/cli@v2

4
.gitea/workflows/pull_request.yaml
View File

@@ -8,8 +8,8 @@ jobs:
uses: ./.gitea/workflows/changes.yaml uses: ./.gitea/workflows/changes.yaml
build: build:
if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.client == 'true'}} if: ${{ needs.changes.outputs.api == 'true' || needs.changes.outputs.client == 'true'}}
name: build name: build-and-test
needs: needs:
- changes - changes
uses: ./.gitea/workflows/build_and_test.yaml uses: ./.gitea/workflows/build_and_test.yaml

2
api/src/log/log.interceptor.ts
View File

@@ -40,7 +40,7 @@ export class LogInterceptor implements NestInterceptor {
if (jwtPayload[rolesKeyName].includes('Flying.Read')) { if (jwtPayload[rolesKeyName].includes('Flying.Read')) {
if (data.entities) { if (data.entities) {
const logs = data.entities.map((entity) => limitData(data.entities)); const logs = data.entities.map((entity) => limitData(entity));
return { return {
entities: logs, entities: logs,