#1973 Don't remove observables/tasks when a share is deleted

TheHive-Project · Apr 15, 2021 · 5b0e05b · 5b0e05b
1 parent 0aa353f
commit 5b0e05b
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/thehive/app/org/thp/thehive/services/ShareSrv.scala b/thehive/app/org/thp/thehive/services/ShareSrv.scala
@@ -86,24 +86,14 @@ class ShareSrv @Inject() (implicit
     } yield newShareProfile
   }
 
-  private def delete(shareId: EntityIdOrName)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
-    for {
-      share <- getOrFail(shareId)
-      tasks = get(share).tasks.toSeq
-      obs   = get(share).observables.toSeq
-      _ <- tasks.toTry(taskSrv.delete(_))
-      _ <- obs.toTry(observableSrv.delete(_))
-    } yield get(shareId).remove()
-
   def unshareCase(shareId: EntityIdOrName)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
     for {
       organisation <- get(shareId).organisation.getOrFail("Organisation")
       case0        <- get(shareId).`case`.removeValue(_.organisationIds, organisation._id).getOrFail("Case")
       _ = get(shareId).observables.removeValue(_.organisationIds, organisation._id).barrier().filterNot(_.shares.range(1, 2)).remove()
       _ = get(shareId).tasks.removeValue(_.organisationIds, organisation._id).barrier().filterNot(_.shares.range(1, 2)).remove()
       _ <- auditSrv.share.unshareCase(case0, organisation)
-      _ <- delete(shareId)
-    } yield ()
+    } yield get(shareId).remove()
 
   def unshareTask(
       task: Task with Entity,