Grails Web: Improvements for HttpServletReuest.isXhr

Fixes issue: groovy.lang.MissingMethodException: No signature of method: org.apache.catalina.connector.RequestFacade.isXhr() is applicable for argument types: () values: []
graceframework · Mar 25, 2023 · 89d53c1 · 89d53c1
1 parent ef4a090
commit 89d53c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...-plugin-mimetypes/src/main/groovy/org/grails/web/mime/HttpServletResponseExtension.groovy b/...-plugin-mimetypes/src/main/groovy/org/grails/web/mime/HttpServletResponseExtension.groovy
@@ -256,7 +256,7 @@ class HttpServletResponseExtension {
             def parser = new DefaultAcceptHeaderParser(getMimeTypes())
             String header = null
 
-            boolean disabledForUserAgent = !(useAcceptHeaderXhr && request.xhr) && disableForUserAgents != null &&
+            boolean disabledForUserAgent = !(useAcceptHeaderXhr && isAjaxRequest(request)) && disableForUserAgents != null &&
                     userAgent ? disableForUserAgents.matcher(userAgent).find() : false
             if (msie) {
                 header = '*/*'
@@ -283,4 +283,8 @@ class HttpServletResponseExtension {
         result
     }
 
+    private static boolean isAjaxRequest(HttpServletRequest request) {
+        request.getHeader('X-Requested-With') == 'XMLHttpRequest'
+    }
+
 }
diff --git a/grails-web/src/main/groovy/org/grails/web/servlet/HttpServletRequestExtension.groovy b/grails-web/src/main/groovy/org/grails/web/servlet/HttpServletRequestExtension.groovy
@@ -139,9 +139,9 @@ class HttpServletRequestExtension {
         results
     }
 
-    static boolean isXhr(HttpServletRequest instance) {
+    static boolean isXhr(HttpServletRequest request) {
         // TODO grails.web.xhr.identifier support
-        instance.getHeader('X-Requested-With') == 'XMLHttpRequest'
+        request.getHeader('X-Requested-With') == 'XMLHttpRequest'
     }
 
     static boolean isGet(HttpServletRequest request) {