[PB-6503] Update private sharings

src/app/drive/components/FileViewer/FileViewerWrapper.tsx

@@ -219,7 +219,7 @@ const FileViewerWrapper = ({
         abortController,
       },
       currentFile.credentials,
-      currentFile.mnemonic,
+      currentFile.key,
     );
   }
 

src/app/drive/components/FileViewer/viewers/FileVideoViewer/FileVideoViewer.tsx

@@ -90,7 +90,7 @@ const FileVideoViewer = ({
         bucketId: file.bucket,
         fileSize: file.size,
         fileType: file.type,
-        mnemonic: file.mnemonic ?? mnemonic,
+        key: file.key ?? { mnemonic },
         credentials: file.credentials
           ? { user: file.credentials?.user, pass: file.credentials?.pass }
           : { user: bridgeUser, pass: userId },

src/app/drive/services/download.service/fetchFileBlob.ts

@@ -1,7 +1,7 @@
 import { binaryStreamToBlob } from 'services/stream.service';
 import { Downloadable, downloadFile } from 'app/network/download';
 import { getEnvironmentConfig } from '../network.service';
-import { NetworkCredentials } from 'app/network/types/helper-types';
+import { FileKey, NetworkCredentials } from 'app/network/types/helper-types';
 
 type FetchFileBlobOptions = {
   updateProgressCallback: (progress: number) => void;
@@ -14,7 +14,7 @@ export default async function fetchFileBlob(
   item: Downloadable,
   options: FetchFileBlobOptions,
   credentials?: NetworkCredentials,
-  mnemonic?: string,
+  key?: FileKey,
 ): Promise<Blob> {
   const { bridgeUser, bridgePass, encryptionKey } = await getEnvironmentConfig(!!options.isWorkspace);
 
@@ -24,9 +24,7 @@ export default async function fetchFileBlob(
     bucketId: item.bucketId,
     fileId: item.fileId,
     creds,
-    key: {
-      mnemonic: mnemonic ? mnemonic : encryptionKey,
-    },
+    key: key ?? { mnemonic: encryptionKey },
     options: {
       notifyProgress: (totalBytes, downloadedBytes) => {
         options.updateProgressCallback(downloadedBytes / totalBytes);

src/app/drive/services/downloadManager.service.ts

@@ -337,6 +337,12 @@ export class DownloadManagerService {
       const failedItems: DownloadItemType[] = [];
       let downloadedProgress = 0;
 
+      const resolveItemKey = (driveItem: DownloadItemType): FileKey => {
+        const shareCredentials = (driveItem as AdvancedSharedItem).credentials;
+        if (shareCredentials?.bucketKey) return { bucketKey: shareCredentials.bucketKey };
+        return { mnemonic: shareCredentials?.mnemonic ?? credentials.key.mnemonic };
+      };
+
       items.forEach((_, index) => {
         downloadProgress[index] = 0;
         lastReportedBytes[index] = 0;
@@ -391,9 +397,7 @@ export class DownloadManagerService {
             user: (driveItem as AdvancedSharedItem).credentials?.networkUser ?? credentials.credentials.user,
             pass: (driveItem as AdvancedSharedItem).credentials?.networkPass ?? credentials.credentials.pass,
           },
-          key: {
-            mnemonic: (driveItem as AdvancedSharedItem).credentials?.mnemonic ?? credentials.key.mnemonic,
-          },
+          key: resolveItemKey(driveItem),
           options: {
             abortController,
             notifyProgress: notifyProgressCallback,
@@ -431,9 +435,7 @@ export class DownloadManagerService {
               user: (driveItem as AdvancedSharedItem).credentials?.networkUser ?? credentials.credentials.user,
               pass: (driveItem as AdvancedSharedItem).credentials?.networkPass ?? credentials.credentials.pass,
             },
-            key: {
-              mnemonic: (driveItem as AdvancedSharedItem).credentials?.mnemonic ?? credentials.key.mnemonic,
-            },
+            key: resolveItemKey(driveItem),
             workspaceId: credentials.workspaceId,
           },
           abortController,

src/app/drive/services/video-streaming.service/VideoStreamingSession.test.ts

@@ -16,7 +16,7 @@ const createConfig = (): VideoStreamingSessionConfig => ({
   bucketId: 'bucket-456',
   fileSize: 1000000,
   fileType: 'video/mp4',
-  mnemonic: 'test mnemonic',
+  key: { mnemonic: 'test mnemonic' },
   credentials: { user: 'user', pass: 'pass' },
 });
 

src/app/drive/services/video-streaming.service/VideoStreamingSession.ts

@@ -1,4 +1,4 @@
-import { NetworkCredentials } from 'app/network/types/helper-types';
+import { FileKey, NetworkCredentials } from 'app/network/types/helper-types';
 import { VideoSessionDestroyedError } from '../errors/video-streaming.errors';
 import { VideoStreamingService } from './index';
 
@@ -7,7 +7,7 @@ export interface VideoStreamingSessionConfig {
   bucketId: string;
   fileSize: number;
   fileType: string;
-  mnemonic: string;
+  key: FileKey;
   credentials: NetworkCredentials;
 }
 

src/app/drive/services/video-streaming.service/index.ts

@@ -52,7 +52,7 @@ export class VideoStreamingService {
       const stream = await downloadChunkFile({
         bucketId: this.config.bucketId,
         fileId: this.config.fileId,
-        key: { mnemonic: this.config.mnemonic },
+        key: this.config.key,
         creds: this.config.credentials,
         chunkStart: start,
         chunkEnd: end,

src/app/drive/services/video-streaming.service/video-streaming.service.test.ts

@@ -19,7 +19,7 @@ const createConfig = (): VideoStreamingSessionConfig => ({
   bucketId: 'bucket-456',
   fileSize: 1024000,
   fileType: 'video/mp4',
-  mnemonic: 'test mnemonic',
+  key: { mnemonic: 'test mnemonic' },
   credentials: { user: 'user', pass: 'pass' },
 });
 
@@ -45,7 +45,7 @@ describe('Video Streaming Service', () => {
         expect.objectContaining({
           bucketId: config.bucketId,
           fileId: config.fileId,
-          key: { mnemonic: config.mnemonic },
+          key: config.key,
           chunkStart: 0,
           chunkEnd: 1024,
         }),

src/app/network/NetworkFacade.test.ts

@@ -98,7 +98,7 @@ describe('NetworkFacade', () => {
       mockDownloadFile();
       vi.mocked(getFileHmacFromShardHashes).mockResolvedValue('any-hmac');
 
-      const result = await networkFacade.download(bucketId, fileId, mnemonic);
+      const result = await networkFacade.download(bucketId, fileId, { mnemonic });
 
       expect(result).toBeDefined();
       expect(buildProgressStream).toHaveBeenCalledOnce();
@@ -115,7 +115,7 @@ describe('NetworkFacade', () => {
         return new ReadableStream({ start: (c) => c.close() });
       });
 
-      await networkFacade.download(bucketId, fileId, mnemonic);
+      await networkFacade.download(bucketId, fileId, { mnemonic });
 
       await expect(capturedOnFinished?.()).resolves.toBeUndefined();
     });
@@ -130,7 +130,7 @@ describe('NetworkFacade', () => {
         return new ReadableStream({ start: (c) => c.close() });
       });
 
-      await networkFacade.download(bucketId, fileId, mnemonic);
+      await networkFacade.download(bucketId, fileId, { mnemonic });
 
       await expect(capturedOnFinished?.()).rejects.toThrow('File integrity check failed');
     });
@@ -139,7 +139,7 @@ describe('NetworkFacade', () => {
       mockDownloadFile();
       vi.mocked(getFileHmacFromShardHashes).mockResolvedValue('any-hmac');
 
-      await networkFacade.download(bucketId, fileId, mnemonic);
+      await networkFacade.download(bucketId, fileId, { mnemonic });
 
       expect(createSha256HashingStream).toHaveBeenCalledOnce();
     });
@@ -154,7 +154,7 @@ describe('NetworkFacade', () => {
         return new ReadableStream({ start: (c) => c.close() });
       });
 
-      await networkFacade.download(bucketId, fileId, mnemonic);
+      await networkFacade.download(bucketId, fileId, { mnemonic });
       await capturedOnFinished?.();
 
       expect(getFileHmacFromShardHashes).toHaveBeenCalledWith(fakeKey, [fakeRipemd160Hash]);
@@ -186,7 +186,7 @@ describe('NetworkFacade', () => {
       );
       vi.mocked(decryptStream).mockReturnValue(mockDecryptedStream);
 
-      const result = await networkFacade.downloadChunk({ bucketId, fileId, mnemonic, chunkStart, chunkEnd });
+      const result = await networkFacade.downloadChunk({ bucketId, fileId, key: { mnemonic }, chunkStart, chunkEnd });
 
       expect(result).toStrictEqual(mockDecryptedStream);
 
@@ -215,9 +215,9 @@ describe('NetworkFacade', () => {
         },
       );
 
-      await expect(networkFacade.downloadChunk({ bucketId, fileId, mnemonic, chunkStart, chunkEnd })).rejects.toThrow(
-        new DownloadFailedWithUnknownError(mockResponse.status),
-      );
+      await expect(
+        networkFacade.downloadChunk({ bucketId, fileId, key: { mnemonic }, chunkStart, chunkEnd }),
+      ).rejects.toThrow(new DownloadFailedWithUnknownError(mockResponse.status));
     });
 
     test('When there is no body in the response, then an error indicating so is thrown', async () => {
@@ -233,9 +233,9 @@ describe('NetworkFacade', () => {
         },
       );
 
-      await expect(networkFacade.downloadChunk({ bucketId, fileId, mnemonic, chunkStart, chunkEnd })).rejects.toThrow(
-        NoContentReceivedError,
-      );
+      await expect(
+        networkFacade.downloadChunk({ bucketId, fileId, key: { mnemonic }, chunkStart, chunkEnd }),
+      ).rejects.toThrow(NoContentReceivedError);
     });
 
     it('When the download is aborted, then an DownloadAbortedByUserError error is thrown', async () => {
@@ -251,7 +251,7 @@ describe('NetworkFacade', () => {
         networkFacade.downloadChunk({
           bucketId,
           fileId,
-          mnemonic,
+          key: { mnemonic },
           chunkStart,
           chunkEnd,
           options: {
@@ -338,7 +338,7 @@ describe('NetworkFacade', () => {
       mockDownloadFileWithBucketKey();
       vi.mocked(getFileHmacFromShardHashes).mockResolvedValue('any-hmac');
 
-      const result = await networkFacade.downloadWithBucketKey(bucketId, fileId, bucketKey);
+      const result = await networkFacade.download(bucketId, fileId, { bucketKey });
 
       expect(result).toBeDefined();
       expect(downloadFileWithBucketKey).toHaveBeenCalledWith(
@@ -362,7 +362,7 @@ describe('NetworkFacade', () => {
       mockDownloadFileWithBucketKey();
       vi.mocked(getFileHmacFromShardHashes).mockResolvedValue('any-hmac');
 
-      const result = await networkFacade.downloadWithBucketKey(bucketId, fileId, bucketKey);
+      const result = await networkFacade.download(bucketId, fileId, { bucketKey });
 
       expect(result).toBeDefined();
       expect(buildProgressStream).toHaveBeenCalledOnce();
@@ -379,7 +379,7 @@ describe('NetworkFacade', () => {
         return new ReadableStream({ start: (c) => c.close() });
       });
 
-      await networkFacade.downloadWithBucketKey(bucketId, fileId, bucketKey);
+      await networkFacade.download(bucketId, fileId, { bucketKey });
 
       await expect(capturedOnFinished?.()).resolves.toBeUndefined();
     });
@@ -394,7 +394,7 @@ describe('NetworkFacade', () => {
         return new ReadableStream({ start: (c) => c.close() });
       });
 
-      await networkFacade.downloadWithBucketKey(bucketId, fileId, bucketKey);
+      await networkFacade.download(bucketId, fileId, { bucketKey });
 
       await expect(capturedOnFinished?.()).rejects.toThrow('File integrity check failed');
     });
@@ -403,7 +403,7 @@ describe('NetworkFacade', () => {
       mockDownloadFileWithBucketKey();
       vi.mocked(getFileHmacFromShardHashes).mockResolvedValue('any-hmac');
 
-      await networkFacade.downloadWithBucketKey(bucketId, fileId, bucketKey);
+      await networkFacade.download(bucketId, fileId, { bucketKey });
 
       expect(createSha256HashingStream).toHaveBeenCalledOnce();
     });
@@ -418,7 +418,7 @@ describe('NetworkFacade', () => {
         return new ReadableStream({ start: (c) => c.close() });
       });
 
-      await networkFacade.downloadWithBucketKey(bucketId, fileId, bucketKey);
+      await networkFacade.download(bucketId, fileId, { bucketKey });
       await capturedOnFinished?.();
 
       expect(getFileHmacFromShardHashes).toHaveBeenCalledWith(fakeKey, [fakeRipemd160Hash]);
@@ -435,7 +435,7 @@ describe('NetworkFacade', () => {
         return new ReadableStream({ start: (c) => c.close() });
       });
 
-      await networkFacade.downloadWithBucketKey(bucketId, fileId, bucketKey, { key: overrideKey });
+      await networkFacade.download(bucketId, fileId, { bucketKey }, { key: overrideKey });
       await capturedOnFinished?.();
 
       expect(getFileHmacFromShardHashes).toHaveBeenCalledWith(overrideKey, [fakeRipemd160Hash]);
@@ -445,7 +445,7 @@ describe('NetworkFacade', () => {
       mockDownloadFileWithBucketKey();
       vi.mocked(getFileHmacFromShardHashes).mockResolvedValue('any-hmac');
 
-      await networkFacade.downloadWithBucketKey(bucketId, fileId, bucketKey, { token: 'test-token' });
+      await networkFacade.download(bucketId, fileId, { bucketKey }, { token: 'test-token' });
 
       expect(downloadFileWithBucketKey).toHaveBeenCalledWith(
         fileId,
@@ -464,7 +464,7 @@ describe('NetworkFacade', () => {
       mockDownloadFileWithBucketKey();
       vi.mocked(getFileHmacFromShardHashes).mockResolvedValue('any-hmac');
 
-      await networkFacade.downloadWithBucketKey(bucketId, fileId, bucketKey);
+      await networkFacade.download(bucketId, fileId, { bucketKey });
 
       expect(downloadFileWithBucketKey).toHaveBeenCalledWith(
         fileId,
@@ -497,9 +497,15 @@ describe('NetworkFacade', () => {
         return { body: new ReadableStream() };
       });
 
-      await expect(
-        networkFacade.downloadWithBucketKey(bucketId, fileId, bucketKey, { abortController }),
-      ).rejects.toThrow('Download aborted');
+      await expect(networkFacade.download(bucketId, fileId, { bucketKey }, { abortController })).rejects.toThrow(
+        'Download aborted',
+      );
     });
   });
+
+  test('When neither mnemonic nor bucketKey is provided, throws', async () => {
+    await expect(
+      networkFacade.downloadChunk({ bucketId, fileId, key: {}, chunkStart: 2, chunkEnd: 5 } as any),
+    ).rejects.toThrow('No bucket key or mnemonic is given');
+  });
 });