Merge pull request #379 from internxt/fix/allow-remove-sharings

fix: allow remove sharings in workspaces

src/modules/sharing/sharing.controller.ts

@@ -632,6 +632,10 @@ export class SharingController {
   })
   @ApiOkResponse({ description: 'Item removed from sharing' })
   @ApiBearerAuth()
+  @WorkspacesInBehalfGuard([
+    { sourceKey: 'params', fieldName: 'itemId' },
+    { sourceKey: 'params', fieldName: 'itemType' },
+  ])
   removeSharing(
     @UserDecorator() user: User,
     @Param('itemType') itemType: Sharing['itemType'],

src/modules/sharing/sharing.service.spec.ts

@@ -26,6 +26,7 @@ import { SequelizeUserReferralsRepository } from '../user/user-referrals.reposit
 import {
   SharedWithType,
   SharingActionName,
+  SharingItemType,
   SharingType,
 } from './sharing.domain';
 import { FileStatus } from '../file/file.domain';
@@ -598,6 +599,56 @@ describe('Sharing Use Cases', () => {
     });
   });
 
+  describe('removeSharing', () => {
+    const owner = newUser();
+    const itemFile = newFile();
+    const itemId = itemFile.uuid;
+    const itemType = SharingItemType.File;
+    const sharing = newSharing({ owner, item: itemFile });
+
+    it('When sharing exists and user is owner, then it removes invites and sharings', async () => {
+      sharingRepository.findOneSharing.mockResolvedValue(sharing);
+
+      await sharingService.removeSharing(owner, itemId, itemType);
+
+      expect(sharingRepository.findOneSharing).toHaveBeenCalledWith({
+        itemId,
+        itemType,
+      });
+      expect(sharingRepository.deleteInvitesBy).toHaveBeenCalledWith({
+        itemId,
+        itemType,
+      });
+      expect(sharingRepository.deleteSharingsBy).toHaveBeenCalledWith({
+        itemId,
+        itemType,
+      });
+    });
+
+    it('When sharing does not exist, then it does nothing', async () => {
+      sharingRepository.findOneSharing.mockResolvedValue(null);
+
+      await sharingService.removeSharing(owner, itemId, itemType);
+
+      expect(sharingRepository.findOneSharing).toHaveBeenCalledWith({
+        itemId,
+        itemType,
+      });
+      expect(sharingRepository.deleteInvitesBy).not.toHaveBeenCalled();
+      expect(sharingRepository.deleteSharingsBy).not.toHaveBeenCalled();
+    });
+
+    it('When user is not owner, then it throws', async () => {
+      const otherUser = newUser();
+
+      sharingRepository.findOneSharing.mockResolvedValue(sharing);
+
+      await expect(
+        sharingService.removeSharing(otherUser, itemId, itemType),
+      ).rejects.toThrow(ForbiddenException);
+    });
+  });
+
   describe('getSharedFoldersInWorkspace', () => {
     const user = newUser();
     const teamId = v4();

src/modules/sharing/sharing.service.ts

@@ -1462,7 +1462,6 @@ export class SharingService {
     user: User,
     itemId: Sharing['itemId'],
     itemType: Sharing['itemType'],
-    sharedWithType: SharedWithType = SharedWithType.Individual,
   ) {
     const sharing = await this.sharingRepository.findOneSharing({
       itemId,
@@ -1484,7 +1483,6 @@ export class SharingService {
     await this.sharingRepository.deleteSharingsBy({
       itemId,
       itemType,
-      sharedWithType,
     });
   }