From 486b27d9bb4620074018acc1c58872a699ff17d1 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 25 Jul 2019 19:08:50 +0200
Subject: [PATCH] we need to compare to 'true' because we might get null on the
 left side which cannot be resolved to boolean

---
 .../api/projects/overlays/OverlayController.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayController.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayController.java
index fd8a5c6044..f48006cbc3 100644
--- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayController.java
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayController.java
@@ -60,7 +60,7 @@ public class OverlayController extends BaseController {
   @PreAuthorize("hasAuthority('IS_ADMIN')" +
       " or hasAuthority('IS_CURATOR') and hasAuthority('READ_PROJECT:' + #projectId)" +
       " or hasAuthority('READ_PROJECT:' + #projectId) and " +
-      "   (@layoutService.getLayoutById(#overlayId)?.creator?.login == authentication.name or @layoutService.getLayoutById(#overlayId)?.publicLayout)")
+      "   (@layoutService.getLayoutById(#overlayId)?.creator?.login == authentication.name or @layoutService.getLayoutById(#overlayId)?.publicLayout == true)")
   @GetMapping(value = "/{overlayId}/models/{modelId}/bioEntities/")
   public List<Map<String, Object>> getOverlayElements(
       @PathVariable(value = "projectId") String projectId,
@@ -72,7 +72,7 @@ public class OverlayController extends BaseController {
   @PreAuthorize("hasAuthority('IS_ADMIN')" +
       " or hasAuthority('IS_CURATOR') and hasAuthority('READ_PROJECT:' + #projectId)" +
       " or hasAuthority('READ_PROJECT:' + #projectId) and " +
-      "   (@layoutService.getLayoutById(#overlayId)?.creator?.login == authentication.name or @layoutService.getLayoutById(#overlayId)?.publicLayout)")
+      "   (@layoutService.getLayoutById(#overlayId)?.creator?.login == authentication.name or @layoutService.getLayoutById(#overlayId)?.publicLayout == true)")
   @GetMapping(value = "/{overlayId}/models/{modelId}/bioEntities/reactions/{reactionId}/")
   public Map<String, Object> getFullReaction(
       @PathVariable(value = "projectId") String projectId,
@@ -88,7 +88,7 @@ public class OverlayController extends BaseController {
   @PreAuthorize("hasAuthority('IS_ADMIN')" +
       " or hasAuthority('IS_CURATOR') and hasAuthority('READ_PROJECT:' + #projectId)" +
       " or hasAuthority('READ_PROJECT:' + #projectId) and " +
-      "   (@layoutService.getLayoutById(#overlayId)?.creator?.login == authentication.name or @layoutService.getLayoutById(#overlayId)?.publicLayout)")
+      "   (@layoutService.getLayoutById(#overlayId)?.creator?.login == authentication.name or @layoutService.getLayoutById(#overlayId)?.publicLayout == true)")
   @GetMapping(value = "/{overlayId}/models/{modelId}/bioEntities/elements/{elementId}/")
   public Map<String, Object> getFullSpecies(
       @PathVariable(value = "projectId") String projectId,
@@ -147,7 +147,7 @@ public class OverlayController extends BaseController {
   @PreAuthorize("hasAuthority('IS_ADMIN')" +
       " or hasAuthority('IS_CURATOR') and hasAuthority('READ_PROJECT:' + #projectId)" +
       " or hasAuthority('READ_PROJECT:' + #projectId) and " +
-      "   (@layoutService.getLayoutById(#overlayId)?.creator?.login == authentication.name or @layoutService.getLayoutById(#overlayId)?.publicLayout)")
+      "   (@layoutService.getLayoutById(#overlayId)?.creator?.login == authentication.name or @layoutService.getLayoutById(#overlayId)?.publicLayout == true)")
   @GetMapping(value = "/{overlayId}:downloadSource")
   public ResponseEntity<byte[]> getOverlaySource(
       @PathVariable(value = "projectId") String projectId,
-- 
GitLab