diff --git a/src/lib/features/frontend-api/frontend-api-controller.ts b/src/lib/features/frontend-api/frontend-api-controller.ts index 0889163a111..d850d65957e 100644 --- a/src/lib/features/frontend-api/frontend-api-controller.ts +++ b/src/lib/features/frontend-api/frontend-api-controller.ts @@ -213,6 +213,14 @@ export default class FrontendAPIController extends Controller { )}`, ); } + } else if ( + this.config.flagResolver.isEnabled('returnGlobalFrontendApiCache') + ) { + toggles = + await this.services.frontendApiService.getNewFrontendApiFeatures( + req.user, + FrontendAPIController.createContext(req), + ); } else { toggles = await this.services.frontendApiService.getFrontendApiFeatures( @@ -221,19 +229,13 @@ export default class FrontendAPIController extends Controller { ); } - const returnedToggles = this.config.flagResolver.isEnabled( - 'returnGlobalFrontendApiCache', - ) - ? newToggles - : toggles; - res.set('Cache-control', 'no-cache'); this.services.openApiService.respondWithValidation( 200, res, frontendApiFeaturesSchema.$id, - { toggles: returnedToggles }, + { toggles }, ); } diff --git a/src/server-dev.ts b/src/server-dev.ts index 24d3b48addb..fd3ac55bc33 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -52,7 +52,7 @@ process.nextTick(async () => { sdkReporting: true, outdatedSdksBanner: true, globalFrontendApiCache: true, - returnGlobalFrontendApiCache: true, + returnGlobalFrontendApiCache: false, }, }, authentication: {