diff --git a/basiclti/basiclti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java b/basiclti/basiclti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java index 5dcb67995c86..eb0f557e4f1d 100644 --- a/basiclti/basiclti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java +++ b/basiclti/basiclti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java @@ -38,6 +38,7 @@ import org.apache.commons.lang3.StringUtils; import org.tsugi.http.HttpUtil; +import org.sakaiproject.util.RequestFilter; import org.sakaiproject.util.ResourceLoader; /** @@ -58,6 +59,10 @@ public class OIDCServlet extends HttpServlet { @Override public void init(ServletConfig config) throws ServletException { super.init(config); + + if (System.getProperty(RequestFilter.SAKAI_COOKIE_PROP) != null) { + cookieName = System.getProperty(RequestFilter.SAKAI_COOKIE_PROP); + } } protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -191,6 +196,7 @@ private void fancyRedirect(HttpServletRequest request, HttpServletResponse respo PrintWriter out = null; try { out = response.getWriter(); + response.setContentType("text/html"); out.println("<script>window.location.href=\"" + redirect + "\";</script>"); out.println("<p>...</p>"); out.print("<p><a href=\"" + redirect + "\" style=\"display: none;\" id=\"linker\">");