From 7ab7f74be51a749b0180cb75046fdacfdad738f8 Mon Sep 17 00:00:00 2001 From: To-om Date: Thu, 12 Nov 2020 17:55:17 +0100 Subject: [PATCH] #1645 Don't add admin users from TH3 to admin organisation --- .../main/scala/org/thp/thehive/migration/th3/Conversion.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/migration/src/main/scala/org/thp/thehive/migration/th3/Conversion.scala b/migration/src/main/scala/org/thp/thehive/migration/th3/Conversion.scala index 2694c96c7b..af1545e564 100644 --- a/migration/src/main/scala/org/thp/thehive/migration/th3/Conversion.scala +++ b/migration/src/main/scala/org/thp/thehive/migration/th3/Conversion.scala @@ -263,8 +263,7 @@ trait Conversion { password <- (json \ "password").validateOpt[String] role <- (json \ "roles").validateOpt[Seq[String]].map(_.getOrElse(Nil)) organisationProfiles = - if (role.contains("admin")) - Map(Organisation.administration.name -> Profile.admin.name, mainOrganisation -> Profile.orgAdmin.name) + if (role.contains("admin")) Map(mainOrganisation -> Profile.orgAdmin.name) else if (role.contains("write")) Map(mainOrganisation -> Profile.analyst.name) else if (role.contains("read")) Map(mainOrganisation -> Profile.readonly.name) else Map(mainOrganisation -> Profile.readonly.name)