[PB-6542] Add new sharings

.github/workflows/pr-size-control.yml

@@ -1,14 +1,31 @@
-name: PR Size Checker
-on: pull_request
+name: PR Size Check
+on:
+  pull_request:
+    types: [opened, synchronize]
+
 jobs:
   check_pr_size:
-    name: Check PR size doesn't break set limit
     runs-on: ubuntu-latest
+    name: Check PR Size
+    timeout-minutes: 1
+
     steps:
-      # checkout your code with your git history
-      - uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: maidsafe/pr_size_checker@v2
-        with:
-          max_lines_changed: 500
+
+      - name: Get lines changed
+        run: |
+          LINES=$(git diff --shortstat origin/${{ github.base_ref }}...HEAD -- . ':!package.json' ':!yarn.lock' | awk '{print $4 + $6}')
+          echo "Lines changed: $LINES"
+          echo "LINES_CHANGED=$LINES" >> $GITHUB_ENV
+
+      - name: Fail if PR is too big
+        run: |
+          if [ "$LINES_CHANGED" -gt 500 ]; then
+            echo "::error::Large PR ($LINES_CHANGED lines). Please break it down into smaller PRs."
+            exit 1
+          else
+            echo "PR size OK ($LINES_CHANGED lines)"
+          fi

package.json

@@ -8,7 +8,7 @@
     "@headlessui/react": "^2.2.10",
     "@iconscout/react-unicons": "^1.1.6",
     "@internxt/css-config": "1.1.0",
-    "@internxt/lib": "1.4.1",
+    "@internxt/lib": "1.4.2",
     "@internxt/sdk": "=1.17.12",
     "@internxt/ui": "=0.1.21",
     "@phosphor-icons/react": "^2.1.7",

src/app/drive/components/ShareDialog/hooks/useShareItemActions.test.ts

@@ -7,6 +7,7 @@ import errorService from 'services/error.service';
 import { ItemToShare } from 'app/store/slices/storage/types';
 import envService from 'services/env.service';
 import { copyTextToClipboard } from 'utils/copyToClipboard.utils';
+import { SharingMeta } from '@internxt/sdk/dist/drive/share/types';
 
 const { mockActionDispatch, mockUseShareDialogContext, mockTranslate, mockDispatch } = vi.hoisted(() => ({
   mockActionDispatch: vi.fn(),
@@ -49,9 +50,9 @@ describe('Share Item Actions', () => {
   const mockSharingMeta = {
     id: 'sharing-id-123',
     encryptedCode: 'encrypted-code',
-    token: 'share-token',
-    code: 'share-code',
-  };
+    itemToken: 'share-token',
+    encryptionAlgorithm: 'encryption-algorithm',
+  } as SharingMeta;
 
   beforeEach(() => {
     vi.clearAllMocks();
@@ -143,9 +144,7 @@ describe('Share Item Actions', () => {
         },
         dispatch: mockActionDispatch,
       });
-      const getPublicShareLinkSpy = vi
-        .spyOn(shareService, 'getPublicShareLink')
-        .mockResolvedValue(mockSharingMeta as any);
+      const getPublicShareLinkSpy = vi.spyOn(shareService, 'getPublicShareLink').mockResolvedValue(mockSharingMeta);
 
       const itemToShare = createItemToShare(false);
       const { result } = renderHook(() =>
@@ -243,9 +242,7 @@ describe('Share Item Actions', () => {
         },
         dispatch: mockActionDispatch,
       });
-      const saveSharingPasswordSpy = vi
-        .spyOn(shareService, 'saveSharingPassword')
-        .mockResolvedValue(mockSharingMeta as any);
+      const saveSharingPasswordSpy = vi.spyOn(shareService, 'saveSharingPassword').mockResolvedValue(mockSharingMeta);
 
       const itemToShare = createItemToShare(true);
       const { result } = renderHook(() =>
@@ -260,17 +257,23 @@ describe('Share Item Actions', () => {
 
       await result.current.onSavePublicSharePassword('my-password');
 
-      expect(saveSharingPasswordSpy).toHaveBeenCalledWith('sharing-id-123', 'my-password', 'encrypted-code');
+      expect(saveSharingPasswordSpy).toHaveBeenCalledWith(
+        'sharing-id-123',
+        'my-password',
+        'encrypted-code',
+        'encryption-algorithm',
+      );
       expect(mockActionDispatch).toHaveBeenCalledWith(
         expect.objectContaining({ type: 'SET_IS_PASSWORD_PROTECTED', payload: true }),
       );
       expect(mockOnShareItem).toHaveBeenCalled();
     });
 
     test('When sharing info does not exist, then creates new public share with password', async () => {
+      const plainCode = 'test plain code';
       const createPublicShareFromOwnerUserSpy = vi
         .spyOn(shareService, 'createPublicShareFromOwnerUser')
-        .mockResolvedValue(mockSharingMeta as any);
+        .mockResolvedValue({ publicSharingItemData: mockSharingMeta, plainCode });
 
       const itemToShare = createItemToShare(false);
       const { result } = renderHook(() =>
@@ -285,7 +288,9 @@ describe('Share Item Actions', () => {
 
       await result.current.onSavePublicSharePassword('my-password');
 
-      expect(createPublicShareFromOwnerUserSpy).toHaveBeenCalledWith('item-uuid-123', 'file', 'my-password');
+      expect(createPublicShareFromOwnerUserSpy).toHaveBeenCalledWith('item-uuid-123', 'file', {
+        plainPassword: 'my-password',
+      });
       expect(mockActionDispatch).toHaveBeenCalledWith(
         expect.objectContaining({ type: 'SET_SHARING_META', payload: mockSharingMeta }),
       );

src/app/drive/components/ShareDialog/hooks/useShareItemActions.ts

@@ -98,11 +98,19 @@ export const useShareItemActions = ({
         let sharingInfo = sharingMeta;
 
         if (sharingInfo?.encryptedCode) {
-          await shareService.saveSharingPassword(sharingInfo.id, plainPassword, sharingInfo.encryptedCode);
+          await shareService.saveSharingPassword(
+            sharingInfo.id,
+            plainPassword,
+            sharingInfo.encryptedCode,
+            sharingInfo.encryptionAlgorithm,
+          );
         } else {
           const itemType = itemToShare?.item.isFolder ? 'folder' : 'file';
           const itemId = itemToShare?.item.uuid ?? '';
-          sharingInfo = await shareService.createPublicShareFromOwnerUser(itemId, itemType, plainPassword);
+          const { publicSharingItemData } = await shareService.createPublicShareFromOwnerUser(itemId, itemType, {
+            plainPassword,
+          });
+          sharingInfo = publicSharingItemData;
           actionDispatch(setSharingMeta(sharingInfo));
         }
 

src/app/drive/components/ShareDialog/hooks/useShareItemUserRoles.test.ts

@@ -5,6 +5,7 @@ import shareService from 'app/share/services/share.service';
 import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
 import errorService from 'services/error.service';
 import { ItemToShare } from 'app/store/slices/storage/types';
+import { SharingMeta, UpdateUserRoleResponse } from '@internxt/sdk/dist/drive/share/types';
 
 const { mockDispatch, mockUseShareDialogContext, mockTranslate } = vi.hoisted(() => ({
   mockDispatch: vi.fn(),
@@ -22,10 +23,19 @@ vi.mock('../context/ShareDialogContextProvider', () => ({
 
 const mockSharingMeta = {
   id: 'sharing-id-123',
+  itemId: 'sharing-itempid',
+  itemType: 'file',
+  encryptionKey: 'encrypted-key',
   encryptedCode: 'encrypted-code',
-  token: 'share-token',
-  code: 'share-code',
-};
+  encryptedPassword: null,
+  itemToken: 'share-token',
+  encryptionAlgorithm: 'inxt-v3',
+  type: 'public',
+} as SharingMeta;
+
+const mockUpdateUserRoleResponse = {
+  message: 'mock-update-user-role-response',
+} as UpdateUserRoleResponse;
 
 const mockRoles = [
   { id: '1', name: 'OWNER', createdAt: new Date('2024-01-01'), updatedAt: new Date('2024-01-01') },
@@ -130,11 +140,11 @@ describe('Share Items User Roles', () => {
     });
 
     test('When changing to public mode for file, then updates sharing type and creates public share', async () => {
-      const mockShareInfo = { token: 'share-token', code: 'share-code' };
+      const plainCode = 'test plain code';
       const updateShareTypeSpy = vi.spyOn(shareService, 'updateSharingType').mockResolvedValue(undefined);
       const createPublicShareFromOwnerUserSpy = vi
         .spyOn(shareService, 'createPublicShareFromOwnerUser')
-        .mockResolvedValue(mockShareInfo as any);
+        .mockResolvedValue({ publicSharingItemData: mockSharingMeta, plainCode });
 
       const itemToShare = createItemToShare(false);
       const { result } = renderHook(() => useShareItemUserRoles({ isRestrictedSharingAvailable: true, itemToShare }));
@@ -144,7 +154,7 @@ describe('Share Items User Roles', () => {
       expect(updateShareTypeSpy).toHaveBeenCalledWith('item-uuid-123', 'file', 'public');
       expect(createPublicShareFromOwnerUserSpy).toHaveBeenCalledWith('item-uuid-123', 'file');
       expect(mockDispatch).toHaveBeenCalledWith(
-        expect.objectContaining({ type: 'SET_SHARING_META', payload: mockShareInfo }),
+        expect.objectContaining({ type: 'SET_SHARING_META', payload: mockSharingMeta }),
       );
       expect(mockDispatch).toHaveBeenCalledWith(
         expect.objectContaining({ type: 'SET_IS_PASSWORD_PROTECTED', payload: false }),
@@ -190,7 +200,7 @@ describe('Share Items User Roles', () => {
     test('When changing user role successfully, then updates role in state', async () => {
       const updateUserRoleOfSharedFolderSpy = vi
         .spyOn(shareService, 'updateUserRoleOfSharedFolder')
-        .mockResolvedValue(mockSharingMeta as any);
+        .mockResolvedValue(mockUpdateUserRoleResponse);
 
       const itemToShare = createItemToShare(true);
       const { result } = renderHook(() => useShareItemUserRoles({ isRestrictedSharingAvailable: true, itemToShare }));
@@ -216,7 +226,7 @@ describe('Share Items User Roles', () => {
       const itemToShare = createItemToShare(true);
       const updateUserRoleOfSharedFolderSpy = vi
         .spyOn(shareService, 'updateUserRoleOfSharedFolder')
-        .mockResolvedValue(mockSharingMeta as any);
+        .mockResolvedValue(mockUpdateUserRoleResponse);
       const { result } = renderHook(() => useShareItemUserRoles({ isRestrictedSharingAvailable: true, itemToShare }));
 
       await result.current.handleUserRoleChange('[email protected]', 'reader');
@@ -228,7 +238,7 @@ describe('Share Items User Roles', () => {
       const itemToShare = createItemToShare(true);
       const updateUserRoleOfSharedFolderSpy = vi
         .spyOn(shareService, 'updateUserRoleOfSharedFolder')
-        .mockResolvedValue(mockSharingMeta as any);
+        .mockResolvedValue(mockUpdateUserRoleResponse);
 
       const { result } = renderHook(() => useShareItemUserRoles({ isRestrictedSharingAvailable: true, itemToShare }));
 

src/app/drive/components/ShareDialog/hooks/useShareItemUserRoles.ts

@@ -44,7 +44,10 @@ export const useShareItemUserRoles = ({ isRestrictedSharingAvailable, itemToShar
         await shareService.updateSharingType(itemId, itemType, sharingType);
 
         if (sharingType === 'public') {
-          const shareInfo = await shareService.createPublicShareFromOwnerUser(itemId, itemType);
+          const { publicSharingItemData: shareInfo } = await shareService.createPublicShareFromOwnerUser(
+            itemId,
+            itemType,
+          );
           actionDispatch(setSharingMeta(shareInfo));
           actionDispatch(setIsPasswordProtected(false));
         }