This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
The following commit(s) were added to refs/heads/master by this push:
new a5a95c9ae DELTASPIKE-1464
a5a95c9ae is described below
commit a5a95c9aec28339a688bcb83cf8508425408768c
Author: Thomas Andraschko <[email protected]>
AuthorDate: Fri Mar 31 09:34:02 2023 +0200
DELTASPIKE-1464
---
.../impl/clientwindow/ClientSideClientWindow.java | 3 +-
.../impl/clientwindow/DeltaSpikeClientWindow.java | 14 ++-----
.../jsf/impl/clientwindow/LazyClientWindow.java | 3 +-
.../jsf/impl/util/ClientWindowHelper.java | 44 ----------------------
.../jsf/impl/view/DeltaSpikeViewHandler.java | 17 ---------
.../META-INF/resources/deltaspike/windowhandler.js | 20 +---------
6 files changed, 9 insertions(+), 92 deletions(-)
diff --git
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/ClientSideClientWindow.java
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/ClientSideClientWindow.java
index 9cd77c27a..e240141ce 100644
---
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/ClientSideClientWindow.java
+++
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/ClientSideClientWindow.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
import jakarta.faces.FacesException;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
+import jakarta.faces.render.ResponseStateManager;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
@@ -236,7 +237,7 @@ public class ClientSideClientWindow extends
DeltaSpikeClientWindow
url = JsfUtils.addParameter(facesContext.getExternalContext(),
url,
true,
- ClientWindowHelper.RequestParameters.GET_WINDOW_ID,
+ ResponseStateManager.CLIENT_WINDOW_URL_PARAM,
windowId);
url = JsfUtils.addParameter(facesContext.getExternalContext(),
url,
diff --git
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/DeltaSpikeClientWindow.java
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/DeltaSpikeClientWindow.java
index 586acd95c..75552a02d 100644
---
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/DeltaSpikeClientWindow.java
+++
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/DeltaSpikeClientWindow.java
@@ -20,6 +20,7 @@ package org.apache.deltaspike.jsf.impl.clientwindow;
import jakarta.faces.context.FacesContext;
import jakarta.faces.lifecycle.ClientWindow;
+import jakarta.faces.render.ResponseStateManager;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Map;
import java.util.Random;
@@ -103,24 +104,17 @@ public abstract class DeltaSpikeClientWindow extends
ClientWindow
return false;
}
-
+
protected String getWindowIdPostParameter(FacesContext facesContext)
{
Map<String, String> requestParams =
facesContext.getExternalContext().getRequestParameterMap();
- String windowId =
requestParams.get(ClientWindowHelper.RequestParameters.POST_WINDOW_ID);
-
- if (windowId == null)
- {
- windowId =
requestParams.get(ClientWindowHelper.RequestParameters.JSF_POST_WINDOW_ID);
- }
-
- return windowId;
+ return requestParams.get(ResponseStateManager.CLIENT_WINDOW_PARAM);
}
protected String getWindowIdParameter(FacesContext facesContext)
{
Map<String, String> requestParameters =
facesContext.getExternalContext().getRequestParameterMap();
- return
requestParameters.get(ClientWindowHelper.RequestParameters.GET_WINDOW_ID);
+ return
requestParameters.get(ResponseStateManager.CLIENT_WINDOW_URL_PARAM);
}
protected ClientWindowConfig getClientWindowConfig()
diff --git
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/LazyClientWindow.java
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/LazyClientWindow.java
index 7d333f065..6b0368134 100644
---
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/LazyClientWindow.java
+++
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/LazyClientWindow.java
@@ -21,6 +21,7 @@ package org.apache.deltaspike.jsf.impl.clientwindow;
import org.apache.deltaspike.jsf.impl.util.ClientWindowHelper;
import jakarta.faces.context.FacesContext;
+import jakarta.faces.render.ResponseStateManager;
import java.util.HashMap;
import java.util.Map;
import org.apache.deltaspike.core.api.provider.BeanProvider;
@@ -74,7 +75,7 @@ public class LazyClientWindow extends DeltaSpikeClientWindow
}
Map<String, String> parameters = new HashMap<>();
- parameters.put(ClientWindowHelper.RequestParameters.GET_WINDOW_ID,
windowId);
+ parameters.put(ResponseStateManager.CLIENT_WINDOW_URL_PARAM, windowId);
return parameters;
}
diff --git
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java
index c5837772a..e90d2aee1 100644
---
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java
+++
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java
@@ -41,9 +41,6 @@ public abstract class ClientWindowHelper
public abstract class RequestParameters
{
- public static final String POST_WINDOW_ID = "dspwid";
- public static final String JSF_POST_WINDOW_ID =
"jakarta.faces.ClientWindow";
- public static final String GET_WINDOW_ID = "dswid";
public static final String REQUEST_TOKEN = "dsrid";
}
@@ -109,47 +106,6 @@ public abstract class ClientWindowHelper
return (String)
facesContext.getAttributes().get(INITIAL_REDIRECT_WINDOW_ID);
}
- /**
- * Appends the current windowId to the given url, if enabled via
- * {@link
ClientWindow#isClientWindowRenderModeEnabled(jakarta.faces.context.FacesContext)}
- *
- * @param facesContext the {@link FacesContext}
- * @param url the url
- * @param clientWindow the {@link ClientWindow} to use
- * @return if enabled, the url with windowId, otherwise the umodified url
- */
- public static String appendWindowId(FacesContext facesContext, String url,
ClientWindow clientWindow)
- {
- if (clientWindow != null &&
clientWindow.isClientWindowRenderModeEnabled(facesContext))
- {
- Map<String, String> parameters =
clientWindow.getQueryURLParameters(facesContext);
-
- if (parameters != null && !parameters.isEmpty())
- {
- String targetUrl = url;
-
- for (Entry<String, String> entry : parameters.entrySet())
- {
- targetUrl =
JsfUtils.addParameter(facesContext.getExternalContext(),
- targetUrl,
- true,
- entry.getKey(),
- entry.getValue());
-
- //remove empty parameter (e.g. dswid)
- String emptyParameter = entry.getKey() + "=&";
- if (targetUrl.contains(emptyParameter))
- {
- targetUrl = targetUrl.replace(emptyParameter, "");
- }
- }
- return targetUrl;
- }
- }
-
- return url;
- }
-
public static void addRequestWindowIdCookie(FacesContext context, String
requestToken, String windowId)
{
/* Sadly doesn't work due to SameSite is not allowed on Java cookies ^^
diff --git
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/view/DeltaSpikeViewHandler.java
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/view/DeltaSpikeViewHandler.java
index 784a4d8bd..d4af06f0c 100644
---
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/view/DeltaSpikeViewHandler.java
+++
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/view/DeltaSpikeViewHandler.java
@@ -26,8 +26,6 @@ import jakarta.faces.application.ViewHandler;
import jakarta.faces.application.ViewHandlerWrapper;
import jakarta.faces.component.UIViewRoot;
import jakarta.faces.context.FacesContext;
-import jakarta.faces.lifecycle.ClientWindow;
-import org.apache.deltaspike.jsf.impl.util.ClientWindowHelper;
/**
* Aggregates all {@link ViewHandler} implementations provided by DeltaSpike
@@ -68,21 +66,6 @@ public class DeltaSpikeViewHandler extends
ViewHandlerWrapper implements Deactiv
return this.securityAwareViewHandler.createView(facesContext, viewId);
}
- @Override
- public String getActionURL(FacesContext context, String viewId)
- {
- lazyInit();
-
- String actionURL = this.wrapped.getActionURL(context, viewId);
-
- ClientWindow clientWindow =
context.getExternalContext().getClientWindow();
- if (clientWindow != null)
- {
- return ClientWindowHelper.appendWindowId(context, actionURL,
clientWindow);
- }
- return actionURL;
- }
-
@Override
public ViewHandler getWrapped()
{
diff --git
a/deltaspike/modules/jsf/impl/src/main/resources/META-INF/resources/deltaspike/windowhandler.js
b/deltaspike/modules/jsf/impl/src/main/resources/META-INF/resources/deltaspike/windowhandler.js
index 851a35c0e..46ed9e9fe 100644
---
a/deltaspike/modules/jsf/impl/src/main/resources/META-INF/resources/deltaspike/windowhandler.js
+++
b/deltaspike/modules/jsf/impl/src/main/resources/META-INF/resources/deltaspike/windowhandler.js
@@ -104,8 +104,6 @@ window.dswh = window.dswh || {
init : function(ajax) {
this.overwriteLinkOnClickEvents();
this.overwriteButtonOnClickEvents();
-
- dswh.utils.appendHiddenWindowIdToForms();
},
assertWindowId : function() {
@@ -327,7 +325,7 @@ window.dswh = window.dswh || {
},
init : function(ajax) {
- dswh.utils.appendHiddenWindowIdToForms();
+
},
assertWindowId : function() {
@@ -579,22 +577,6 @@ window.dswh = window.dswh || {
return a.href;
},
- appendHiddenWindowIdToForms : function() {
- var forms = document.getElementsByTagName("form");
- for (var i = 0; i < forms.length; i++) {
- var form = forms[i];
- var dspwid = form.elements["dspwid"];
- if (!dspwid) {
- dspwid = document.createElement("INPUT");
- dspwid.setAttribute("name", "dspwid");
- dspwid.setAttribute("type", "hidden");
- form.appendChild(dspwid);
- }
-
- dspwid.setAttribute("value", dswh.windowId);
- }
- },
-
expireCookie : function(cookieName) {
var date = new Date();
date.setTime(date.getTime()-(10*24*60*60*1000)); // - 10 day
