fixed error pages
This commit is contained in:
parent
c60631935e
commit
ea610b4e63
|
@ -52,6 +52,7 @@ public class DdasVreIntegration extends MVCPortlet {
|
||||||
|
|
||||||
private static String ENCODED_OTP_PARAM = "b3Rw";
|
private static String ENCODED_OTP_PARAM = "b3Rw";
|
||||||
private static final String OPERATION_ERROR = "/html/error_pages/operation-error.jsp";
|
private static final String OPERATION_ERROR = "/html/error_pages/operation-error.jsp";
|
||||||
|
private static final String TOKEN_EXPIRED = "/html/error_pages/bc-token-expired.jsp";
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -64,6 +65,11 @@ public class DdasVreIntegration extends MVCPortlet {
|
||||||
System.out.println("Read OTP="+otp);
|
System.out.println("Read OTP="+otp);
|
||||||
if (otp != null && !otp.equals("")) {
|
if (otp != null && !otp.equals("")) {
|
||||||
JsonElement brokerRequest = checkRequest(otp);
|
JsonElement brokerRequest = checkRequest(otp);
|
||||||
|
if (brokerRequest == null) {//the token is expired or there was no request, return to the JSP token expired page
|
||||||
|
PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher(TOKEN_EXPIRED);
|
||||||
|
dispatcher.include(renderRequest, response);
|
||||||
|
return;
|
||||||
|
}
|
||||||
GCubeUser currentUser = getCurrentUser(renderRequest);
|
GCubeUser currentUser = getCurrentUser(renderRequest);
|
||||||
log.debug("current user is + " + currentUser.getUsername() + " sending request to conductor ...");
|
log.debug("current user is + " + currentUser.getUsername() + " sending request to conductor ...");
|
||||||
try {
|
try {
|
||||||
|
@ -76,7 +82,13 @@ public class DdasVreIntegration extends MVCPortlet {
|
||||||
if (!result) { //redirect to error page
|
if (!result) { //redirect to error page
|
||||||
PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher(OPERATION_ERROR);
|
PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher(OPERATION_ERROR);
|
||||||
dispatcher.include(renderRequest, response);
|
dispatcher.include(renderRequest, response);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
//the token is missing in the request URL
|
||||||
|
PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher(TOKEN_EXPIRED);
|
||||||
|
dispatcher.include(renderRequest, response);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
response.setContentType("text/html");
|
response.setContentType("text/html");
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
|
||||||
|
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
|
||||||
|
<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui"%>
|
||||||
|
<%@ taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui"%>
|
||||||
|
<%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme"%>
|
||||||
|
<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
|
||||||
|
<%@page import="com.liferay.portal.kernel.servlet.SessionErrors"%>
|
||||||
|
<%@page import="com.liferay.portal.kernel.servlet.SessionMessages"%>
|
||||||
|
<%@page import="com.liferay.portal.model.User"%>
|
||||||
|
<%@page import="com.liferay.portal.kernel.util.WebKeys"%>
|
||||||
|
<portlet:defineObjects />
|
||||||
|
<liferay-theme:defineObjects />
|
||||||
|
|
||||||
|
|
||||||
|
<portlet:renderURL var="normalState"
|
||||||
|
windowState="<%=LiferayWindowState.NORMAL.toString()%>" />
|
||||||
|
|
||||||
|
<p class="lead">
|
||||||
|
We're sorry, it seems that too much time is passed since your order on Blue-Cloud Data Discovery & Access Service. <br>
|
||||||
|
Please close this page and trigger the move to VRE again from Blue-Cloud Data Discovery & Access Service application.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
|
||||||
|
<a class="btn btn-large btn-primary" href="https://blue-cloud.d4science.org/"><i
|
||||||
|
class="icon icon-angle-left"></i> Close</a>
|
|
@ -16,9 +16,9 @@
|
||||||
windowState="<%=LiferayWindowState.NORMAL.toString()%>" />
|
windowState="<%=LiferayWindowState.NORMAL.toString()%>" />
|
||||||
|
|
||||||
<p class="lead">
|
<p class="lead">
|
||||||
We're sorry, yhere was an error performing this operation. Try again, if the error occurs again please report this issue to <a href="https://support.d4science.org" target="_blank">https://support.d4science.org</a>
|
We're sorry, there was an error performing this operation. Try again, if the error occurs again please report this issue to <a href="https://support.d4science.org" target="_blank">https://support.d4science.org</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|
||||||
<a class="btn btn-large btn-primary" href="${normalState}"><i
|
<a class="btn btn-large btn-primary" href="https://blue-cloud.d4science.org/"><i
|
||||||
class="icon icon-angle-left"></i> Close</a>
|
class="icon icon-angle-left"></i> Close</a>
|
||||||
|
|
Loading…
Reference in New Issue