Updated TabFilter to support AEM context paths

brightcove · May 20, 2020 · 7c328b6 · 7c328b6
1 parent 0901ca3
commit 7c328b6
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/...core/src/main/java/com/coresecure/brightcove/wrapper/filter/CustomAddDialogTabFilter.java b/...core/src/main/java/com/coresecure/brightcove/wrapper/filter/CustomAddDialogTabFilter.java
@@ -128,6 +128,7 @@ public void doFilter(ServletRequest pRequest, ServletResponse pResponse, FilterC
                 String componentPath = fullRequestPath.substring(0, fullRequestPath.lastIndexOf("/"));
                 String dialogPath = getInheritDialog(slingRequest);
                 if (dialogPath != null) {
+                    LOGGER.debug("dialog path => " + dialogPath);
                     Resource dialogNodeRes = slingRequest.getResourceResolver().getResource(dialogPath);
                     if (dialogNodeRes != null) {
                         Node dialogNode = dialogNodeRes.adaptTo(Node.class);
@@ -196,8 +197,16 @@ private void getOriginalTabsFromRes(Node nodeItem, JSONObject originalTabs) thro
     private String getInheritDialog(SlingHttpServletRequest slingRequest) throws RepositoryException {
         String fullRequestPath = slingRequest.getRequestURI();
         String componentPath = fullRequestPath.substring(0, fullRequestPath.lastIndexOf("/"));
+
+        if (slingRequest.getContextPath().length() > 0) {
+            componentPath = componentPath.replace(slingRequest.getContextPath(), "/");
+        }
+
         String result = null;
 
+        LOGGER.trace("contextPath --> " + slingRequest.getContextPath());
+        LOGGER.trace("componentPath to start --> " + componentPath);
+
         Resource componentRes = slingRequest.getResourceResolver().getResource(componentPath);
         int avoidLoop = 0;