diff --git a/apps/devtool/.env.development b/apps/devtool/.env.development index d2cdad245..ffbb55e2e 100644 --- a/apps/devtool/.env.development +++ b/apps/devtool/.env.development @@ -2,5 +2,5 @@ NEXT_PUBLIC_AUTH_SERVER_URL=http://localhost:3005 NEXT_PUBLIC_ENGINE_SERVER_URL=http://localhost:3010 NEXT_PUBLIC_VAULT_SERVER_URL=http://localhost:3011 -NEXT_PUBLIC_LOCAL_DATA_STORE_URL=http://localhost:4200/api/data-store +NEXT_PUBLIC_LOCAL_DATA_STORE_URL=http://localhost:3025/api/data-store NEXT_PUBLIC_MANAGED_DATASTORE_BASE_URL=http://localhost:3005/data diff --git a/apps/devtool/project.json b/apps/devtool/project.json index 89161e072..a41881d12 100644 --- a/apps/devtool/project.json +++ b/apps/devtool/project.json @@ -21,7 +21,8 @@ "defaultConfiguration": "production", "options": { "buildTarget": "devtool:build", - "dev": true + "dev": true, + "port": 3025 }, "configurations": { "development": { diff --git a/apps/devtool/src/app/_lib/constants.ts b/apps/devtool/src/app/_lib/constants.ts index 51ce04904..fe6538da6 100644 --- a/apps/devtool/src/app/_lib/constants.ts +++ b/apps/devtool/src/app/_lib/constants.ts @@ -1,5 +1,5 @@ export const LOCAL_DATA_STORE_URL = - process.env.NEXT_PUBLIC_LOCAL_DATA_STORE_URL || 'http://localhost:4200/api/data-store' + process.env.NEXT_PUBLIC_LOCAL_DATA_STORE_URL || 'http://localhost:3025/api/data-store' export const AUTH_SERVER_URL = process.env.NEXT_PUBLIC_AUTH_SERVER_URL || 'https://auth.armory.narval.xyz' export const ENGINE_URL = process.env.NEXT_PUBLIC_ENGINE_SERVER_URL || 'http://localhost:3010' export const VAULT_URL = process.env.NEXT_PUBLIC_VAULT_SERVER_URL || 'https://vault.armory.narval.xyz' diff --git a/docker-compose.yml b/docker-compose.yml index 5802ca091..8aa055dee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -141,7 +141,7 @@ services: container_name: devtool command: ['/bin/bash', '-c', 'make devtool/start/dev'] ports: - - '4200:4200' + - '3025:3025' networks: - armory_stack volumes: diff --git a/packages/armory-sdk/src/lib/http/policy-engine.ts b/packages/armory-sdk/src/lib/http/policy-engine.ts index 8ec725818..b1b210374 100644 --- a/packages/armory-sdk/src/lib/http/policy-engine.ts +++ b/packages/armory-sdk/src/lib/http/policy-engine.ts @@ -59,7 +59,7 @@ export const sendEvaluationRequest = async ( const body = await signRequestPayload({ clientId, jwk, alg, signer }, request) const { data } = await axios.post( - `${engineHost}/evaluations`, + `${engineHost}/v1/evaluations`, SerializedEvaluationRequest.parse(body), { headers: { [HEADER_CLIENT_ID]: clientId } } ) diff --git a/packages/nestjs-shared/src/lib/util/with-api-version.util.ts b/packages/nestjs-shared/src/lib/util/with-api-version.util.ts index 2fb331b67..08bb690ef 100644 --- a/packages/nestjs-shared/src/lib/util/with-api-version.util.ts +++ b/packages/nestjs-shared/src/lib/util/with-api-version.util.ts @@ -3,9 +3,11 @@ import { VersionValue } from '@nestjs/common/interfaces' /** * Adds NestJS URI versionning to the application. + * * IMPORTANT: In order to work with Swagger, this function needs to be called * before withSwagger at app boostrap. - * https://github.com/nestjs/swagger/issues/1495 + * + * @see https://github.com/nestjs/swagger/issues/1495 * * @param app - The INestApplication instance. * @returns The modified INestApplication instance. @@ -15,6 +17,7 @@ export const withApiVersion = (params: { defaultVersion: VersionValue }) => (app: INestApplication): INestApplication => { app.enableVersioning({ + ...params, type: VersioningType.URI })