Merge pull request #572 from SpongePowered/fix/groups

don't require all groups to exist in RoleTypes
SpongePowered · Jul 15, 2018 · a821a9c · a821a9c
2 parents 390927d + 9c08af3
commit a821a9c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/app/controllers/ApiController.scala b/app/controllers/ApiController.scala
@@ -309,7 +309,7 @@ final class ApiController @Inject()(api: OreRestfulApi,
               if (groups.trim == "")
                 Set.empty
               else
-                groups.split(",").map(group => RoleTypes.withInternalName(group)).toSet[RoleType]
+                groups.split(",").flatMap(group => RoleTypes.withInternalName(group)).toSet[RoleType]
             )
           }
 

diff --git a/app/ore/permission/role/RoleTypes.scala b/app/ore/permission/role/RoleTypes.scala
@@ -69,11 +69,7 @@ object RoleTypes extends Enumeration {
     * @param internalName Internal name
     * @return UserRole with specified internal name
     */
-  def withInternalName(internalName: String): RoleType = this.values.find(_.internalName == internalName).getOrElse {
-    // Throw an exception instead of returning an Option to match Enumeration
-    // behavior
-    throw new NoSuchElementException
-  }
+  def withInternalName(internalName: String): Option[RoleType] = this.values.find(_.internalName == internalName).map(value => convert(value))
 
   /**
     * Represents a User role.