From dcf564d3ba7f6469683acbfec2a958f9b2d96961 Mon Sep 17 00:00:00 2001
From: Sara <sara.aspery@alfresco.com>
Date: Wed, 11 Aug 2021 16:24:21 +0100
Subject: [PATCH] ACS-1783 restore contexts (#655)

---
 .../src/main/resources/alfresco/public-rest-context.xml    | 7 -------
 .../alfresco/public-services-security-context.xml          | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/remote-api/src/main/resources/alfresco/public-rest-context.xml b/remote-api/src/main/resources/alfresco/public-rest-context.xml
index d0b9b18e7b..ea1e191fdc 100644
--- a/remote-api/src/main/resources/alfresco/public-rest-context.xml
+++ b/remote-api/src/main/resources/alfresco/public-rest-context.xml
@@ -1072,13 +1072,6 @@
         <property name="contentService" ref="ContentService" />
     </bean>
 
-    <!-- REST API direct access URL configuration settings -->
-    <bean id="restApiDirectUrlConfig" class="org.alfresco.rest.api.impl.directurl.RestApiDirectUrlConfig" init-method="init">
-        <property name="systemWideDirectUrlConfig" ref="systemWideDirectUrlConfig" />
-        <property name="enabled" value="${restApi.directAccessUrl.enabled}" />
-        <property name="defaultExpiryTimeInSec" value="${restApi.directAccessUrl.defaultExpiryTimeInSec}" />
-    </bean>
-
     <bean id="org.alfresco.rest.api.probes.ProbeEntityResource.get" class="org.alfresco.rest.api.probes.ProbeEntityResource">
         <property name="discovery" ref="webscript.org.alfresco.api.DiscoveryApiWebscript.get" />
     </bean>
diff --git a/repository/src/main/resources/alfresco/public-services-security-context.xml b/repository/src/main/resources/alfresco/public-services-security-context.xml
index c3c0aee115..b6e32f9d37 100644
--- a/repository/src/main/resources/alfresco/public-services-security-context.xml
+++ b/repository/src/main/resources/alfresco/public-services-security-context.xml
@@ -494,8 +494,8 @@
                org.alfresco.service.cmr.repository.ContentService.getRawReader=ACL_METHOD.ROLE_ADMINISTRATOR
                org.alfresco.service.cmr.repository.ContentService.getReader=ACL_NODE.0.sys:base.ReadContent
                org.alfresco.service.cmr.repository.ContentService.getWriter=ACL_NODE.0.sys:base.WriteContent
-               org.alfresco.service.cmr.repository.ContentService.requestContentDirectUrl=ACL_NODE.0.sys:base.ReadContent
                org.alfresco.service.cmr.repository.ContentService.getTempWriter=ACL_ALLOW
+               org.alfresco.service.cmr.repository.ContentService.requestContentDirectUrl=ACL_NODE.0.sys:base.ReadContent
                org.alfresco.service.cmr.repository.ContentService.isContentDirectUrlEnabled=ACL_ALLOW
                org.alfresco.service.cmr.repository.ContentService.*=ACL_DENY
             </value>