Issue 13192 edit mode cleanup

dotCMS/src/main/java/com/dotcms/filters/interceptor/dotcms/DefaultFrontEndLoginRequiredWebInterceptor.java

@@ -6,6 +6,7 @@
 import com.dotcms.repackage.org.apache.struts.action.ActionMessage;
 import com.dotcms.repackage.org.apache.struts.action.ActionMessages;
 import com.dotmarketing.util.Logger;
+import com.dotmarketing.util.PageMode;
 import com.dotmarketing.util.WebKeys;
 
 import javax.servlet.http.HttpServletRequest;
@@ -27,9 +28,7 @@ public Result intercept(final HttpServletRequest request,
         Result result = Result.NEXT;
 
         if (null != session) {
-            final boolean isAdminMode = (session.getAttribute
-                    (com.dotmarketing.util.WebKeys.ADMIN_MODE_SESSION) != null);
-
+            final boolean isAdminMode = PageMode.get(request).isAdmin;
 
             // if we are not logged in and you are not admin mode. go to login page
             if (session.getAttribute(WebKeys.CMS_USER) == null

dotCMS/src/main/java/com/dotcms/rest/elasticsearch/ESContentResourcePortlet.java

@@ -16,6 +16,8 @@
 import com.dotmarketing.portlets.contentlet.business.ContentletAPI;
 import com.dotmarketing.portlets.contentlet.model.Contentlet;
 import com.dotmarketing.util.Logger;
+import com.dotmarketing.util.PageMode;
+
 import com.liferay.portal.model.User;
 
 import javax.servlet.http.HttpServletRequest;
@@ -38,13 +40,7 @@ public Response search(@Context HttpServletRequest request, @Context HttpServlet
 		User user = initData.getUser();
 		ResourceResponse responseResource = new ResourceResponse(initData.getParamsMap());
 
-		boolean live = true;
-		boolean ADMIN_MODE = (session.getAttribute(com.dotmarketing.util.WebKeys.ADMIN_MODE_SESSION) != null);
-		boolean PREVIEW_MODE = ((session.getAttribute(com.dotmarketing.util.WebKeys.PREVIEW_MODE_SESSION) != null) && ADMIN_MODE);
-		boolean EDIT_MODE = ((session.getAttribute(com.dotmarketing.util.WebKeys.EDIT_MODE_SESSION) != null) && ADMIN_MODE);
-		if (EDIT_MODE || PREVIEW_MODE) {
-			live = false;
-		}
+		PageMode mode = PageMode.get(request);
 
 		JSONObject esQuery;
 		try {
@@ -55,7 +51,7 @@ public Response search(@Context HttpServletRequest request, @Context HttpServlet
 		}
 
 		try {
-			ESSearchResults esresult = esapi.esSearch(esQuery.toString(), live, user, live);
+			ESSearchResults esresult = esapi.esSearch(esQuery.toString(), mode.showLive, user, mode.showLive);
 
 			JSONObject json = new JSONObject();
 			JSONArray jsonCons = new JSONArray();
@@ -117,21 +113,15 @@ public Response searchRaw(@Context HttpServletRequest request) {
 
 		HttpSession session = request.getSession();
 
-		boolean live = true;
-		boolean ADMIN_MODE = (session.getAttribute(com.dotmarketing.util.WebKeys.ADMIN_MODE_SESSION) != null);
-		boolean PREVIEW_MODE = ((session.getAttribute(com.dotmarketing.util.WebKeys.PREVIEW_MODE_SESSION) != null) && ADMIN_MODE);
-		boolean EDIT_MODE = ((session.getAttribute(com.dotmarketing.util.WebKeys.EDIT_MODE_SESSION) != null) && ADMIN_MODE);
-		if (EDIT_MODE || PREVIEW_MODE) {
-			live = false;
-		}
+        PageMode mode = PageMode.get(request);
 
 		ResourceResponse responseResource = new ResourceResponse(initData.getParamsMap());
 
 		User user = initData.getUser();
 		try {
 			String esQuery = IOUtils.toString(request.getInputStream());
 
-			return responseResource.response(esapi.esSearchRaw(esQuery, live, user, live).toString());
+			return responseResource.response(esapi.esSearchRaw(esQuery, mode.showLive, user, mode.showLive).toString());
 
 		} catch (Exception e) {
 			Logger.error(this.getClass(), "Error processing :" + e.getMessage(), e);

dotCMS/src/main/java/com/dotmarketing/business/web/HostWebAPIImpl.java

@@ -14,6 +14,7 @@
 import com.dotmarketing.exception.DotDataException;
 import com.dotmarketing.exception.DotSecurityException;
 import com.dotmarketing.portlets.contentlet.business.HostAPIImpl;
+import com.dotmarketing.util.PageMode;
 import com.dotmarketing.util.UtilMethods;
 import com.dotmarketing.util.WebKeys;
 import com.liferay.portal.PortalException;
@@ -56,21 +57,14 @@ public Host getCurrentHost(HttpServletRequest request) throws DotDataException,
 		UserWebAPI userWebAPI = WebAPILocator.getUserWebAPI();
 		User systemUser = userWebAPI.getSystemUser();
 		boolean respectFrontendRoles = !userWebAPI.isLoggedToBackend(request);
-        boolean adminMode = false;
-        boolean previewMode = false;
-        boolean editMode = false;
-
-        if(session != null) {
-        	adminMode = (session.getAttribute(com.dotmarketing.util.WebKeys.ADMIN_MODE_SESSION) != null);
-        	previewMode = (session.getAttribute(com.dotmarketing.util.WebKeys.PREVIEW_MODE_SESSION) != null && adminMode);
-        	editMode = (session.getAttribute(com.dotmarketing.util.WebKeys.EDIT_MODE_SESSION) != null && adminMode);
-        }
+
+		PageMode mode = PageMode.get(request);
 
         String pageHostId = request.getParameter("host_id");
-        if(pageHostId != null && (editMode || previewMode)) {
-        	host = find(pageHostId, systemUser, respectFrontendRoles);
+        if(pageHostId != null && !mode.showLive) {
+            host = find(pageHostId, systemUser, respectFrontendRoles);
         } else {
-            if(session != null && adminMode && session.getAttribute(WebKeys.CURRENT_HOST) != null) {
+            if(session != null && mode.isAdmin && session.getAttribute(WebKeys.CURRENT_HOST) != null) {
             	host = (Host) session.getAttribute(WebKeys.CURRENT_HOST);
             } else if(request.getAttribute(WebKeys.CURRENT_HOST) != null) {
         		host = (Host) request.getAttribute(WebKeys.CURRENT_HOST);
@@ -83,7 +77,7 @@ public Host getCurrentHost(HttpServletRequest request) throws DotDataException,
         }
 
         request.setAttribute(WebKeys.CURRENT_HOST, host);
-        if(session != null && adminMode) {
+        if(session != null && mode.isAdmin) {
             session.setAttribute(WebKeys.CURRENT_HOST, host);
         }
         return host;

dotCMS/src/main/java/com/dotmarketing/business/web/LanguageWebAPIImpl.java

@@ -12,6 +12,7 @@
 import com.dotmarketing.portlets.languagesmanager.business.LanguageAPI;
 import com.dotmarketing.portlets.languagesmanager.model.Language;
 import com.dotmarketing.util.Logger;
+import com.dotmarketing.util.PageMode;
 import com.dotmarketing.util.UtilMethods;
 import com.dotmarketing.util.WebKeys;
 import com.liferay.portal.struts.MultiMessageResources;
@@ -134,7 +135,8 @@ public Language getLanguage(HttpServletRequest httpRequest) {
             //only set in session if we are not in a timemachine
             if(sessionOpt.getAttribute("tm_lang")==null){
                 sessionOpt.setAttribute(WebKeys.HTMLPAGE_LANGUAGE, String.valueOf(future.getId()));
-                boolean ADMIN_MODE = (sessionOpt.getAttribute(WebKeys.ADMIN_MODE_SESSION) != null);
+                boolean ADMIN_MODE =   PageMode.get(httpRequest).isAdmin;
+
                 if (ADMIN_MODE == false || httpRequest.getParameter("leftMenu") == null) {
                     sessionOpt.setAttribute(WebKeys.Globals_FRONTEND_LOCALE_KEY, locale);
                     httpRequest.setAttribute(WebKeys.Globals_FRONTEND_LOCALE_KEY, locale);

dotCMS/src/main/java/com/dotmarketing/cms/urlmap/filters/URLMapFilter.java

@@ -35,6 +35,7 @@
 import com.dotmarketing.tag.model.Tag;
 import com.dotmarketing.util.Config;
 import com.dotmarketing.util.Logger;
+import com.dotmarketing.util.PageMode;
 import com.dotmarketing.util.RegEX;
 import com.dotmarketing.util.RegExMatch;
 import com.dotmarketing.util.TagUtil;
@@ -142,12 +143,8 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
             return;
         }
         if (RegEX.contains(url, mastRegEx)) {
-            boolean ADMIN_MODE = (optSession != null
-                    && optSession.getAttribute(com.dotmarketing.util.WebKeys.ADMIN_MODE_SESSION)
-                    != null);
-            boolean EDIT_MODE = ((optSession != null
-                    && optSession.getAttribute(com.dotmarketing.util.WebKeys.EDIT_MODE_SESSION)
-                    != null) && ADMIN_MODE);
+            boolean ADMIN_MODE =   PageMode.get(request) .isAdmin;
+            boolean EDIT_MODE =   PageMode.get(request)  == PageMode.EDIT;
 
             Structure structure = null;
 

dotCMS/src/main/java/com/dotmarketing/filters/CMSFilter.java

@@ -14,7 +14,8 @@
 import com.dotmarketing.util.Config;
 import com.dotmarketing.util.Logger;
 import com.dotmarketing.util.NumberOfTimeVisitedCounter;
-import com.dotmarketing.util.PageRequestModeUtil;
+import com.dotmarketing.util.PageMode;
+
 import com.dotmarketing.util.UtilMethods;
 import com.dotmarketing.util.WebKeys;
 import java.io.IOException;
@@ -28,7 +29,7 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+
 import org.apache.commons.logging.LogFactory;
 
 public class CMSFilter implements Filter {
@@ -223,37 +224,23 @@ public void destroy() {
     }
 
     private void countSiteVisit(HttpServletRequest request, HttpServletResponse response) {
-
-        HttpSession session = request.getSession(false);
-        boolean PAGE_MODE = true;
-
-        if (session != null) {
-            PAGE_MODE = PageRequestModeUtil.isPageMode(session);
-        }
-
-        if (PAGE_MODE) {
+        PageMode mode = PageMode.get(request);
+        if(mode == PageMode.ANON) {
             NumberOfTimeVisitedCounter.maybeCount(request, response);
-
         }
     }
 
     private void countPageVisit(HttpServletRequest request) {
 
-        HttpSession session = request.getSession(false);
-        boolean PAGE_MODE = true;
-
-        if (session != null) {
-            PAGE_MODE = PageRequestModeUtil.isPageMode(session);
-        }
-
-        if (PAGE_MODE) {
+        PageMode mode = PageMode.get(request);
+        if(mode == PageMode.ANON) {
             Optional<Visitor> visitor = visitorAPI.getVisitor(request);
 
             if (visitor.isPresent()) {
                 visitor.get().addPagesViewed(request.getRequestURI());
             }
-
         }
+
     }
 
 

dotCMS/src/main/java/com/dotmarketing/filters/ThreadNameFilter.java

@@ -26,6 +26,7 @@
 import com.dotmarketing.business.web.HostWebAPI;
 import com.dotmarketing.business.web.WebAPILocator;
 import com.dotmarketing.util.Logger;
+import com.dotmarketing.util.PageMode;
 
 public class ThreadNameFilter implements Filter {
 	FastDateFormat df = FastDateFormat.getInstance("MM-dd-yyyy hh:mm:ss z");
@@ -59,8 +60,7 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
 			long languageId = WebAPILocator.getLanguageWebAPI().getLanguage(request).getId();
 
 			String queryString = request.getQueryString();
-			boolean adminMode = (request.getSession(false) != null && request.getSession().getAttribute(
-					com.dotmarketing.util.WebKeys.ADMIN_MODE_SESSION) != null);
+			boolean adminMode =   PageMode.get(request) .isAdmin;
 			String referer = request.getHeader("Referer");
 			StringWriter sw = new StringWriter();
 			sw.append("url:");

dotCMS/src/main/java/com/dotmarketing/portal/struts/DotCustomLoginPostAction.java

@@ -12,6 +12,8 @@
 import com.dotmarketing.business.APILocator;
 import com.dotmarketing.business.Role;
 import com.dotmarketing.util.Logger;
+import com.dotmarketing.util.PageMode;
+
 import com.liferay.portal.model.User;
 import com.liferay.portal.struts.Action;
 import com.liferay.portal.struts.ActionException;
@@ -84,11 +86,7 @@ public void run(HttpServletRequest request, HttpServletResponse response)
 			Logger.warn(this, "ERROR: "+e.getMessage());
 		}
 
-		//Enabling pages edit mode
-		HttpSession session = request.getSession();
-		session.setAttribute(com.dotmarketing.util.WebKeys.EDIT_MODE_SESSION, "true");
-		session.setAttribute(com.dotmarketing.util.WebKeys.PREVIEW_MODE_SESSION, null);
-		session.setAttribute(com.dotmarketing.util.WebKeys.ADMIN_MODE_SESSION, "true");		
+		PageMode.setPageMode(request, PageMode.EDIT);
 
 	}
 

dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/ajax/ContentletAjax.java

@@ -71,7 +71,8 @@
 import com.dotmarketing.util.DateUtil;
 import com.dotmarketing.util.InodeUtils;
 import com.dotmarketing.util.Logger;
-import com.dotmarketing.util.PageRequestModeUtil;
+import com.dotmarketing.util.PageMode;
+
 import com.dotmarketing.util.PaginatedArrayList;
 import com.dotmarketing.util.RegEX;
 import com.dotmarketing.util.RegExMatch;
@@ -1426,8 +1427,8 @@ public Map<String,Object> saveContent(List<String> formData, boolean isAutoSave,
                         iCanLock=false;
                         contentLocked = false;
                      }
-                     
-                    PageRequestModeUtil.setBackEndModeInSession(req, contentLocked, iCanLock);
+                    PageMode.setPageMode(req, contentLocked, iCanLock);
+
                 }
 
 			}

dotCMS/src/main/java/com/dotmarketing/portlets/htmlpageasset/business/HTMLPageAssetAPIImpl.java

@@ -45,6 +45,7 @@
 import com.dotmarketing.util.CookieUtil;
 import com.dotmarketing.util.InodeUtils;
 import com.dotmarketing.util.Logger;
+import com.dotmarketing.util.PageMode;
 import com.dotmarketing.util.RegEX;
 import com.dotmarketing.util.UtilMethods;
 import com.dotmarketing.util.VelocityUtil;
@@ -711,10 +712,8 @@ public String getHTML(String uri, Host host, boolean liveMode, String contentId,
 
 
         if (!liveMode) {
-            requestProxy.setAttribute(WebKeys.PREVIEW_MODE_SESSION, "true");
-            requestProxy.getSession().setAttribute(WebKeys.PREVIEW_MODE_SESSION, "true");
-            requestProxy.setAttribute(WebKeys.ADMIN_MODE_SESSION, "true");
-            requestProxy.getSession().setAttribute(WebKeys.ADMIN_MODE_SESSION, "true");
+            requestProxy.setAttribute(WebKeys.PAGE_MODE_SESSION, PageMode.PREVIEW);
+            requestProxy.setAttribute(WebKeys.PAGE_MODE_SESSION, PageMode.PREVIEW);
         }
         boolean signedIn = false;
 

dotCMS/src/main/java/com/dotmarketing/portlets/htmlpages/action/PreviewHTMLPageAction.java

@@ -1,7 +1,7 @@
 package com.dotmarketing.portlets.htmlpages.action;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+
 
 import com.dotcms.repackage.javax.portlet.ActionRequest;
 import com.dotcms.repackage.javax.portlet.ActionResponse;
@@ -20,7 +20,8 @@
 import com.dotmarketing.util.ActivityLogger;
 import com.dotmarketing.util.HostUtil;
 import com.dotmarketing.util.Logger;
-import com.dotmarketing.util.PageRequestModeUtil;
+import com.dotmarketing.util.PageMode;
+
 import com.dotmarketing.util.UtilMethods;
 import com.dotmarketing.util.WebKeys;
 import com.liferay.portal.language.LanguageUtil;
@@ -87,7 +88,8 @@ public void processAction(ActionMapping mapping, ActionForm form, PortletConfig
 			HttpServletRequest hreq = reqImpl.getHttpServletRequest();
 
 			// gets the session object for the messages
-			PageRequestModeUtil.setBackEndModeInSession(hreq, contentLocked, iCanLock);
+			PageMode.setPageMode(hreq, contentLocked, iCanLock);
+
 
 			IHTMLPage htmlPage = _previewHTMLPages(req, user);
 

dotCMS/src/main/java/com/dotmarketing/servlets/BinaryExporterServlet.java

@@ -184,9 +184,9 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
 		try {
 			User user = userWebAPI.getLoggedInUser(req);
 			boolean respectFrontendRoles = !userWebAPI.isLoggedToBackend(req);
-
+			PageMode mode = PageMode.get(req);
 			//If session is in Admin Mode (Edit Mode) we should respect front end roles also.
-			if(session != null && session.getAttribute(com.dotmarketing.util.WebKeys.ADMIN_MODE_SESSION) != null){
+			if(mode.isAdmin){
 				respectFrontendRoles = true;
 			}
 
@@ -204,23 +204,10 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
 					assetIdentifier = content.getIdentifier();
 				} else {
 				    boolean live=userWebAPI.isLoggedToFrontend(req);
-				    boolean PREVIEW_MODE = false;
-					boolean EDIT_MODE = false;
-
-					if(session != null) {
-						PREVIEW_MODE = ((session.getAttribute(com.dotmarketing.util.WebKeys.PREVIEW_MODE_SESSION) != null));
-						try {
-							EDIT_MODE = (((session.getAttribute(com.dotmarketing.util.WebKeys.EDIT_MODE_SESSION) != null)));
-						} catch (Exception e) {
-							Logger.error(this, "Error: Unable to determine if there's a logged user.", e);
-						}
-					}
+
 					//GIT-4506
 					if(WebAPILocator.getUserWebAPI().isLoggedToBackend(req)){
-						if(!EDIT_MODE && !PREVIEW_MODE)// LIVE_MODE
-							live = true;
-						else
-							live = false;
+					    live = mode.showLive;
 					}
 
 				    if (req.getSession(false) != null && req.getSession().getAttribute("tm_date")!=null) {
@@ -381,16 +368,10 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
 
 			} else {
 
-				boolean _adminMode = false;
-				try {
-				    _adminMode = (session!=null && session.getAttribute(com.dotmarketing.util.WebKeys.ADMIN_MODE_SESSION) != null);
-				}catch(Exception e){
-				    Logger.warn(this, "An unexpected problem happened when trying to retrieve the backend session");
-				    Logger.debug(this, "Something happened!", e);
-				}
+
 
 			    // Set the expiration time
-				if (!_adminMode) {
+				if (!mode.isAdmin) {
 
 				    int _daysCache = 365;
 				    GregorianCalendar expiration = new GregorianCalendar();