#1501 Fix admin profile lookup

TheHive-Project · Nov 13, 2020 · 1d74258 · 1d74258
1 parent eefb972
commit 1d74258
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/thehive/app/org/thp/thehive/services/UserSrv.scala b/thehive/app/org/thp/thehive/services/UserSrv.scala
@@ -233,15 +233,15 @@ object UserOps {
         .project(
           _.byValue(_.login)
             .byValue(_.name)
-            .by(_.role.filter(_.organisation.get(organisationName)).profile)
+            .by(_.role.filter(_.organisation.get(organisationName)).profile.fold)
             .by(_.organisations.get(organisationName).value(_.name).limit(1).fold)
         )
         .domainMap {
           case (userId, userName, profile, org) =>
             val scope =
               if (org.contains(Organisation.administration.name)) "admin"
               else "organisation"
-            val permissions = Permissions.forScope(scope) & profile.permissions
+            val permissions = Permissions.forScope(scope) & profile.headOption.fold(Set.empty[Permission])(_.permissions)
             AuthContextImpl(userId, userName, organisationName, requestId, permissions)
         }