Changeset 15380 for branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs

Timestamp:

09/25/17 17:20:15 (7 years ago)

Author:

jkarder

Message:

#2839: worked on Project and ProjectPermission service methods

File:

• branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (4 diffs)

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -636 +636 @@
     public void DeleteProject(Guid projectId) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator);
-      AuthorizationManager.AuthorizeForResourceAdministration(projectId);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
       var pm = PersistenceManager;
       using (new PerformanceLogger("DeleteProject")) {
@@ -665 +665 @@
         var currentUserId = UserManager.CurrentUserId;
         return pm.UseTransaction(() => {
-          var resourcePermissions = projectPermissionDao.GetAll();
+          var projectPermissions = projectPermissionDao.GetAll();
           return projectDao.GetAll().ToList()
             .Where(x => isAdministrator
               || x.OwnerUserId == currentUserId
-              || UserManager.VerifyUser(currentUserId, resourcePermissions
+              || UserManager.VerifyUser(currentUserId, projectPermissions
                   .Where(y => y.ProjectId == x.ProjectId)
                   .Select(z => z.GrantedUserId)
@@ -684 +684 @@
     public void GrantProjectPermissions(Guid projectId, Guid[] grantedUserIds) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
       var pm = PersistenceManager;
       using (new PerformanceLogger("GrantProjectPermissions")) {
@@ -704 +705 @@
     public void RevokeProjectPermissions(Guid projectId, Guid[] grantedUserIds) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
       var pm = PersistenceManager;
       using (new PerformanceLogger("RevokeProjectPermissions")) {
         var projectPermissionDao = pm.ProjectPermissionDao;
         pm.UseTransaction(() => {
-          AuthorizeForProject(pm, projectId);
           projectPermissionDao.DeleteByProjectAndGrantedUserId(projectId, grantedUserIds);
           pm.SubmitChanges();