Fixes #9455 - Use link generator to generate forward links, allowing same args as redirect

Author: graemerocher

grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/RequestForwarder.groovy

@@ -17,16 +17,23 @@ package grails.artefact.controller.support
 
 import grails.web.UrlConverter
 import grails.web.api.WebAttributes
+import grails.web.mapping.LinkGenerator
 import grails.web.servlet.mvc.GrailsParameterMap
 import groovy.transform.CompileStatic
 import org.grails.plugins.web.controllers.metaclass.ForwardMethod
 import org.grails.web.mapping.ForwardUrlMappingInfo
 import org.grails.web.mapping.UrlMappingUtils
+import org.grails.web.mapping.mvc.UrlMappingsHandlerMapping
 import org.grails.web.servlet.mvc.GrailsWebRequest
 import org.grails.web.util.GrailsApplicationAttributes
+import org.grails.web.util.WebUtils
 import org.springframework.beans.MutablePropertyValues
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.validation.DataBinder
+import org.springframework.web.context.request.WebRequest
+import org.springframework.web.filter.OncePerRequestFilter
+
+import javax.servlet.RequestDispatcher
 
 /**
  * A Trait for classes that forward the request
@@ -37,22 +44,27 @@ import org.springframework.validation.DataBinder
 @CompileStatic
 trait RequestForwarder implements WebAttributes {
     private UrlConverter urlConverter
+    private LinkGenerator linkGenerator
 
     @Autowired(required=false)
     void setUrlConverter(UrlConverter urlConverter) {
         this.urlConverter = urlConverter
     }
 
+    private LinkGenerator lookupLinkGenerator() {
+        if(this.linkGenerator == null) {
+            this.linkGenerator = webRequest.getApplicationContext().getBean(LinkGenerator)
+        }
+        return this.linkGenerator
+    }
+
     /**
      * Forwards a request for the given parameters using the RequestDispatchers forward method
      *
      * @param params The parameters
      * @return The forwarded URL
      */
     String forward(Map params) {
-        def urlInfo = new ForwardUrlMappingInfo()
-        DataBinder binder = new DataBinder(urlInfo)
-        binder.bind(new MutablePropertyValues(params))
 
         GrailsWebRequest webRequest = getWebRequest()
 
@@ -68,18 +80,18 @@ trait RequestForwarder implements WebAttributes {
                 def convertedControllerName = convert(controllerName.toString())
                 webRequest.controllerName = convertedControllerName
             }
-            urlInfo.controllerName = webRequest.controllerName
+            params.controller = webRequest.controllerName
 
             if(params.action) {
-                urlInfo.actionName = convert(params.action.toString())
+                params.action = convert(params.action.toString())
             }
 
             if(params.namespace) {
-                urlInfo.namespace = params.namespace
+                params.namespace = params.namespace
             }
 
             if(params.plugin) {
-                urlInfo.pluginName = params.plugin
+                params.plugin = params.plugin
             }
         }
 
@@ -88,14 +100,21 @@ trait RequestForwarder implements WebAttributes {
         def request = webRequest.currentRequest
         def response = webRequest.currentResponse
 
-        request.setAttribute(GrailsApplicationAttributes.FORWARD_IN_PROGRESS, true)
+        WebUtils.exposeRequestAttributes(request, (Map)model);
 
-        if(params.params instanceof Map) {
-            urlInfo.parameters.putAll((Map)params.params)
-        }
+        request.setAttribute(GrailsApplicationAttributes.FORWARD_IN_PROGRESS, true)
         request.setAttribute(GrailsApplicationAttributes.FORWARD_ISSUED, true)
-        String uri = UrlMappingUtils.forwardRequestForUrlMappingInfo(request, response, urlInfo, (Map)model, true)
-        return uri
+
+        def fowardURI = lookupLinkGenerator().link(params)
+
+
+        RequestDispatcher dispatcher = request.getRequestDispatcher(fowardURI)
+        webRequest.removeAttribute(GrailsApplicationAttributes.MODEL_AND_VIEW, 0);
+        webRequest.removeAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, WebRequest.SCOPE_REQUEST);
+        webRequest.removeAttribute(UrlMappingsHandlerMapping.MATCHED_REQUEST, WebRequest.SCOPE_REQUEST);
+        webRequest.removeAttribute("grailsWebRequestFilter" + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX, WebRequest.SCOPE_REQUEST);
+        dispatcher.forward(request, response);
+        return fowardURI
     }
 
 

grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodTests.groovy

@@ -21,7 +21,7 @@ class ForwardMethodTests extends AbstractGrailsControllerTests {
         webRequest.controllerName = "fowarding"
         assertEquals "/fowarding/two",testController.one()
         assertEquals "/next/go",testController.three()
-        assertEquals "/next/go?id=10",testController.four()
+        assertEquals "/next/go/10",testController.four()
         assertEquals "bar", request.foo
     }
 }

grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodspec.groovy

@@ -1,6 +1,7 @@
 package org.grails.web.metaclass
 
 import grails.artefact.Controller
+import grails.web.mapping.LinkGenerator
 import org.springframework.web.context.request.RequestContextHolder
 
 import javax.servlet.RequestDispatcher
@@ -36,6 +37,13 @@ class ForwardMethodSpec extends Specification {
         response = Mock(HttpServletResponse)
         dispatcher = Mock(RequestDispatcher)
         urlConverter = Mock(UrlConverter)
+
+        def linkGenerator = Mock(LinkGenerator)
+        linkGenerator.link(_) >> { args ->
+            def map = args[0]
+            "/$map.controller/$map.action"
+        }
+        appContext.getBean(LinkGenerator) >> linkGenerator
 
         webRequest = new GrailsWebRequest(request, response, servletContext, appContext)
         RequestContextHolder.setRequestAttributes(webRequest)

grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingUtils.java

@@ -162,10 +162,10 @@ public static String forwardRequestForUrlMappingInfo(HttpServletRequest request,
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static String forwardRequestForUrlMappingInfo(HttpServletRequest request,
             HttpServletResponse response, UrlMappingInfo info, Map model, boolean includeParams) throws ServletException, IOException {
-        org.springframework.web.util.WebUtils.exposeRequestAttributes(request, model);
 
         String forwardUrl = buildDispatchUrlForMapping(info, includeParams);
 
+        org.springframework.web.util.WebUtils.exposeRequestAttributes(request, model);
         //populateParamsForMapping(info);
         RequestDispatcher dispatcher = request.getRequestDispatcher(forwardUrl);