Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion system/web/context/RequestContext.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -1926,7 +1926,18 @@ component serializable="false" accessors="true" {
* Determines if in an Ajax call or not by looking at the request headers
*/
boolean function isAjax(){
return ( getHTTPHeader( "X-Requested-With", "" ) eq "XMLHttpRequest" );
var xRequestedWith = getHTTPHeader( "X-Requested-With", "" );
var fetchMode = getHTTPHeader( "Sec-Fetch-Mode", "" );
var fetchDest = getHTTPHeader( "Sec-Fetch-Dest", "" );

return (
xRequestedWith eq "XMLHttpRequest" ||
(
len( fetchMode ) &&
fetchMode neq "navigate" &&
fetchDest eq "empty"
)
);
}

/***********************************************************************************************************/
Expand Down
39 changes: 39 additions & 0 deletions tests/specs/web/context/RequestContextTest.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,45 @@ component extends="coldbox.system.testing.BaseModelTest" {
assertTrue( isSimpleValue( test ) );
}

function testIsAjaxWithXMLHttpRequestHeader(){
var event = getRequestContext()
.$( "getHTTPHeader" )
.$args( "X-Requested-With", "" )
.$results( "XMLHttpRequest" );

expect( event.isAjax() ).toBeTrue();
}

function testIsAjaxWithFetchMetadataHeaders(){
var event = getRequestContext()
.$( "getHTTPHeader" )
.$args( "X-Requested-With", "" )
.$results( "" )
.$( "getHTTPHeader" )
.$args( "Sec-Fetch-Mode", "" )
.$results( "cors" )
.$( "getHTTPHeader" )
.$args( "Sec-Fetch-Dest", "" )
.$results( "empty" );

expect( event.isAjax() ).toBeTrue();
}

function testIsAjaxFalseForNavigationRequests(){
var event = getRequestContext()
.$( "getHTTPHeader" )
.$args( "X-Requested-With", "" )
.$results( "" )
.$( "getHTTPHeader" )
.$args( "Sec-Fetch-Mode", "" )
.$results( "navigate" )
.$( "getHTTPHeader" )
.$args( "Sec-Fetch-Dest", "" )
.$results( "document" );

expect( event.isAjax() ).toBeFalse();
}

function testNoLayout(){
var event = getRequestContext();

Expand Down
Loading