SSDM-6019 : Project Authorization - modify @RolesAllowed annotations at...

SSDM-6019 : Project Authorization - modify @RolesAllowed annotations at non-entity related methods - bugfixing

SVN: 39079

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractProjectPredicate.java

@@ -26,6 +26,9 @@ import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.AbstractT
  */
 abstract class AbstractProjectPredicate<T> extends AbstractPredicate<T>
 {
+
+    protected IAuthorizationDataProvider provider;
+
     protected final SpaceIdentifierPredicate spacePredicate;
 
     protected final ProjectTechIdPredicate projectTechIdPredicate;
@@ -45,6 +48,7 @@ abstract class AbstractProjectPredicate<T> extends AbstractPredicate<T>
     @Override
     public final void init(IAuthorizationDataProvider provider)
     {
+        this.provider = provider;
         spacePredicate.init(provider);
         projectTechIdPredicate.init(provider);
         projectPermIdPredicate.init(provider);

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectUpdatesPredicate.java

@@ -22,7 +22,9 @@ import ch.systemsx.cisd.common.exceptions.Status;
 import ch.systemsx.cisd.openbis.generic.server.authorization.RoleWithIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.PermId;
 import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectUpdatesDTO;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifierFactory;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
 
 /**
@@ -66,13 +68,38 @@ public class ProjectUpdatesPredicate extends AbstractProjectPredicate<ProjectUpd
         {
             return status;
         }
-        String newSpaceCode = updates.getSpaceCode();
-        if (newSpaceCode != null)
+
+        ProjectPE project = tryGetProject(updates);
+
+        if (project != null)
         {
-            SpaceIdentifier newSpaceIdentifier =
-                    new SpaceIdentifier(newSpaceCode);
-            status = spacePredicate.doEvaluation(person, allowedRoles, newSpaceIdentifier);
+            String oldSpaceCode = project.getSpace().getCode();
+            String newSpaceCode = updates.getSpaceCode();
+
+            if (newSpaceCode != null && false == newSpaceCode.equals(oldSpaceCode))
+            {
+                status = spacePredicate.doEvaluation(person, allowedRoles, new SpaceIdentifier(newSpaceCode));
+            }
         }
+
         return status;
     }
+
+    private ProjectPE tryGetProject(ProjectUpdatesDTO updates)
+    {
+        if (updates.getTechId() != null)
+        {
+            return provider.tryGetProjectByTechId(updates.getTechId());
+        } else if (updates.getPermId() != null)
+        {
+            return provider.tryGetProjectByPermId(new PermId(updates.getPermId()));
+        } else if (updates.getIdentifier() != null)
+        {
+            return provider.tryGetProjectByIdentifier(ProjectIdentifierFactory.parse(updates.getIdentifier()));
+        } else
+        {
+            return null;
+        }
+    }
+
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityHistoryTranslator.java

@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityHistory;
@@ -238,7 +239,10 @@ public class EntityHistoryTranslator
 
             if (relatedPE != null)
             {
-                history.setRelatedEntity(DataSetTranslator.translateBasicProperties(relatedPE));
+                AbstractExternalData data = DataSetTranslator.translateBasicProperties(relatedPE);
+                data.setExperiment(ExperimentTranslator.translate(relatedPE.getExperiment(), baseIndexURL, null, managedPropertyEvaluatorFactory));
+                data.setSample(SampleTranslator.translate(relatedPE.tryGetSample(), baseIndexURL, null, managedPropertyEvaluatorFactory));
+                history.setRelatedEntity(data);
             }
 
             if (historyPE.getRelationType() != null)