Skip to content

Commit acbc565

Browse files
committed
Merge branch 'hotfix-3.7.3' into stable
2 parents dad9a86 + d483625 commit acbc565

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v3.7.3
4+
5+
* Support extending api endpoints for the default /api/data/v1 endpoint
6+
37
## v3.7.2
48

59
* Add missing namespace variable to batch update method

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|Docs)";
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)