#1803 Fix profile in user list when user is in several organisations

TheHive-Project · Mar 4, 2021 · b57ef4e · b57ef4e
1 parent c204559
commit b57ef4e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/thehive/app/org/thp/thehive/controllers/v1/QueryableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/QueryableCtrl.scala
@@ -7,7 +7,7 @@ trait QueryableCtrl {
   val entityName: String
   val publicProperties: PublicProperties
   val initialQuery: Query
-  val pageQuery: ParamQuery[OutputParam]
+  val pageQuery: ParamQuery[_]
   val outputQuery: Query
   val getQuery: ParamQuery[EntityIdOrName]
   val extraQueries: Seq[ParamQuery[_]] = Nil

diff --git a/thehive/app/org/thp/thehive/controllers/v1/UserCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/UserCtrl.scala
@@ -23,6 +23,8 @@ import java.util.Base64
 import javax.inject.{Inject, Singleton}
 import scala.util.{Failure, Success, Try}
 
+case class UserOutputParam(from: Long, to: Long, extraData: Set[String], organisation: Option[String])
+
 @Singleton
 class UserCtrl @Inject() (
     entrypoint: Entrypoint,
@@ -48,9 +50,13 @@ class UserCtrl @Inject() (
     (idOrName, graph, authContext) => userSrv.get(idOrName)(graph).visible(authContext)
   )
 
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[User], IteratorOutput](
+  override val pageQuery: ParamQuery[UserOutputParam] = Query.withParam[UserOutputParam, Traversal.V[User], IteratorOutput](
     "page",
-    (range, userSteps, authContext) => userSteps.richUser(authContext).page(range.from, range.to, range.extraData.contains("total"))
+    (params, userSteps, authContext) =>
+      params
+        .organisation
+        .fold(userSteps.richUser(authContext))(org => userSteps.richUser(authContext, EntityIdOrName(org)))
+        .page(params.from, params.to, params.extraData.contains("total"))
   )
   override val outputQuery: Query =
     Query.outputWithContext[RichUser, Traversal.V[User]]((userSteps, authContext) => userSteps.richUser(authContext))