Merge pull request #9 from filecoin-project/fix/application-types

Fix application types
filecoin-project · Nov 24, 2023 · 243dee5 · 243dee5
2 parents 076c457 + da97c94
commit 243dee5
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/services/backendService.ts b/src/services/backendService.ts
@@ -55,9 +55,10 @@ export const getApplication = async (
       method: "GET",
       url: `${config.backendApi}/application/${appId}`,
     });
+    const application = response.data as Application | null;
+
     return {
-      application:
-        response.data.length > 0 ? (response.data[0] as Application) : null,
+      application,
       error: "",
       success: true,
     };

diff --git a/src/utils/utils.ts b/src/utils/utils.ts
@@ -15,13 +15,57 @@ const byteConverter = new ByteConverter();
  * @returns number
  */
 export function anyToBytes(inputDatacap: string): number {
+  const allowedExtensions = [
+    "b",
+    "B",
+    "kb",
+    "kB",
+    "Kib",
+    "KiB",
+    "Mb",
+    "MB",
+    "Mib",
+    "MiB",
+    "Gb",
+    "GB",
+    "Gib",
+    "GiB",
+    "Tb",
+    "TB",
+    "Tib",
+    "TiB",
+    "Pb",
+    "PB",
+    "Pib",
+    "PiB",
+    "Eb",
+    "EB",
+    "Eib",
+    "EiB",
+    "Zb",
+    "ZB",
+    "Zib",
+    "ZiB",
+    "Yb",
+    "YB",
+    "Yib",
+    "YiB",
+  ];
   const formatDc = inputDatacap
     .replace(/[t]/g, "T")
     .replace(/[b]/g, "B")
     .replace(/[p]/g, "P")
     .replace(/[I]/g, "i")
     .replace(/\s*/g, "");
   const ext = formatDc.replace(/[0-9.]/g, "");
+
+  if (!allowedExtensions.includes(ext)) {
+    throw new Error(
+      `Invalid datacap format. Allowed extensions are: ${allowedExtensions.join(
+        ", ",
+      )}`,
+    );
+  }
   const datacap = formatDc.replace(/[^0-9.]/g, "");
   const bytes = byteConverter.convert(parseFloat(datacap), ext, "B");
   return bytes;