Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/api-deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ permissions:

on:
push:
branches: [main]
branches: [main, feature/clean-oauth-implementation]
paths:
- api/**
- .github/workflows/api-deploy-staging.yml
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
working-directory: api

- name: Build Docker container
run: docker build . -t ${{ vars.DOCKER_IMAGE }}
run: docker build --no-cache . -t ${{ vars.DOCKER_IMAGE }}
working-directory: api

- name: Stop and remove old Docker container
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/cms-deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ permissions:

on:
push:
branches: [main]
branches: [main, feature/clean-oauth-implementation]
paths:
- cms/**
- .github/workflows/cms-deploy-staging.yml
Expand Down Expand Up @@ -37,9 +37,6 @@ jobs:
- name: Create .env file
run: |
touch .env
echo VITE_AUTH0_CLIENT_ID="${{ secrets.VITE_AUTH0_CLIENT_ID }}" >> .env
echo VITE_AUTH0_DOMAIN="${{ vars.VITE_AUTH0_DOMAIN }}" >> .env
echo VITE_AUTH0_AUDIENCE="${{ vars.VITE_AUTH0_AUDIENCE }}" >> .env
echo VITE_APP_NAME="${{ vars.VITE_APP_NAME }}" >> .env
echo VITE_API_URL="${{ vars.VITE_API_URL }}" >> .env
echo VITE_CLIENT_APP_URL="${{ vars.VITE_CLIENT_APP_URL }}" >> .env
Expand All @@ -49,7 +46,7 @@ jobs:
working-directory: cms

- name: Build Docker container
run: docker build -f ./cms/Dockerfile . -t ${{ vars.DOCKER_IMAGE }}
run: docker build --no-cache -f ./cms/Dockerfile . -t ${{ vars.DOCKER_IMAGE }}
working-directory: ./

- name: Stop and remove old Docker container
Expand Down
1 change: 1 addition & 0 deletions api/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const config: Config = {
transform: {
"^.+\\.(t|j)s$": "ts-jest",
},
transformIgnorePatterns: ["/node_modules/(?!jose|jwks-rsa)/"],
moduleNameMapper: {
"^src/(.*)$": "<rootDir>/$1",
},
Expand Down
53 changes: 51 additions & 2 deletions api/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"class-transformer": "^0.5.1",
"class-validator": "^0.14.1",
"jsonwebtoken": "^9.0.2",
"jwks-rsa": "^4.0.1",
"minio": "^8.0.0",
"music-metadata": "^11.9.0",
"nano": "^10.1.4",
Expand Down
4 changes: 4 additions & 0 deletions api/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import * as winston from "winston";
import { QueryService } from "./endpoints/query.service";
import { QueryController } from "./endpoints/query.controller";
import { StorageStatusController } from "./endpoints/storageStatus.controller";
import { AuthIdentityService } from "./auth/auth-identity.service";
import { AuthGuard } from "./auth/auth.guard";

let winstonTransport: winston.transport;
if (!process.env.NODE_ENV || process.env.NODE_ENV === "development") {
Expand Down Expand Up @@ -63,6 +65,8 @@ if (!process.env.NODE_ENV || process.env.NODE_ENV === "development") {
SearchService,
QueryService,
ChangeRequestService,
AuthIdentityService,
AuthGuard,
],
})
export class AppModule {}
Loading
Loading