Skip to content

Commit e30bfc7

Browse files
committed
DATAAPI-37: make sure to check for specific data api handlers in order to support custom handlers as well
1 parent d8ab897 commit e30bfc7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

interceptors/DataApiInterceptors.cfc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,16 @@ component extends="coldbox.system.Interceptor" {
9595
if ( !IsSimpleValue( restRequest ) ) {
9696
var api = restRequest.getApi();
9797
var resource = restRequest.getResource();
98+
var regex = "^data\.v1\.(WholeEntity|SingleRecord|Queue)";
9899

99-
if ( api == "/data/v1" && resource.count() ) {
100+
if ( api == "/data/v1" && reFindNoCase( regex, resource.handler ?: "" ) && resource.count() ) {
100101
dataApiService.onRestRequest( restRequest, restResponse );
101102
return;
102103
}
103104

104105
var dataApiRoutes = dataApiConfigurationService.getDataApiRoutes();
105106
for( var apiRoute in dataApiRoutes ) {
106-
if ( api == apiRoute && reFindNoCase( "^data\.v1", resource.handler ?: "" ) ) {
107+
if ( api == apiRoute && reFindNoCase( regex, resource.handler ?: "" ) ) {
107108
event.setValue( "dataApiRoute" , apiRoute );
108109
event.setValue( "dataApiHandler" , apiRoute.changeDelims( ".", "/" ) );
109110
event.setValue( "dataApiNamespace", dataApiRoutes[ apiRoute ].dataApiNamespace );

0 commit comments

Comments
 (0)