[PB-4520]: feat/migrate-storage-endpoints

package.json

@@ -9,7 +9,7 @@
     "@internxt/css-config": "^1.0.3",
     "@internxt/inxt-js": "=1.2.21",
     "@internxt/lib": "^1.2.0",
-    "@internxt/sdk": "=1.9.23",
+    "@internxt/sdk": "=1.9.28",
     "@internxt/ui": "^0.0.23",
     "@phosphor-icons/react": "^2.1.7",
     "@popperjs/core": "^2.11.6",
@@ -25,6 +25,7 @@
     "axios": "^1.8.2",
     "bip39": "^3.0.3",
     "browserify-zlib": "^0.2.0",
+    "browserslist": "^4.25.0",
     "copy-to-clipboard": "^3.3.1",
     "crypto-browserify": "^3.12.0",
     "crypto-js": "4.1.1",
@@ -66,7 +67,7 @@
     "react-international-phone": "^4.3.0",
     "react-live-chat-loader": "^2.8.2",
     "react-loading-skeleton": "^2.2.0",
-    "react-pdf": "^7.7.3",
+    "react-pdf": "^9.2.1",
     "react-popper": "^2.3.0",
     "react-redux": "^7.2.4",
     "react-router-dom": "^5.3.4",
@@ -146,9 +147,8 @@
     "@types/react-window": "^1.8.8",
     "@types/streamsaver": "^2.0.1",
     "@types/wicg-file-system-access": "^2020.9.4",
-    "@vitejs/plugin-react": "=4.5.1",
+    "@vitejs/plugin-react": "=4.5.2",
     "@vitest/coverage-istanbul": "^2.1.6",
-    "asmcrypto.js": "git+https://github.com/asmcrypto/asmcrypto.js.git",
     "autoprefixer": "^10.4.16",
     "buffer": "^6.0.3",
     "cross-env": "^7.0.3",
@@ -173,7 +173,7 @@
     "webpack-bundle-analyzer": "^4.9.1"
   },
   "engines": {
-    "node": ">=14.17.0 < 21"
+    "node": ">=14.17.0"
   },
   "lint-staged": {
     "*.{js,jsx,tsx,ts}": [

src/App.tsx

@@ -45,7 +45,7 @@ import { manager } from './app/utils/dnd-utils';
 import useBeforeUnload from './hooks/useBeforeUnload';
 import useVpnAuth from './hooks/useVpnAuth';
 
-pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;
+pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.mjs`;
 
 interface AppProps {
   isAuthenticated: boolean;

src/app/backups/hooks/useBackupDeviceActions.ts

@@ -1,6 +1,6 @@
 import { DriveFolderData } from '@internxt/sdk/dist/drive/storage/types';
 import { Device } from 'app/backups/types';
-import { deleteBackupDeviceAsFolder } from 'app/drive/services/folder.service';
+import backupsService from '../services/backups.service';
 import { DriveItemData, DriveFolderData as DriveWebFolderData } from 'app/drive/types';
 import { AppDispatch } from 'app/store';
 import { useAppSelector } from 'app/store/hooks';
@@ -79,7 +79,7 @@ export const useBackupDeviceActions = (
         dispatch(backupsThunks.deleteDeviceThunk(selectedDevice));
       } else {
         await dispatch(deleteItemsThunk([selectedDevice as DriveItemData])).unwrap();
-        await deleteBackupDeviceAsFolder(selectedDevice as DriveWebFolderData);
+        await backupsService.deleteBackupDeviceAsFolder((selectedDevice as DriveWebFolderData).uuid);
         dispatch(backupsThunks.fetchDevicesThunk());
       }
     }

src/app/backups/services/backups.service.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it, Mock, vi } from 'vitest';
+import backupsService from './backups.service';
+import { SdkFactory } from '../../core/factory/sdk';
+
+vi.mock('../../core/factory/sdk', () => ({
+    SdkFactory: {
+        getNewApiInstance: vi.fn(),
+    },
+}));
+
+describe('backupsService', () => {
+    describe('deleteBackupDeviceAsFolder', () => {
+        const mockFolderId = 'test-folder-id';
+
+        it('should call deleteBackupDeviceAsFolder with the correct folderId', async () => {
+            const mockResponse = vi.fn().mockResolvedValue({});
+            const mockStorageClient = { deleteBackupDeviceAsFolder: mockResponse };
+            (SdkFactory.getNewApiInstance as Mock).mockReturnValue({
+                createBackupsClient: () => mockStorageClient,
+            });
+
+            await backupsService.deleteBackupDeviceAsFolder(mockFolderId);
+
+            expect(mockStorageClient.deleteBackupDeviceAsFolder).toHaveBeenCalledWith(mockFolderId);
+        });
+    });
+});

src/app/backups/services/backups.service.ts

@@ -15,7 +15,7 @@ const backupsService = {
   async getAllDevicesAsFolders(): Promise<DriveFolderData[]> {
     const backupsClient = SdkFactory.getNewApiInstance().createBackupsClient();
     const encryptedFolders = await backupsClient.getAllDevicesAsFolder();
-    return encryptedFolders.map(mapBackupFolder);
+    return encryptedFolders.filter((folder) => !folder.deleted).map(mapBackupFolder);
   },
 
   async getAllBackups(mac: string): Promise<DeviceBackup[]> {
@@ -41,6 +41,11 @@ const backupsService = {
     const backupsClient = SdkFactory.getNewApiInstance().createBackupsClient();
     return backupsClient.deleteBackupDevice(device.id);
   },
+
+  deleteBackupDeviceAsFolder(folderId: string) {
+    const backupsClient = SdkFactory.getNewApiInstance().createBackupsClient();
+    return backupsClient.deleteBackupDeviceAsFolder(folderId);
+  }
 };
 
 export default backupsService;

src/app/backups/views/BackupsView/BackupsView.tsx

@@ -8,10 +8,10 @@ import WarningMessageWrapper from '../../../drive/components/WarningMessage/Warn
 import BackupsAsFoldersList from '../../components/BackupsAsFoldersList/BackupsAsFoldersList';
 import DeviceList from '../../components/DeviceList/DeviceList';
 import FileViewerWrapper from '../../../drive/components/FileViewer/FileViewerWrapper';
-import { deleteBackupDeviceAsFolder } from '../../../drive/services/folder.service';
+import newStorageService from '../../../drive/services/new-storage.service';
 import { deleteFile } from '../../../drive/services/file.service';
 import { deleteItemsThunk } from '../../../store/slices/storage/storage.thunks/deleteItemsThunk';
-import { DriveFolderData as DriveWebFolderData, DriveItemData } from '../../../drive/types';
+import { DriveItemData } from '../../../drive/types';
 import { DriveFolderData } from '@internxt/sdk/dist/drive/storage/types';
 import { contextMenuSelectedBackupItems } from '../../../drive/components/DriveExplorer/DriveExplorerList/DriveItemContextMenu';
 import { useBackupListActions } from 'app/backups/hooks/useBackupListActions';
@@ -84,7 +84,7 @@ export default function BackupsView(): JSX.Element {
     const filteredCurrentItems = currentItems.filter((item) => !selectedItemsIDs.has(item.id));
     try {
       const deletePromises = selectedItems.map((item) =>
-        item.isFolder ? deleteBackupDeviceAsFolder(item as DriveWebFolderData) : deleteFile(item),
+        item.isFolder ? newStorageService.deleteFolderByUuid(item.uuid) : deleteFile(item),
       );
       await Promise.all(deletePromises);
       dispatch(deleteItemsThunk(selectedItems));

src/app/core/factory/sdk/index.ts

@@ -61,13 +61,6 @@ export class SdkFactory {
     return Auth.client(apiUrl, appDetails, apiSecurity);
   }
 
-  public createStorageClient(): Storage {
-    const apiUrl = this.getApiUrl();
-    const appDetails = SdkFactory.getAppDetails();
-    const apiSecurity = this.getApiSecurity();
-    return Storage.client(apiUrl, appDetails, apiSecurity);
-  }
-
   public createNewStorageClient(): Storage {
     const apiUrl = this.getApiUrl();
     const appDetails = SdkFactory.getAppDetails();

src/app/drive/components/DeleteBackupDialog/DeleteBackupDialog.tsx

@@ -4,12 +4,11 @@ import { useAppDispatch, useAppSelector } from 'app/store/hooks';
 import { RootState } from 'app/store';
 import { DriveFolderData as DriveWebFolderData, DriveItemData } from '../../types';
 import { deleteItemsThunk } from '../../../store/slices/storage/storage.thunks/deleteItemsThunk';
-import { deleteBackupDeviceAsFolder } from '../../../drive/services/folder.service';
 import { backupsThunks } from 'app/store/slices/backups';
-import { SdkFactory } from '../../../core/factory/sdk';
 import { DriveFolderData } from '@internxt/sdk/dist/drive/storage/types';
 import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
 import { Dialog } from '@internxt/ui';
+import backupsService from 'app/backups/services/backups.service';
 
 interface DeleteBackupDialogProps {
   backupsAsFoldersPath: DriveFolderData[];
@@ -35,7 +34,7 @@ const DeleteBackupDialog = (props: DeleteBackupDialogProps): JSX.Element => {
         if (currentDevice && 'mac' in currentDevice) dispatch(backupsThunks.deleteDeviceThunk(currentDevice));
         else {
           await dispatch(deleteItemsThunk([currentDevice as DriveItemData])).unwrap();
-          await deleteBackupDeviceAsFolder(currentDevice as DriveWebFolderData);
+          await backupsService.deleteBackupDeviceAsFolder((currentDevice as DriveWebFolderData).uuid);
           await dispatch(backupsThunks.fetchDevicesThunk());
         }
         onClose();
@@ -45,8 +44,7 @@ const DeleteBackupDialog = (props: DeleteBackupDialogProps): JSX.Element => {
       }
     } else {
       try {
-        const storageClient = SdkFactory.getInstance().createStorageClient();
-        await storageClient.deleteFolder(currentBackupsAsFoldersPath.id);
+        await backupsService.deleteBackupDeviceAsFolder(currentBackupsAsFoldersPath.uuid);
         await dispatch(backupsThunks.fetchDevicesThunk());
         onClose();
         props.goToFolder(previousBackupsAsFoldersPath.id);

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

@@ -57,7 +57,7 @@ const DEFAULT_ZOOM = 1;
 
 const FilePdfViewer = (props: FormatFileViewerProps): JSX.Element => {
   const { translate } = useTranslationContext();
-  const [fileUrl] = useState(URL.createObjectURL(props.blob));
+  const [fileUrl] = useState(URL.createObjectURL(new Blob([props.blob], { type: 'application/pdf' })));
   const [numPages, setNumPages] = useState<number>(0);
   const [currentPage, setCurrentPage] = useState(1);
   const [zoom, setZoom] = useState(DEFAULT_ZOOM);
@@ -92,7 +92,7 @@ const FilePdfViewer = (props: FormatFileViewerProps): JSX.Element => {
   }, [currentPage, numPages]);
 
   return (
-    <div className="flex max-h-full w-full items-center justify-center pt-20">
+    <div className="flex max-h-full w-full items-center justify-center">
       <div>
         <div className="flex items-center justify-center">
           <Document file={fileUrl} loading="" onLoadSuccess={onDocumentLoadSuccess}>

src/app/drive/services/file.service/index.ts

@@ -1,7 +1,6 @@
 import { StorageTypes } from '@internxt/sdk/dist/drive';
 import { FileMeta } from '@internxt/sdk/dist/drive/storage/types';
 import { t } from 'i18next';
-import * as uuid from 'uuid';
 import { SdkFactory } from '../../../core/factory/sdk';
 import errorService from '../../../core/services/error.service';
 import { DriveFileData, DriveFileMetadataPayload } from '../../types';
@@ -18,32 +17,6 @@
   return storageClient.updateFileNameWithUUID(payload, resourcesToken);
 }
 
-export async function moveFile(
-  fileId: string,
-  destination: number,
-  bucketId: string,
-): Promise<StorageTypes.MoveFileResponse> {
-  const storageClient = SdkFactory.getInstance().createStorageClient();
-  const payload: StorageTypes.MoveFilePayload = {
-    fileId: fileId,
-    destination: destination,
-    bucketId: bucketId,
-    destinationPath: uuid.v4(),
-  };
-  return storageClient
-    .moveFile(payload)
-    .then((response) => {
-      return response;
-    })
-    .catch((error) => {
-      const castedError = errorService.castError(error);
-      if (castedError.status) {
-        castedError.message = t(`tasks.move-file.errors.${castedError.status}`);
-      }
-      throw castedError;
-    });
-}
-
 export async function moveFileByUuid(fileUuid: string, destinationFolderUuid: string): Promise<StorageTypes.FileMeta> {
   const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
   const payload: StorageTypes.MoveFileUuidPayload = {
@@ -65,8 +38,8 @@
 }
 
 export async function deleteFile(fileData: DriveFileData): Promise<void> {
-  const storageClient = SdkFactory.getInstance().createStorageClient();
-  await storageClient.deleteFile({ fileId: fileData.id, folderId: fileData.folderId });
+  const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+  await storageClient.deleteFileByUuid(fileData.uuid);
 }
 
 async function fetchRecents(limit: number): Promise<StorageTypes.DriveFileData[]> {
@@ -75,7 +48,7 @@
 }
 
 async function fetchDeleted(): Promise<DriveFileData[]> {
   const trashClient = SdkFactory.getNewApiInstance().createTrashClient();
 
   const trashRequest = trashClient.getTrash();
 
@@ -94,7 +67,6 @@
 
 const fileService = {
   updateMetaData,
-  moveFile,
   moveFileByUuid,
   fetchRecents,
   uploadFile,

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

@@ -95,28 +95,6 @@ export interface DownloadFolderAsZipOptions {
   workspaceId?: string;
 }
 
-export function createFolder(
-  currentFolderId: number,
-  folderName: string,
-): [Promise<StorageTypes.CreateFolderResponse>, RequestCanceler] {
-  const payload: StorageTypes.CreateFolderPayload = {
-    parentFolderId: currentFolderId,
-    folderName: folderName,
-  };
-  const storageClient = SdkFactory.getInstance().createStorageClient();
-  const [createdFolderPromise, requestCanceler] = storageClient.createFolder(payload);
-
-  const finalPromise = createdFolderPromise
-    .then((response) => {
-      return response;
-    })
-    .catch((error) => {
-      throw errorService.castError(error);
-    });
-
-  return [finalPromise, requestCanceler];
-}
-
 export function createFolderByUuid(
   parentFolderUuid: string,
   plainName: string,
@@ -159,11 +137,6 @@ export async function deleteFolder(folderData: DriveFolderData): Promise<void> {
   await trashClient.deleteFolder(folderData.id);
 }
 
-export async function deleteBackupDeviceAsFolder(folderData: DriveFolderData): Promise<void> {
-  const storageClient = SdkFactory.getInstance().createStorageClient();
-  await storageClient.deleteFolder(folderData.id);
-}
-
 interface GetDirectoryFoldersResponse {
   folders: DriveFolderData[];
   last: boolean;
@@ -588,27 +561,6 @@ async function fetchFolderTree(folderUUID: string): Promise<{
   return { tree, folderDecryptedNames, fileDecryptedNames, size };
 }
 
-export async function moveFolder(folderId: number, destination: number): Promise<StorageTypes.MoveFolderResponse> {
-  const storageClient = SdkFactory.getInstance().createStorageClient();
-  const payload: StorageTypes.MoveFolderPayload = {
-    folderId: folderId,
-    destinationFolderId: destination,
-  };
-
-  return storageClient
-    .moveFolder(payload)
-    .then((response) => {
-      return response;
-    })
-    .catch((err) => {
-      const castedError = errorService.castError(err);
-      if (castedError.status) {
-        castedError.message = t(`tasks.move-folder.errors.${castedError.status}`);
-      }
-      throw castedError;
-    });
-}
-
 export async function moveFolderByUuid(
   folderUuid: string,
   destinationFolderUuid: string,
@@ -629,10 +581,8 @@ export async function moveFolderByUuid(
 }
 
 const folderService = {
-  createFolder,
   createFolderByUuid,
   updateMetaData,
-  moveFolder,
   moveFolderByUuid,
   fetchFolderTree,
   downloadFolderAsZip,