update api query after 7.0 version

RocketChat · Nov 7, 2024 · 106f3a4 · 106f3a4
1 parent ba14487
commit 106f3a4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/servers/supportedVersions/main.ts b/src/servers/supportedVersions/main.ts
@@ -6,6 +6,7 @@ import { ipcMain } from 'electron';
 import jwt from 'jsonwebtoken';
 import moment from 'moment';
 import { coerce, satisfies } from 'semver';
+import semverGte from 'semver/functions/gte';
 
 import { dispatch, listen, select } from '../../store';
 import {
@@ -93,9 +94,14 @@ const getServerInfo = async (url: string): Promise<ServerInfo> => {
   return response.data;
 };
 
-const getUniqueId = async (url: string): Promise<string> => {
+const getUniqueId = async (url: string, version: string): Promise<string> => {
+  if (!url || !version) return '';
+  const serverUrl = semverGte(`${version}.0`, '7.0.0')
+    ? urls.server(url).uniqueId
+    : urls.server(url).setting('uniqueID');
+
   const response = await axios.get<{ settings: { value: string }[] }>(
-    urls.server(url).setting('uniqueID')
+    serverUrl
   );
   const value = response.data?.settings?.[0]?.value;
 
@@ -321,7 +327,7 @@ const updateSupportedVersionsData = async (
     .catch(logRequestError('server info'));
   if (!serverInfo) return;
 
-  const uniqueID = await getUniqueId(server.url)
+  const uniqueID = await getUniqueId(server.url, server.version || '')
     .then(dispatchUniqueIdUpdated(server.url))
     .catch(logRequestError('unique ID'));
 

diff --git a/src/urls.ts b/src/urls.ts
@@ -19,6 +19,7 @@ export const supportedVersions = ({
 
 export const server = <T extends string>(serverUrl: T) =>
   ({
+    uniqueId: `${serverUrl}/api/v1/settings.public?_id=uniqueID` as const,
     setting: (id: string) =>
       `${serverUrl}/api/v1/settings.public?query={"_id": ${JSON.stringify(
         id