Merge pull request #2189 from pekarja5/cache-loading-fix

Fixed JSON cache loading

Author: marekdedic

src/backend/utils/DriveBackedValue.ts

@@ -75,9 +75,9 @@ export class DriveBackedValue_<T> {
   }
 
   private getExistingDriveFileContents(fileId: string): T {
-    return JSON.parse(
-      this.driveService.Files.get(fileId, null, { alt: "media" as const }),
-    ) as T;
+    return this.driveService.Files.get(fileId, null, {
+      alt: "media" as const,
+    }) as T;
   }
 
   private getExistingDriveFileId(folderId: string): string | null {

src/backend/utils/SafeDriveService/SafeFilesCollection.ts

@@ -48,7 +48,8 @@ interface GetArg {
 type GetReturn<F extends DeepKeyof<SafeFile>, A extends GetArg> = A extends {
   alt: "media";
 }
-  ? string
+  ? // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Raw file can contain anything
+    any
   : DeepPick<SafeFile, F>;
 
 function fileIsSafe_<F extends DeepKeyof<SafeFile>>(
@@ -144,9 +145,13 @@ export const SafeFilesCollection_ = {
         fields: stringifyFields_(fields),
       }),
     });
-    if (typeof ret !== "string" && !fileIsSafe_(ret, fields)) {
+    if (
+      !("alt" in optionalArgs && optionalArgs.alt === "media") &&
+      !fileIsSafe_(ret, fields)
+    ) {
       throw new Error("Files.get: File is not safe.");
     }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return -- Raw file can contain anything
     return ret as unknown as GetReturn<F, A>;
   },
 

tests/backend/utils/DriveBackedValue.test.ts

@@ -377,9 +377,7 @@ test("DriveBackedValue loads a value - the folder exists, the value exists", ()
     ],
   };
   const driveServiceMock = mockedSafeDriveService();
-  vi.mocked(driveServiceMock.Files.get).mockReturnValueOnce(
-    JSON.stringify("VALUE"),
-  );
+  vi.mocked(driveServiceMock.Files.get).mockReturnValueOnce("VALUE");
   vi.mocked(driveServiceMock.Files.list)
     .mockReturnValueOnce(response1)
     .mockReturnValueOnce(response2);