#1316 Rename field in user output: organisations[].role => organisati…

…ons[].profile
TheHive-Project · May 23, 2020 · 9d313b3 · 9d313b3
1 parent 0b102e3
commit 9d313b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dto/src/main/scala/org/thp/thehive/dto/v1/User.scala b/dto/src/main/scala/org/thp/thehive/dto/v1/User.scala
@@ -12,9 +12,9 @@ object InputUser {
   implicit val writes: Writes[InputUser] = Json.writes[InputUser]
 }
 
-case class OutputOrganisationRole(organisation: String, role: String)
-object OutputOrganisationRole {
-  implicit val format: OFormat[OutputOrganisationRole] = Json.format[OutputOrganisationRole]
+case class OutputOrganisationProfile(organisation: String, profile: String)
+object OutputOrganisationProfile {
+  implicit val format: OFormat[OutputOrganisationProfile] = Json.format[OutputOrganisationProfile]
 }
 
 case class OutputUser(
@@ -33,7 +33,7 @@ case class OutputUser(
     permissions: Set[String],
     organisation: String,
     avatar: Option[String],
-    organisations: Seq[OutputOrganisationRole]
+    organisations: Seq[OutputOrganisationProfile]
 )
 
 object OutputUser {

diff --git a/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala b/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala
@@ -199,7 +199,7 @@ object Conversion {
         .into[OutputUser]
         .withFieldComputed(_.permissions, _.permissions.asInstanceOf[Set[String]])
         .withFieldComputed(_.hasKey, _.apikey.isDefined)
-        .withFieldConst(_.organisations, organisations.map { case (org, role) => OutputOrganisationRole(org, role) })
+        .withFieldConst(_.organisations, organisations.map { case (org, role) => OutputOrganisationProfile(org, role) })
         .withFieldComputed(_.avatar, user => user.avatar.map(avatar => s"/api/v1/user/${user._id}/avatar/$avatar"))
         .transform
     }