Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#11566: we need to add the preview and user attribute to the session/… #11641

Merged
merged 2 commits into from
May 19, 2017
Merged

#11566: we need to add the preview and user attribute to the session/… #11641

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd33590
#11566: we need to add the preview and user attribute to the session/…
oarrietadotcms May 18, 2017
db514dc
#11566: from will: it should give the mock request a session and attr…
oarrietadotcms May 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 29 additions & 19 deletions .../src/main/java/com/dotmarketing/portlets/htmlpageasset/business/HTMLPageAssetAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,13 @@
package com.dotmarketing.portlets.htmlpageasset.business;

import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.ResourceNotFoundException;

import com.dotcms.api.system.event.Payload;
import com.dotcms.api.system.event.SystemEventType;
import com.dotcms.api.system.event.SystemEventsAPI;
import com.dotcms.api.system.event.Visibility;
import com.dotcms.api.system.event.verifier.ExcludeOwnerVerifierBean;
import com.dotcms.mock.request.MockAttributeRequest;
import com.dotcms.mock.request.MockHttpRequest;
import com.dotcms.mock.request.MockSessionRequest;
import com.dotcms.mock.response.BaseResponse;
import com.dotmarketing.beans.Host;
import com.dotmarketing.beans.Identifier;
Expand Down Expand Up @@ -64,6 +49,23 @@
import com.dotmarketing.velocity.VelocityServlet;
import com.liferay.portal.model.User;

import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.ResourceNotFoundException;

import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;



public class HTMLPageAssetAPIImpl implements HTMLPageAssetAPI {
Expand Down Expand Up @@ -651,8 +653,12 @@ public String getHTML(String uri, Host host, boolean liveMode,
public String getHTML(String uri, Host host, boolean liveMode, String contentId, User user, Long langId,
String userAgent) throws DotStateException, DotDataException, DotSecurityException {


HttpServletRequest requestProxy = new MockHttpRequest(host.getHostname(), uri).request();
HttpServletRequest requestProxy =
new MockAttributeRequest(
new MockSessionRequest(
new MockHttpRequest(host.getHostname(), uri).request()
).request()
).request();
HttpServletResponse responseProxy = new BaseResponse().response();

StringWriter out = new StringWriter();
Expand Down Expand Up @@ -690,7 +696,9 @@ 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");
}
boolean signedIn = false;

Expand Down Expand Up @@ -757,6 +765,8 @@ public String getHTML(String uri, Host host, boolean liveMode, String contentId,
LanguageWebAPI langWebAPI = WebAPILocator.getLanguageWebAPI();
langWebAPI.checkSessionLocale(requestProxy);

requestProxy.getSession().setAttribute(com.liferay.portal.util.WebKeys.USER_ID, user.getUserId());
requestProxy.setAttribute(com.liferay.portal.util.WebKeys.USER, user);
context = VelocityUtil.getWebContext(requestProxy, responseProxy);

if (langId != null && langId > 0) {
Expand Down