#263 fix role name

TheHive-Project · Sep 5, 2017 · 106842f · 106842f
1 parent 5553200
commit 106842f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/thehive-backend/app/controllers/UserCtrl.scala b/thehive-backend/app/controllers/UserCtrl.scala
@@ -112,12 +112,12 @@ class UserCtrl @Inject() (
   }
 
   @Timed
-  def getKey(id: String): Action[AnyContent] = authenticated(Roles.admin).async { implicit request =>
+  def getKey(id: String): Action[AnyContent] = authenticated(Roles.admin).async { implicit request ⇒
     authSrv.getKey(id).map(Ok(_))
   }
 
   @Timed
-  def renewKey(id: String): Action[AnyContent] = authenticated(Roles.admin).async { implicit request =>
+  def renewKey(id: String): Action[AnyContent] = authenticated(Roles.admin).async { implicit request ⇒
     authSrv.renewKey(id).map(Ok(_))
   }
 }
diff --git a/thehive-backend/app/models/Roles.scala b/thehive-backend/app/models/Roles.scala
@@ -13,15 +13,15 @@ import org.elastic4play.models.AttributeFormat
 import org.elastic4play.services.Role
 
 object Roles {
-  object read extends Role("read")
-  object write extends Role("write")
-  object admin extends Role("admin")
-  object alert extends Role("alert")
-  val roles = read :: write :: admin :: alert :: Nil
-
-  val roleNames = roles.map(_.name)
-  def isValid(roleName: String) = roleNames.contains(roleName)
-  def withName(roleName: String) = roles.find(_.name == roleName)
+  object read extends Role("READ")
+  object write extends Role("WRITE")
+  object admin extends Role("ADMIN")
+  object alert extends Role("ALERT")
+  val roles: List[Role] = read :: write :: admin :: alert :: Nil
+
+  val roleNames: List[String] = roles.map(_.name)
+  def isValid(roleName: String): Boolean = roleNames.contains(roleName)
+  def withName(roleName: String): Option[Role] = roles.find(_.name == roleName)
 }
 
 object RoleAttributeFormat extends AttributeFormat[Role]("role") {