diff --git a/.gitea/workflows/build_and_test.yaml b/.gitea/workflows/build_and_test.yaml index 792354f..355b148 100644 --- a/.gitea/workflows/build_and_test.yaml +++ b/.gitea/workflows/build_and_test.yaml @@ -45,8 +45,8 @@ jobs: - name: Build Client env: VITE_API_URL: ${{ vars.VITE_API_URL }} - VITE_BASE_URL: ${{ vars.VITE_BASE_URL }} - VITE_CLIENT_ID: ${{ vars.VITE_CLIENT_ID }} + VITE_BASE_URL: ${{ case(inputs.environment_name === 'test', vars.VITE_BASE_URL_TEST, vars.VITE_BASE_URL_PROD) }} + 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_TENANT_ID: ${{ vars.VITE_TENANT_ID }} run: | diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 9e87b02..47caf9b 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -21,11 +21,9 @@ jobs: environment: ${{ inputs.environment_name }} steps: - name: Log in to Azure - uses: azure/login@v2 + uses: azure/login@v3 with: - client-id: ${{ vars.AZURE_CLIENT_ID }} - subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - tenant-id: ${{ vars.AZURE_TENANT_ID }} + creds: '{"clientId":"${{ vars.AZURE_CLIENT_ID }}","clientSecret":"${{ secrets.AZURE_CLIENT_SECRET }}","subscriptionId":"${{ secrets.AZURE_SUBSCRIPTION_ID }}","tenantId":"${{ vars.AZURE_TENANT_ID }}"}' - name: Azure CLI script uses: azure/cli@v2 diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index b7fc872..8cb6fb5 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -8,8 +8,8 @@ jobs: uses: ./.gitea/workflows/changes.yaml build: - if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.client == 'true'}} - name: build + if: ${{ needs.changes.outputs.api == 'true' || needs.changes.outputs.client == 'true'}} + name: build-and-test needs: - changes uses: ./.gitea/workflows/build_and_test.yaml diff --git a/api/src/log/log.interceptor.ts b/api/src/log/log.interceptor.ts index 329cbc9..ff11858 100644 --- a/api/src/log/log.interceptor.ts +++ b/api/src/log/log.interceptor.ts @@ -40,7 +40,7 @@ export class LogInterceptor implements NestInterceptor { if (jwtPayload[rolesKeyName].includes('Flying.Read')) { if (data.entities) { - const logs = data.entities.map((entity) => limitData(data.entities)); + const logs = data.entities.map((entity) => limitData(entity)); return { entities: logs,