use URLSearchParams to encode url params (#716)

esphome · Feb 11, 2025 · 08dfe26 · 08dfe26
1 parent 73cfc27
commit 08dfe26
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 21 deletions.
diff --git a/src/api/configuration.ts b/src/api/configuration.ts
@@ -30,13 +30,21 @@ export const createConfiguration = (params: CreateConfigParams) =>
     body: JSON.stringify(params),
   });
 
-export const getConfiguration = (configuration: string) =>
-  fetchApiJson<Configuration>(`./info?configuration=${configuration}`);
+export const getConfiguration = (configuration: string) => {
+  const urlSearchParams = new URLSearchParams({
+    configuration: configuration,
+  });
+  return fetchApiJson<Configuration>(`./info?${urlSearchParams.toString()}`);
+};
 
-export const deleteConfiguration = (configuration: string) =>
-  fetchApiText(`./delete?configuration=${configuration}`, {
+export const deleteConfiguration = (configuration: string) => {
+  const urlSearchParams = new URLSearchParams({
+    configuration: configuration,
+  });
+  return fetchApiText(`./delete?${urlSearchParams.toString()}`, {
     method: "post",
   });
+};
 
 export const compileConfiguration = (
   configuration: string,
@@ -62,7 +70,10 @@ export const getJsonConfig = async (
   filename: string,
 ): Promise<Record<string, any> | null> => {
   try {
-    return fetchApiJson(`./json-config?configuration=${filename}`);
+    const urlSearchParams = new URLSearchParams({
+      configuration: filename,
+    });
+    return fetchApiJson(`./json-config?${urlSearchParams.toString()}`);
   } catch (err) {
     if (err instanceof APIError && err.status === 404) {
       return null;

diff --git a/src/api/download.ts b/src/api/download.ts
@@ -7,19 +7,28 @@ export type DownloadType = {
   download: string;
 };
 
-export const getDownloadTypes = (configuration: string) =>
-  fetchApiJson<DownloadType[]>(
-    `./downloads?configuration=${encodeURIComponent(configuration)}`,
+export const getDownloadTypes = (configuration: string) => {
+  const urlSearchParams = new URLSearchParams({
+    configuration: configuration,
+  });
+  return fetchApiJson<DownloadType[]>(
+    `./downloads?${urlSearchParams.toString()}`,
   );
+};
 
-export const getDownloadUrl = (configuration: string, type: DownloadType) =>
-  `./download.bin?configuration=${encodeURIComponent(
-    configuration,
-  )}&file=${encodeURIComponent(type.file)}&download=${encodeURIComponent(
-    type.download,
-  )}`;
+export const getDownloadUrl = (configuration: string, type: DownloadType) => {
+  const urlSearchParams = new URLSearchParams({
+    configuration: configuration,
+    file: type.file,
+    download: type.download,
+  });
+  return `./download.bin?${urlSearchParams.toString()}`;
+};
 
-export const getFactoryDownloadUrl = (configuration: string) =>
-  `./download.bin?configuration=${encodeURIComponent(
-    configuration,
-  )}&file=firmware.factory.bin`;
+export const getFactoryDownloadUrl = (configuration: string) => {
+  const urlSearchParams = new URLSearchParams({
+    configuration: configuration,
+    file: "firmware.factory.bin",
+  });
+  return `./download.bin?${urlSearchParams.toString()}`;
+};
diff --git a/src/api/files.ts b/src/api/files.ts
@@ -3,7 +3,10 @@ import { APIError, fetchApiText } from ".";
 // null if file not found.
 export const getFile = async (filename: string): Promise<string | null> => {
   try {
-    return fetchApiText(`./edit?configuration=${filename}`);
+    const urlSearchParams = new URLSearchParams({
+      configuration: filename,
+    });
+    return fetchApiText(`./edit?${urlSearchParams.toString()}`);
   } catch (err) {
     if (err instanceof APIError && err.status === 404) {
       return null;
@@ -15,8 +18,12 @@ export const getFile = async (filename: string): Promise<string | null> => {
 export const writeFile = async (
   filename: string,
   content: string,
-): Promise<string> =>
-  fetchApiText(`./edit?configuration=${filename}`, {
+): Promise<string> => {
+  const urlSearchParams = new URLSearchParams({
+    configuration: filename,
+  });
+  return fetchApiText(`./edit?${urlSearchParams.toString()}`, {
     method: "POST",
     body: content,
   });
+};