diff --git a/apps/server-nestjs/src/modules/nexus/nexus-client.service.spec.ts b/apps/server-nestjs/src/modules/nexus/nexus-client.service.spec.ts index 9b2d296ae..7a3e0f165 100644 --- a/apps/server-nestjs/src/modules/nexus/nexus-client.service.spec.ts +++ b/apps/server-nestjs/src/modules/nexus/nexus-client.service.spec.ts @@ -4,6 +4,7 @@ import { Test } from '@nestjs/testing' import { http, HttpResponse } from 'msw' import { setupServer } from 'msw/node' import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest' +import { mockDeep } from 'vitest-mock-extended' import { ConfigurationService } from '../infrastructure/configuration/configuration.service' import { NexusClientService } from './nexus-client.service' import { NexusHttpClientService } from './nexus-http-client.service' @@ -21,13 +22,14 @@ function createNexusServiceTestingModule() { NexusHttpClientService, { provide: ConfigurationService, - useValue: { + useValue: mockDeep({ nexusSecretExposedUrl: 'https://nexus.example', nexusInternalUrl: nexusUrl, nexusAdmin: 'admin', nexusAdminPassword, projectRootDir: 'forge', - } satisfies Partial, + getInternalOrPublicNexusUrl: () => nexusUrl, + } satisfies Partial), }, ], }) diff --git a/apps/server-nestjs/src/modules/nexus/nexus-http-client.service.ts b/apps/server-nestjs/src/modules/nexus/nexus-http-client.service.ts index 45908d3e1..7853f6607 100644 --- a/apps/server-nestjs/src/modules/nexus/nexus-http-client.service.ts +++ b/apps/server-nestjs/src/modules/nexus/nexus-http-client.service.ts @@ -76,10 +76,11 @@ export class NexusHttpClientService { } private get baseUrl() { - if (!this.config.nexusInternalUrl) { - throw new NexusError('NotConfigured', 'NEXUS_INTERNAL_URL is required') + const url = this.config.getInternalOrPublicNexusUrl() + if (!url) { + throw new NexusError('NotConfigured', 'NEXUS_INTERNAL_URL or NEXUS_URL is required') } - return this.config.nexusInternalUrl + return url } private get apiBaseUrl() {