Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change DevTool port to 3025 #566

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Change DevTool port to 3025 #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34101ea
Change DevTool port to 3025
wcalderipe Oct 23, 2024
a59e55e
Fix DevTool policy engine endpoint
wcalderipe Oct 23, 2024
627c8eb
Fix withApiVersion function
wcalderipe Oct 23, 2024
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
2 changes: 1 addition & 1 deletion apps/devtool/.env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion apps/devtool/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"defaultConfiguration": "production",
"options": {
"buildTarget": "devtool:build",
"dev": true
"dev": true,
"port": 3025
},
"configurations": {
"development": {
Expand Down
2 changes: 1 addition & 1 deletion apps/devtool/src/app/_lib/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion packages/armory-sdk/src/lib/http/policy-engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export const sendEvaluationRequest = async (
const body = await signRequestPayload({ clientId, jwk, alg, signer }, request)

const { data } = await axios.post<SendEvaluationResponse>(
`${engineHost}/evaluations`,
`${engineHost}/v1/evaluations`,
SerializedEvaluationRequest.parse(body),
{ headers: { [HEADER_CLIENT_ID]: clientId } }
)
Expand Down
5 changes: 4 additions & 1 deletion packages/nestjs-shared/src/lib/util/with-api-version.util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -15,6 +17,7 @@ export const withApiVersion =
(params: { defaultVersion: VersionValue }) =>
(app: INestApplication): INestApplication => {
app.enableVersioning({
...params,
type: VersioningType.URI
})

Expand Down