Skip to content

Commit 064b4bb

Browse files
authored
fix: use-proxy-api-url-version-endpoint (#6743)
1 parent b98c31a commit 064b4bb

2 files changed

Lines changed: 22 additions & 2 deletions

File tree

frontend/api/index.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,22 @@ app.get('/version', (req, res) => {
208208
}
209209
})
210210

211+
if (process.env.FLAGSMITH_PROXY_API_URL) {
212+
app.get('/_backend_version', async (req, res) => {
213+
try {
214+
const response = await fetch(
215+
`${process.env.FLAGSMITH_PROXY_API_URL.replace(/\/?$/, '/')}version/`,
216+
)
217+
const data = await response.json()
218+
res.json(data)
219+
} catch (err) {
220+
// eslint-disable-next-line
221+
console.log('Unable to fetch backend version:', err)
222+
res.status(502).json({})
223+
}
224+
})
225+
}
226+
211227
app.use(bodyParser.json())
212228
app.use(spm)
213229
const genericWebsite = (url) => {

frontend/common/services/useBuildVersion.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ 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/`
1620
const [frontendRes, backendRes] = await Promise.all([
17-
data.get(`/version/`).catch(() => ({})),
18-
data.get(`${Project.api.replace('api/v1/', '')}version/`),
21+
data.get(`/version`).catch(() => ({})),
22+
data.get(backendVersionUrl),
1923
])
2024

2125
const frontend = (frontendRes || {}) as Version['frontend']

0 commit comments

Comments
 (0)