extract some logic into utility method

broadinstitute · Dec 1, 2016 · 553677b · 553677b
1 parent 53a02a4
commit 553677b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/scala/org/broadinstitute/dsde/agora/server/business/PermissionBusiness.scala b/src/main/scala/org/broadinstitute/dsde/agora/server/business/PermissionBusiness.scala
@@ -33,7 +33,7 @@ class PermissionBusiness {
   }
 
   def listEntityPermissions(entity: AgoraEntity, requester: String): Seq[AccessControl] = {
-    authorizeEntityRequester(getEntityACLs(entity, requester), entity, requester)
+    authorizeEntityRequester(entity, requester)
     AgoraEntityPermissionsClient.listEntityPermissions(entity)
   }
 
@@ -54,7 +54,7 @@ class PermissionBusiness {
 
   def deleteEntityPermission(entity: AgoraEntity, requester: String, userToRemove: String): Int = {
     checkSameRequester(requester, userToRemove)
-    authorizeEntityRequester(getEntityACLs(entity, requester), entity, requester)
+    authorizeEntityRequester(entity, requester)
     AgoraEntityPermissionsClient.deleteEntityPermission(entity, userToRemove)
   }
 
@@ -75,6 +75,10 @@ class PermissionBusiness {
       throw NamespaceAuthorizationException(AgoraPermissions(Manage), entity, requester)
   }
 
+  private def authorizeEntityRequester(entity: AgoraEntity, requester: String): Unit = {
+    authorizeEntityRequester(getEntityACLs(entity, requester), entity, requester)
+  }
+
   private def authorizeEntityRequester(acls: Seq[AccessControl], entity: AgoraEntity, requester: String): Unit = {
     if (!acls.exists(_.roles.canManage))
       throw AgoraEntityAuthorizationException(AgoraPermissions(Manage), entity, requester)
@@ -118,4 +122,4 @@ class PermissionBusiness {
     }
   }
 
-}
+}