Changeset 15628 for branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs

Timestamp:

01/17/18 15:24:44 (6 years ago)

Author:

jzenisek

Message:

#2839

• updated TaskDao towards independency of the formerly used Task-Resource assignment entity
• updated several permission/assignment handling service methods for client
• added AssignedJobResource DTO

File:

• branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs (modified) (3 diffs)

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs

@@ -96 +96 @@
       var projectDao = pm.ProjectDao;
       pm.UseTransaction(() => {
-        // check if project exists (not necessary)
-        var project = projectDao.GetById(projectId);
-        if (project == null) throw new SecurityException(NOT_AUTHORIZED_USERPROJECT);
-
-        var projectBranch = projectDao.GetCurrentAndParentProjectsById(projectId);
+        var projectBranch = projectDao.GetCurrentAndParentProjectsById(projectId).ToList();
         if(!projectBranch.Select(x => x.OwnerUserId).Contains(currentUserId)
             && !RoleVerifier.IsInRole(HiveRoles.Administrator)) {
@@ -129 +125 @@
 
         // check if user is owner of a parent project
-        var projectBranch = projectDao.GetParentProjectsById(projectId);
+        var projectBranch = projectDao.GetParentProjectsById(projectId).ToList();
         if (!projectBranch.Select(x => x.OwnerUserId).Contains(currentUserId)
             && !RoleVerifier.IsInRole(HiveRoles.Administrator)) {
@@ -136 +132 @@
 
         // check if the all argument resourceIds are among the assigned resources of the owned projects
-        var grantedResourceIds = assignedProjectResourceDao.GetAllGrantedResourceIdsOfOwnedParentProjects(projectId, currentUserId);
+        var grantedResourceIds = assignedProjectResourceDao.GetAllGrantedResourceIdsOfOwnedParentProjects(projectId, currentUserId).ToList();
         if(resourceIds.Except(grantedResourceIds).Any()) {
           throw new SecurityException(NOT_AUTHORIZED_USERRESOURCE);