Merge pull request #378 from susnux/fix/props

fix(types): correct types for quota bytes
perry-mitchell · Aug 2, 2024 · 16f1475 · 16f1475
2 parents e48fa0f + 8844a38
commit 16f1475
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/source/tools/dav.ts b/source/tools/dav.ts
@@ -237,7 +237,7 @@ export function parseSearch(result: DAVResult, searchArbiter: string, isDetailed
  * @returns The value in bytes, or another indicator
  */
 export function translateDiskSpace(value: string | number): DiskQuotaAvailable {
-    switch (value.toString()) {
+    switch (String(value)) {
         case "-3":
             return "unlimited";
         case "-2":
@@ -246,6 +246,6 @@ export function translateDiskSpace(value: string | number): DiskQuotaAvailable {
             // -1 is non-computed
             return "unknown";
         default:
-            return parseInt(value as string, 10);
+            return parseInt(String(value), 10);
     }
 }
diff --git a/source/tools/quota.ts b/source/tools/quota.ts
@@ -11,7 +11,8 @@ export function parseQuota(result: DAVResult): DiskQuota | null {
         } = responseItem;
         return typeof quotaUsed !== "undefined" && typeof quotaAvail !== "undefined"
             ? {
-                  used: parseInt(quotaUsed, 10),
+                  // As it could be both a string or a number ensure we are working with a number
+                  used: parseInt(String(quotaUsed), 10),
                   available: translateDiskSpace(quotaAvail)
               }
             : null;

diff --git a/source/types.ts b/source/types.ts
@@ -70,8 +70,8 @@ export interface DAVResultResponseProps {
     getetag?: string;
     getcontentlength?: string;
     getcontenttype?: string;
-    "quota-available-bytes"?: any;
-    "quota-used-bytes"?: string;
+    "quota-available-bytes"?: string | number;
+    "quota-used-bytes"?: string | number;
 
     [additionalProp: string]: unknown;
 }