From 3290e7397816ccc7cc5cde3f934f10ecaefca52e Mon Sep 17 00:00:00 2001 From: "Arthur E. Jones" Date: Mon, 11 Jul 2022 12:42:45 -0500 Subject: [PATCH] refactor: get server version via backend method Avoid touching the server directly. Maintains consistency with existing workflow and centralizes changes in the event that, for example, auth requirements change for this route. --- packages/desktop-client/src/components/Settings.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/desktop-client/src/components/Settings.js b/packages/desktop-client/src/components/Settings.js index c17f0d7..ff99427 100644 --- a/packages/desktop-client/src/components/Settings.js +++ b/packages/desktop-client/src/components/Settings.js @@ -477,17 +477,12 @@ function Version() { let [version, setVersion] = useState(''); useEffect(async () => { - const url = await send('get-server-url'); - if (!url || url.indexOf('not-configured') !== -1) return; + const { error, version } = await send('get-server-version'); - try { - const res = await fetch(url + '/info'); - if (!res.ok) return; - - const info = await res.json(); - setVersion((info && info.build.version) || ''); - } catch (e) { + if (error) { setVersion(''); + } else { + setVersion(version); } }, []);