Drop use of deprecated getUniqueFileName

  * Switched to getUniqueSecureFilePath which is the recommended
    function here
  * See: https://github.com/TryGhost/Ghost-Storage-Base/blob/c78655b1cd54c93b53327bc8e1cf3123c085ebd2/BaseStorage.js#L131

Author: maquchizi

index.js

@@ -64,20 +64,18 @@ class ObjectStoreStorage extends StorageBase {
   async save(file, targetDir) {
     // NOTE: the base implementation of `getTargetDir` returns the format this.storagePath/YYYY/MM
     const storagePath = targetDir || this.getTargetDir(this.storagePath);
-
-    // NOTE: getUniqueFileName is deprecated in v1.1.1 of ghost-storage-base, it is recommended to use getUniqueSecureFilePath instead.
-    // See: https://github.com/TryGhost/Ghost-Storage-Base/blob/c78655b1cd54c93b53327bc8e1cf3123c085ebd2/BaseStorage.js#L131
-    // However, calling that method results in files being corrupted in Object Store.
-    //
-    // TODO: Figure out why getUniqueSecureFilePath corrupts files and switch to using it.
-    const fileName = await this.getUniqueFileName(file, storagePath);
-
+    const fileName = await this.getUniqueSecureFilePath(file, storagePath);
     const objectKey = fileName.replace(/\\/g, '/');
 
+    // The file object contains metadata but not the actual file content
+    // We need to read the file from the filesystem path to get the content
+    const fs = require('fs').promises;
+    const fileContent = await fs.readFile(file.path);
+
     const command = new PutObjectCommand({
       Bucket: this.bucket,
       Key: objectKey,
-      Body: file.contents || file.path,
+      Body: fileContent,
       ContentType: file.type
     });
 

test/index.spec.js

@@ -58,41 +58,48 @@ describe('ObjectStoreStorage', () => {
   });
 
   describe('save', () => {
-    it('should save a file to Object Store and return the URL', async () => {
-      const mockFile = {
-        contents: Buffer.from('test content'),
-        type: 'image/jpeg',
-        path: '/local/path/to/file.jpg'
-      };
+    let fs;
+    const mockFile = {
+      fieldname: 'file',
+      originalname: '0-umnaaktb3eos233i.png',
+      encoding: '7bit',
+      mimetype: 'image/png',
+      destination: '/tmp',
+      filename: '3bab289aad1a167c811b5767350facdf',
+      path: '/tmp/3bab289aad1a167c811b5767350facdf',
+      size: 7158,
+      name: '0-umnaaktb3eos233i.png',
+      type: 'image/png',
+      ext: '.png'
+    };
 
-      const mockUniqueFileName = 'test-file-123.jpg';
-      const mockUrl = '/test-file-123.jpg';
+    beforeEach(() => {
+      fs = require('fs');
+      fs.promises.readFile = jest.fn();
+    });
 
-      // Mock the getUniqueFileName method to return a test filename
-      objectStoreStorage.getUniqueFileName = jest.fn().mockResolvedValue(mockUniqueFileName);
+    it('should save a file to Object Store and return the URL', async () => {
+      const mockFileContent = Buffer.from('test file content');
 
-      // Mock the S3 client send to resolve with successful response
+      fs.promises.readFile.mockResolvedValue(mockFileContent);
+      objectStoreStorage.getUniqueSecureFilePath = jest.fn().mockResolvedValue(mockFile.name);
       mockS3Client.send.mockResolvedValue({});
 
       const result = await objectStoreStorage.save(mockFile, '/images');
 
-      expect(objectStoreStorage.getUniqueFileName).toHaveBeenCalledWith(mockFile, '/images');
+      expect(fs.promises.readFile).toHaveBeenCalledWith(mockFile.path);
+      expect(objectStoreStorage.getUniqueSecureFilePath).toHaveBeenCalledWith(mockFile, '/images');
       expect(mockS3Client.send).toHaveBeenCalledWith(expect.any(PutObjectCommand));
-      expect(result).toBe(mockUrl);
+
+      expect(result).toBe(`/${mockFile.name}`);
     });
 
     it('should handle save errors properly', async () => {
-      const mockFile = {
-        contents: Buffer.from('test content'),
-        type: 'image/jpeg',
-        path: '/local/path/to/file.jpg'
-      };
-      const mockUniqueFileName = 'test-file-123.jpg';
-
-      // Mock the getUniqueFileName method to return a test filename
-      objectStoreStorage.getUniqueFileName = jest.fn().mockResolvedValue(mockUniqueFileName);
+      const mockFileContent = Buffer.from('test file content');
+      const mockUniqueFileName = 'test-file-123.png';
 
-      // Mock an error from the S3 client
+      fs.promises.readFile.mockResolvedValue(mockFileContent);
+      objectStoreStorage.getUniqueSecureFilePath = jest.fn().mockResolvedValue(mockUniqueFileName);
       mockS3Client.send.mockRejectedValue(new Error('Save failed'));
 
       await expect(objectStoreStorage.save(mockFile, '/images')).rejects.toThrow('Failed to save file to Object Store');