fixed harding api and removed not used stuff

strapi-community · Oct 12, 2023 · 2c55dd8 · 2c55dd8
1 parent 7b32656
commit 2c55dd8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 36 deletions.
diff --git a/packages/strapi-plugin-rest-cache/server/utils/config/resolveUserStrategy.js b/packages/strapi-plugin-rest-cache/server/utils/config/resolveUserStrategy.js
@@ -5,10 +5,8 @@
  * @typedef {import('@strapi/strapi').Strapi} Strapi
  */
 
-const debug = require('debug')('strapi:strapi-plugin-rest-cache');
 const { getRelatedModelsUid } = require('./getRelatedModelsUid');
 const { deepFreeze } = require('./deepFreeze');
-const { routeExists } = require('./routeExists');
 const {
   CachePluginStrategy,
   CacheRouteConfig,
@@ -144,7 +142,7 @@ function resolveUserStrategy(strapi, userOptions) {
           ) {
             cacheConfig.routes.push(
               new CacheRouteConfig({
-                path: `/api${route.path}`,
+                path: `/${apiPrefix}${route.path}`,
                 paramNames: route.path.match(routeParams) ?? [],
                 method: route.method,
                 keys: new CacheKeysConfig(cacheConfig.keys),
@@ -162,7 +160,7 @@ function resolveUserStrategy(strapi, userOptions) {
           ) {
             cacheConfig.routes.push(
               new CacheRouteConfig({
-                path: `/api${route.path}`,
+                path: `/${apiPrefix}${route.path}`,
                 paramNames: route.path.match(routeParams) ?? [],
                 method: route.method,
                 keys: new CacheKeysConfig(cacheConfig.keys),
@@ -177,7 +175,7 @@ function resolveUserStrategy(strapi, userOptions) {
           ) {
             cacheConfig.routes.push(
               new CacheRouteConfig({
-                path: `/api${route.path}`,
+                path: `/${apiPrefix}${route.path}`,
                 paramNames: route.path.match(routeParams) ?? [],
                 method: route.method,
                 keys: new CacheKeysConfig(cacheConfig.keys),

diff --git a/packages/strapi-plugin-rest-cache/server/utils/config/routeExists.js b/packages/strapi-plugin-rest-cache/server/utils/config/routeExists.js
diff --git a/packages/strapi-plugin-rest-cache/server/utils/middlewares/flattenRoutes.js b/packages/strapi-plugin-rest-cache/server/utils/middlewares/flattenRoutes.js
@@ -4,14 +4,18 @@
  * @param {Strapi} strapi
  * @return {void}
  */
+
 function flattenRoutes(strapi) {
   let routes = [];
   for (const contentTypes of Object.values(strapi.api)) {
     routes = routes.concat(flatten(contentTypes));
   }
   // @TODO add prefix support before doing this
+
+  const apiPrefix = strapi.config.get('api.rest.prefix');
+
   for (const route of routes) {
-    route.globalPath = `/api${route.path}`;
+    route.globalPath = `/${apiPrefix}${route.path}`;
   }
   return routes;
 }