Skip to content

Commit 2eecc76

Browse files
fix: Version endpoints not returning JSON in all-in-one Docker deployment (#7079)
1 parent 9f1d4ec commit 2eecc76

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

frontend/api/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ app.get('/config/project-overrides', (req, res) => {
7676
? '/api/v1/'
7777
: process.env.FLAGSMITH_API_URL,
7878
},
79+
{
80+
name: 'apiProxyEnabled',
81+
value: !!process.env.FLAGSMITH_PROXY_API_URL,
82+
},
7983
{ name: 'maintenance', value: envToBool('ENABLE_MAINTENANCE_MODE', false) },
8084
{
8185
name: 'flagsmithClientAPI',

frontend/common/services/useBuildVersion.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ export const buildVersionService = service
1313
providesTags: () => [{ id: 'BuildVersion', type: 'BuildVersion' }],
1414
queryFn: async (args, _, _2, baseQuery) => {
1515
try {
16-
const backendVersionUrl =
17-
Project.api === '/api/v1/'
18-
? '/_backend_version'
19-
: `${Project.api.replace('api/v1/', '')}version/`
16+
const backendVersionUrl = Project.apiProxyEnabled
17+
? '/_backend_version'
18+
: `${Project.api.replace('api/v1/', '')}version/`
2019
const [frontendRes, backendRes] = await Promise.all([
2120
data.get(`/version`).catch(() => ({})),
2221
data.get(backendVersionUrl),

0 commit comments

Comments
 (0)