From 2d9b27532554f836e97a0f58a6121db0285acf50 Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Fri, 11 Oct 2024 18:23:13 +0200
Subject: [PATCH] [DSC-1963] Fixes potential cache issues with rest exposed
 props

---
 .../repository/ConfigurationRestRepository.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ConfigurationRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ConfigurationRestRepository.java
index db9ba8c67f2..a2af6a69833 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ConfigurationRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ConfigurationRestRepository.java
@@ -33,17 +33,21 @@ public class ConfigurationRestRepository extends DSpaceRestRepository<PropertyRe
     private AuthorizeService authorizeService;
 
     private ConfigurationService configurationService;
-    private List<String> exposedProperties;
-    private List<String> adminRestrictedProperties;
 
     @Autowired
     public ConfigurationRestRepository(ConfigurationService configurationService) {
         this.configurationService = configurationService;
-        this.exposedProperties = Arrays.asList(configurationService.getArrayProperty("rest.properties.exposed"));
-        this.adminRestrictedProperties =
-            Arrays.asList(configurationService.getArrayProperty("admin.rest.properties.exposed"));
     }
 
+    protected String[] getExposedProperties() {
+        return configurationService.getArrayProperty("rest.properties.exposed");
+    }
+
+    protected String[] getAdminRestrictedProperties() {
+        return configurationService.getArrayProperty("admin.rest.properties.exposed");
+    }
+
+
     /**
      * Gets the value of a configuration property if it is exposed via REST
      *
@@ -62,6 +66,9 @@ public ConfigurationRestRepository(ConfigurationService configurationService) {
     @Override
     @PreAuthorize("permitAll()")
     public PropertyRest findOne(Context context, String property) {
+        List<String> exposedProperties = Arrays.asList(getExposedProperties());
+        List<String> adminRestrictedProperties = Arrays.asList(getAdminRestrictedProperties());
+
         if (!configurationService.hasProperty(property) ||
             (adminRestrictedProperties.contains(property) && !isCurrentUserAdmin(context)) ||
             (!exposedProperties.contains(property) && !isCurrentUserAdmin(context))) {