@strapi/admin 5.44.0 → 5.45.0

package/dist/server/server/src/controllers/api-token.js

@@ -7,14 +7,14 @@ var apiTokens = require('../validation/api-tokens.js');
 
 const { ApplicationError } = utils.errors;
 var apiToken = {
+    // -------------------------------------------------------------------------
+    // Create
+    // -------------------------------------------------------------------------
     async create (ctx) {
         const { body } = ctx.request;
-        const apiTokenService = index.getService('api-token');
-        /**
-     * We trim both field to avoid having issues with either:
-     * - having a space at the end or start of the value.
-     * - having only spaces as value;
-     */ const attributes = {
+        const apiTokenService = index.getService('api-token-content-api');
+        const attributes = {
+            kind: 'content-api',
             name: fp.trim(body.name),
             description: fp.trim(body.description),
             type: body.type,
@@ -28,16 +28,19 @@ var apiToken = {
         if (alreadyExists) {
             throw new ApplicationError('Name already taken');
         }
-        const apiToken = await apiTokenService.create(attributes);
+        const apiToken = await apiTokenService.create(attributes, ctx.state.user);
         ctx.created({
             data: apiToken
         });
     },
+    // -------------------------------------------------------------------------
+    // Regenerate
+    // -------------------------------------------------------------------------
     async regenerate (ctx) {
         const { id } = ctx.params;
-        const apiTokenService = index.getService('api-token');
-        const apiTokenExists = await apiTokenService.getById(id);
-        if (!apiTokenExists) {
+        const apiTokenService = index.getService('api-token-content-api');
+        const token = await apiTokenService.getById(id);
+        if (!token) {
             ctx.notFound('API Token not found');
             return;
         }
@@ -46,76 +49,74 @@ var apiToken = {
             data: accessToken
         });
     },
+    // -------------------------------------------------------------------------
+    // List — always content-api
+    // -------------------------------------------------------------------------
     async list (ctx) {
-        const apiTokenService = index.getService('api-token');
-        const apiTokens = await apiTokenService.list();
+        const apiTokenService = index.getService('api-token-content-api');
+        const apiTokens = await apiTokenService.list(ctx.state.user);
         ctx.send({
             data: apiTokens
         });
     },
+    // -------------------------------------------------------------------------
+    // Revoke
+    // -------------------------------------------------------------------------
     async revoke (ctx) {
         const { id } = ctx.params;
-        const apiTokenService = index.getService('api-token');
+        const apiTokenService = index.getService('api-token-content-api');
         const apiToken = await apiTokenService.revoke(id);
         ctx.deleted({
             data: apiToken
         });
     },
+    // -------------------------------------------------------------------------
+    // Get — always expose the decrypted key (content-api back-compat)
+    // -------------------------------------------------------------------------
     async get (ctx) {
         const { id } = ctx.params;
-        const apiTokenService = index.getService('api-token');
-        const apiToken = await apiTokenService.getById(id);
-        if (!apiToken) {
+        const apiTokenService = index.getService('api-token-content-api');
+        const token = await apiTokenService.getById(id);
+        if (!token) {
             ctx.notFound('API Token not found');
             return;
         }
+        const withKey = await apiTokenService.getById(id, {
+            includeDecryptedKey: true
+        });
         ctx.send({
-            data: apiToken
+            data: withKey ?? token
         });
     },
+    // -------------------------------------------------------------------------
+    // Update
+    // -------------------------------------------------------------------------
     async update (ctx) {
         const { body } = ctx.request;
         const { id } = ctx.params;
-        const apiTokenService = index.getService('api-token');
-        const attributes = body;
-        /**
-     * We trim both field to avoid having issues with either:
-     * - having a space at the end or start of the value.
-     * - having only spaces as value;
-     */ if (fp.has('name', attributes)) {
-            attributes.name = fp.trim(body.name);
+        const apiTokenService = index.getService('api-token-content-api');
+        const mutableBody = body;
+        if (fp.has('name', mutableBody)) {
+            mutableBody.name = fp.trim(body.name ?? '');
         }
-        if (fp.has('description', attributes) || attributes.description === null) {
-            attributes.description = fp.trim(body.description);
+        if (fp.has('description', mutableBody) || mutableBody.description === null) {
+            mutableBody.description = fp.trim(body.description ?? '');
         }
-        await apiTokens.validateApiTokenUpdateInput(attributes);
-        const apiTokenExists = await apiTokenService.getById(id);
-        if (!apiTokenExists) {
+        await apiTokens.validateApiTokenUpdateInput(body);
+        const existingToken = await apiTokenService.getById(id);
+        if (!existingToken) {
             return ctx.notFound('API Token not found');
         }
-        if (fp.has('name', attributes)) {
-            const nameAlreadyTaken = await apiTokenService.getByName(attributes.name);
-            /**
-       * We cast the ids as string as the one coming from the ctx isn't cast
-       * as a Number in case it is supposed to be an integer. It remains
-       * as a string. This way we avoid issues with integers in the db.
-       */ if (!!nameAlreadyTaken && !utils.strings.isEqual(nameAlreadyTaken.id, id)) {
+        if (fp.has('name', body)) {
+            const nameAlreadyTaken = await apiTokenService.getByName(body.name);
+            if (nameAlreadyTaken !== null && !utils.strings.isEqual(nameAlreadyTaken.id, id)) {
                 throw new ApplicationError('Name already taken');
             }
         }
-        const apiToken = await apiTokenService.update(id, attributes);
+        const apiToken = await apiTokenService.update(id, body);
         ctx.send({
             data: apiToken
         });
-    },
-    async getLayout (ctx) {
-        const apiTokenService = index.getService('api-token');
-        // TODO
-        // @ts-expect-error remove this controller if not used
-        const layout = await apiTokenService.getApiTokenLayout();
-        ctx.send({
-            data: layout
-        });
     }
 };
 

package/dist/server/server/src/controllers/api-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-token.js","sources":["../../../../../server/src/controllers/api-token.ts"],"sourcesContent":["import type { Context } from 'koa';\n\nimport { strings, errors } from '@strapi/utils';\nimport { trim, has } from 'lodash/fp';\nimport { getService } from '../utils';\nimport {\n  validateApiTokenCreationInput,\n  validateApiTokenUpdateInput,\n} from '../validation/api-tokens';\n\nimport { Create, List, Revoke, Get, Update } from '../../../shared/contracts/api-token';\n\nconst { ApplicationError } = errors;\n\nexport default {\n  async create(ctx: Context) {\n    const { body } = ctx.request as Create.Request;\n    const apiTokenService = getService('api-token');\n\n    /**\n     * We trim both field to avoid having issues with either:\n     * - having a space at the end or start of the value.\n     * - having only spaces as value;\n     */\n    const attributes = {\n      name: trim(body.name),\n      description: trim(body.description),\n      type: body.type,\n      permissions: body.permissions,\n      lifespan: body.lifespan,\n    };\n\n    await validateApiTokenCreationInput(attributes);\n\n    const alreadyExists = await apiTokenService.exists({ name: attributes.name });\n    if (alreadyExists) {\n      throw new ApplicationError('Name already taken');\n    }\n\n    const apiToken = await apiTokenService.create(attributes);\n    ctx.created({ data: apiToken } satisfies Create.Response);\n  },\n\n  async regenerate(ctx: Context) {\n    const { id } = ctx.params;\n    const apiTokenService = getService('api-token');\n\n    const apiTokenExists = await apiTokenService.getById(id);\n    if (!apiTokenExists) {\n      ctx.notFound('API Token not found');\n      return;\n    }\n\n    const accessToken = await apiTokenService.regenerate(id);\n\n    ctx.created({ data: accessToken });\n  },\n\n  async list(ctx: Context) {\n    const apiTokenService = getService('api-token');\n    const apiTokens = await apiTokenService.list();\n\n    ctx.send({ data: apiTokens } satisfies List.Response);\n  },\n\n  async revoke(ctx: Context) {\n    const { id } = ctx.params as Revoke.Params;\n    const apiTokenService = getService('api-token');\n    const apiToken = await apiTokenService.revoke(id);\n\n    ctx.deleted({ data: apiToken } satisfies Revoke.Response);\n  },\n\n  async get(ctx: Context) {\n    const { id } = ctx.params;\n    const apiTokenService = getService('api-token');\n    const apiToken = await apiTokenService.getById(id);\n\n    if (!apiToken) {\n      ctx.notFound('API Token not found');\n      return;\n    }\n\n    ctx.send({ data: apiToken } satisfies Get.Response);\n  },\n\n  async update(ctx: Context) {\n    const { body } = ctx.request as Update.Request;\n    const { id } = ctx.params as Update.Params;\n    const apiTokenService = getService('api-token');\n\n    const attributes = body;\n    /**\n     * We trim both field to avoid having issues with either:\n     * - having a space at the end or start of the value.\n     * - having only spaces as value;\n     */\n    if (has('name', attributes)) {\n      attributes.name = trim(body.name);\n    }\n\n    if (has('description', attributes) || attributes.description === null) {\n      attributes.description = trim(body.description);\n    }\n\n    await validateApiTokenUpdateInput(attributes);\n\n    const apiTokenExists = await apiTokenService.getById(id);\n    if (!apiTokenExists) {\n      return ctx.notFound('API Token not found');\n    }\n\n    if (has('name', attributes)) {\n      const nameAlreadyTaken = await apiTokenService.getByName(attributes.name);\n\n      /**\n       * We cast the ids as string as the one coming from the ctx isn't cast\n       * as a Number in case it is supposed to be an integer. It remains\n       * as a string. This way we avoid issues with integers in the db.\n       */\n      if (!!nameAlreadyTaken && !strings.isEqual(nameAlreadyTaken.id, id)) {\n        throw new ApplicationError('Name already taken');\n      }\n    }\n\n    const apiToken = await apiTokenService.update(id, attributes);\n    ctx.send({ data: apiToken } satisfies Update.Response);\n  },\n\n  async getLayout(ctx: Context) {\n    const apiTokenService = getService('api-token');\n    // TODO\n    // @ts-expect-error remove this controller if not used\n    const layout = await apiTokenService.getApiTokenLayout();\n\n    ctx.send({ data: layout });\n  },\n};\n"],"names":["ApplicationError","errors","create","ctx","body","request","apiTokenService","getService","attributes","name","trim","description","type","permissions","lifespan","validateApiTokenCreationInput","alreadyExists","exists","apiToken","created","data","regenerate","id","params","apiTokenExists","getById","notFound","accessToken","list","apiTokens","send","revoke","deleted","get","update","has","validateApiTokenUpdateInput","nameAlreadyTaken","getByName","strings","isEqual","getLayout","layout","getApiTokenLayout"],"mappings":"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"}
+{"version":3,"file":"api-token.js","sources":["../../../../../server/src/controllers/api-token.ts"],"sourcesContent":["import type { Context } from 'koa';\n\nimport { strings, errors } from '@strapi/utils';\nimport { trim, has } from 'lodash/fp';\nimport { getService } from '../utils';\nimport {\n  validateApiTokenCreationInput,\n  validateApiTokenUpdateInput,\n} from '../validation/api-tokens';\n\nimport { Create, List, Revoke, Get, Update } from '../../../shared/contracts/api-token';\n\nconst { ApplicationError } = errors;\n\nexport default {\n  // -------------------------------------------------------------------------\n  // Create\n  // -------------------------------------------------------------------------\n  async create(ctx: Context) {\n    const { body } = ctx.request as Create.Request;\n    const apiTokenService = getService('api-token-content-api');\n\n    const attributes = {\n      kind: 'content-api' as const,\n      name: trim(body.name),\n      description: trim(body.description),\n      type: body.type,\n      permissions: body.permissions,\n      lifespan: body.lifespan,\n    };\n\n    await validateApiTokenCreationInput(attributes);\n\n    const alreadyExists = await apiTokenService.exists({ name: attributes.name });\n    if (alreadyExists) {\n      throw new ApplicationError('Name already taken');\n    }\n\n    const apiToken = await apiTokenService.create(attributes, ctx.state.user);\n    ctx.created({ data: apiToken } satisfies Create.Response);\n  },\n\n  // -------------------------------------------------------------------------\n  // Regenerate\n  // -------------------------------------------------------------------------\n  async regenerate(ctx: Context) {\n    const { id } = ctx.params;\n    const apiTokenService = getService('api-token-content-api');\n\n    const token = await apiTokenService.getById(id);\n    if (!token) {\n      ctx.notFound('API Token not found');\n      return;\n    }\n\n    const accessToken = await apiTokenService.regenerate(id);\n    ctx.created({ data: accessToken });\n  },\n\n  // -------------------------------------------------------------------------\n  // List — always content-api\n  // -------------------------------------------------------------------------\n  async list(ctx: Context) {\n    const apiTokenService = getService('api-token-content-api');\n    const apiTokens = await apiTokenService.list(ctx.state.user);\n\n    ctx.send({ data: apiTokens } satisfies List.Response);\n  },\n\n  // -------------------------------------------------------------------------\n  // Revoke\n  // -------------------------------------------------------------------------\n  async revoke(ctx: Context) {\n    const { id } = ctx.params as Revoke.Params;\n    const apiTokenService = getService('api-token-content-api');\n    const apiToken = await apiTokenService.revoke(id);\n\n    ctx.deleted({ data: apiToken } satisfies Revoke.Response);\n  },\n\n  // -------------------------------------------------------------------------\n  // Get — always expose the decrypted key (content-api back-compat)\n  // -------------------------------------------------------------------------\n  async get(ctx: Context) {\n    const { id } = ctx.params;\n    const apiTokenService = getService('api-token-content-api');\n\n    const token = await apiTokenService.getById(id);\n    if (!token) {\n      ctx.notFound('API Token not found');\n      return;\n    }\n\n    const withKey = await apiTokenService.getById(id, { includeDecryptedKey: true });\n    ctx.send({ data: withKey ?? token } satisfies Get.Response);\n  },\n\n  // -------------------------------------------------------------------------\n  // Update\n  // -------------------------------------------------------------------------\n  async update(ctx: Context) {\n    const { body } = ctx.request as Update.Request;\n    const { id } = ctx.params as Update.Params;\n    const apiTokenService = getService('api-token-content-api');\n\n    const mutableBody = body as Record<string, unknown>;\n    if (has('name', mutableBody)) {\n      mutableBody.name = trim(body.name ?? '');\n    }\n    if (has('description', mutableBody) || mutableBody.description === null) {\n      mutableBody.description = trim(body.description ?? '');\n    }\n\n    await validateApiTokenUpdateInput(body);\n\n    const existingToken = await apiTokenService.getById(id);\n    if (!existingToken) {\n      return ctx.notFound('API Token not found');\n    }\n\n    if (has('name', body)) {\n      const nameAlreadyTaken = await apiTokenService.getByName(body.name!);\n      if (nameAlreadyTaken !== null && !strings.isEqual(nameAlreadyTaken.id, id)) {\n        throw new ApplicationError('Name already taken');\n      }\n    }\n\n    const apiToken = await apiTokenService.update(id, body);\n    ctx.send({ data: apiToken } satisfies Update.Response);\n  },\n};\n"],"names":["ApplicationError","errors","create","ctx","body","request","apiTokenService","getService","attributes","kind","name","trim","description","type","permissions","lifespan","validateApiTokenCreationInput","alreadyExists","exists","apiToken","state","user","created","data","regenerate","id","params","token","getById","notFound","accessToken","list","apiTokens","send","revoke","deleted","get","withKey","includeDecryptedKey","update","mutableBody","has","validateApiTokenUpdateInput","existingToken","nameAlreadyTaken","getByName","strings","isEqual"],"mappings":"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"}

package/dist/server/server/src/controllers/api-token.mjs

@@ -5,14 +5,14 @@ import { validateApiTokenUpdateInput, validateApiTokenCreationInput } from '../v
 
 const { ApplicationError } = errors;
 var apiToken = {
+    // -------------------------------------------------------------------------
+    // Create
+    // -------------------------------------------------------------------------
     async create (ctx) {
         const { body } = ctx.request;
-        const apiTokenService = getService('api-token');
-        /**
-     * We trim both field to avoid having issues with either:
-     * - having a space at the end or start of the value.
-     * - having only spaces as value;
-     */ const attributes = {
+        const apiTokenService = getService('api-token-content-api');
+        const attributes = {
+            kind: 'content-api',
             name: trim(body.name),
             description: trim(body.description),
             type: body.type,
@@ -26,16 +26,19 @@ var apiToken = {
         if (alreadyExists) {
             throw new ApplicationError('Name already taken');
         }
-        const apiToken = await apiTokenService.create(attributes);
+        const apiToken = await apiTokenService.create(attributes, ctx.state.user);
         ctx.created({
             data: apiToken
         });
     },
+    // -------------------------------------------------------------------------
+    // Regenerate
+    // -------------------------------------------------------------------------
     async regenerate (ctx) {
         const { id } = ctx.params;
-        const apiTokenService = getService('api-token');
-        const apiTokenExists = await apiTokenService.getById(id);
-        if (!apiTokenExists) {
+        const apiTokenService = getService('api-token-content-api');
+        const token = await apiTokenService.getById(id);
+        if (!token) {
             ctx.notFound('API Token not found');
             return;
         }
@@ -44,76 +47,74 @@ var apiToken = {
             data: accessToken
         });
     },
+    // -------------------------------------------------------------------------
+    // List — always content-api
+    // -------------------------------------------------------------------------
     async list (ctx) {
-        const apiTokenService = getService('api-token');
-        const apiTokens = await apiTokenService.list();
+        const apiTokenService = getService('api-token-content-api');
+        const apiTokens = await apiTokenService.list(ctx.state.user);
         ctx.send({
             data: apiTokens
         });
     },
+    // -------------------------------------------------------------------------
+    // Revoke
+    // -------------------------------------------------------------------------
     async revoke (ctx) {
         const { id } = ctx.params;
-        const apiTokenService = getService('api-token');
+        const apiTokenService = getService('api-token-content-api');
         const apiToken = await apiTokenService.revoke(id);
         ctx.deleted({
             data: apiToken
         });
     },
+    // -------------------------------------------------------------------------
+    // Get — always expose the decrypted key (content-api back-compat)
+    // -------------------------------------------------------------------------
     async get (ctx) {
         const { id } = ctx.params;
-        const apiTokenService = getService('api-token');
-        const apiToken = await apiTokenService.getById(id);
-        if (!apiToken) {
+        const apiTokenService = getService('api-token-content-api');
+        const token = await apiTokenService.getById(id);
+        if (!token) {
             ctx.notFound('API Token not found');
             return;
         }
+        const withKey = await apiTokenService.getById(id, {
+            includeDecryptedKey: true
+        });
         ctx.send({
-            data: apiToken
+            data: withKey ?? token
         });
     },
+    // -------------------------------------------------------------------------
+    // Update
+    // -------------------------------------------------------------------------
     async update (ctx) {
         const { body } = ctx.request;
         const { id } = ctx.params;
-        const apiTokenService = getService('api-token');
-        const attributes = body;
-        /**
-     * We trim both field to avoid having issues with either:
-     * - having a space at the end or start of the value.
-     * - having only spaces as value;
-     */ if (has('name', attributes)) {
-            attributes.name = trim(body.name);
+        const apiTokenService = getService('api-token-content-api');
+        const mutableBody = body;
+        if (has('name', mutableBody)) {
+            mutableBody.name = trim(body.name ?? '');
         }
-        if (has('description', attributes) || attributes.description === null) {
-            attributes.description = trim(body.description);
+        if (has('description', mutableBody) || mutableBody.description === null) {
+            mutableBody.description = trim(body.description ?? '');
         }
-        await validateApiTokenUpdateInput(attributes);
-        const apiTokenExists = await apiTokenService.getById(id);
-        if (!apiTokenExists) {
+        await validateApiTokenUpdateInput(body);
+        const existingToken = await apiTokenService.getById(id);
+        if (!existingToken) {
             return ctx.notFound('API Token not found');
         }
-        if (has('name', attributes)) {
-            const nameAlreadyTaken = await apiTokenService.getByName(attributes.name);
-            /**
-       * We cast the ids as string as the one coming from the ctx isn't cast
-       * as a Number in case it is supposed to be an integer. It remains
-       * as a string. This way we avoid issues with integers in the db.
-       */ if (!!nameAlreadyTaken && !strings.isEqual(nameAlreadyTaken.id, id)) {
+        if (has('name', body)) {
+            const nameAlreadyTaken = await apiTokenService.getByName(body.name);
+            if (nameAlreadyTaken !== null && !strings.isEqual(nameAlreadyTaken.id, id)) {
                 throw new ApplicationError('Name already taken');
             }
         }
-        const apiToken = await apiTokenService.update(id, attributes);
+        const apiToken = await apiTokenService.update(id, body);
         ctx.send({
             data: apiToken
         });
-    },
-    async getLayout (ctx) {
-        const apiTokenService = getService('api-token');
-        // TODO
-        // @ts-expect-error remove this controller if not used
-        const layout = await apiTokenService.getApiTokenLayout();
-        ctx.send({
-            data: layout
-        });
     }
 };
 

package/dist/server/server/src/controllers/api-token.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"api-token.mjs","sources":["../../../../../server/src/controllers/api-token.ts"],"sourcesContent":["import type { Context } from 'koa';\n\nimport { strings, errors } from '@strapi/utils';\nimport { trim, has } from 'lodash/fp';\nimport { getService } from '../utils';\nimport {\n  validateApiTokenCreationInput,\n  validateApiTokenUpdateInput,\n} from '../validation/api-tokens';\n\nimport { Create, List, Revoke, Get, Update } from '../../../shared/contracts/api-token';\n\nconst { ApplicationError } = errors;\n\nexport default {\n  async create(ctx: Context) {\n    const { body } = ctx.request as Create.Request;\n    const apiTokenService = getService('api-token');\n\n    /**\n     * We trim both field to avoid having issues with either:\n     * - having a space at the end or start of the value.\n     * - having only spaces as value;\n     */\n    const attributes = {\n      name: trim(body.name),\n      description: trim(body.description),\n      type: body.type,\n      permissions: body.permissions,\n      lifespan: body.lifespan,\n    };\n\n    await validateApiTokenCreationInput(attributes);\n\n    const alreadyExists = await apiTokenService.exists({ name: attributes.name });\n    if (alreadyExists) {\n      throw new ApplicationError('Name already taken');\n    }\n\n    const apiToken = await apiTokenService.create(attributes);\n    ctx.created({ data: apiToken } satisfies Create.Response);\n  },\n\n  async regenerate(ctx: Context) {\n    const { id } = ctx.params;\n    const apiTokenService = getService('api-token');\n\n    const apiTokenExists = await apiTokenService.getById(id);\n    if (!apiTokenExists) {\n      ctx.notFound('API Token not found');\n      return;\n    }\n\n    const accessToken = await apiTokenService.regenerate(id);\n\n    ctx.created({ data: accessToken });\n  },\n\n  async list(ctx: Context) {\n    const apiTokenService = getService('api-token');\n    const apiTokens = await apiTokenService.list();\n\n    ctx.send({ data: apiTokens } satisfies List.Response);\n  },\n\n  async revoke(ctx: Context) {\n    const { id } = ctx.params as Revoke.Params;\n    const apiTokenService = getService('api-token');\n    const apiToken = await apiTokenService.revoke(id);\n\n    ctx.deleted({ data: apiToken } satisfies Revoke.Response);\n  },\n\n  async get(ctx: Context) {\n    const { id } = ctx.params;\n    const apiTokenService = getService('api-token');\n    const apiToken = await apiTokenService.getById(id);\n\n    if (!apiToken) {\n      ctx.notFound('API Token not found');\n      return;\n    }\n\n    ctx.send({ data: apiToken } satisfies Get.Response);\n  },\n\n  async update(ctx: Context) {\n    const { body } = ctx.request as Update.Request;\n    const { id } = ctx.params as Update.Params;\n    const apiTokenService = getService('api-token');\n\n    const attributes = body;\n    /**\n     * We trim both field to avoid having issues with either:\n     * - having a space at the end or start of the value.\n     * - having only spaces as value;\n     */\n    if (has('name', attributes)) {\n      attributes.name = trim(body.name);\n    }\n\n    if (has('description', attributes) || attributes.description === null) {\n      attributes.description = trim(body.description);\n    }\n\n    await validateApiTokenUpdateInput(attributes);\n\n    const apiTokenExists = await apiTokenService.getById(id);\n    if (!apiTokenExists) {\n      return ctx.notFound('API Token not found');\n    }\n\n    if (has('name', attributes)) {\n      const nameAlreadyTaken = await apiTokenService.getByName(attributes.name);\n\n      /**\n       * We cast the ids as string as the one coming from the ctx isn't cast\n       * as a Number in case it is supposed to be an integer. It remains\n       * as a string. This way we avoid issues with integers in the db.\n       */\n      if (!!nameAlreadyTaken && !strings.isEqual(nameAlreadyTaken.id, id)) {\n        throw new ApplicationError('Name already taken');\n      }\n    }\n\n    const apiToken = await apiTokenService.update(id, attributes);\n    ctx.send({ data: apiToken } satisfies Update.Response);\n  },\n\n  async getLayout(ctx: Context) {\n    const apiTokenService = getService('api-token');\n    // TODO\n    // @ts-expect-error remove this controller if not used\n    const layout = await apiTokenService.getApiTokenLayout();\n\n    ctx.send({ data: layout });\n  },\n};\n"],"names":["ApplicationError","errors","create","ctx","body","request","apiTokenService","getService","attributes","name","trim","description","type","permissions","lifespan","validateApiTokenCreationInput","alreadyExists","exists","apiToken","created","data","regenerate","id","params","apiTokenExists","getById","notFound","accessToken","list","apiTokens","send","revoke","deleted","get","update","has","validateApiTokenUpdateInput","nameAlreadyTaken","getByName","strings","isEqual","getLayout","layout","getApiTokenLayout"],"mappings":"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"}
+{"version":3,"file":"api-token.mjs","sources":["../../../../../server/src/controllers/api-token.ts"],"sourcesContent":["import type { Context } from 'koa';\n\nimport { strings, errors } from '@strapi/utils';\nimport { trim, has } from 'lodash/fp';\nimport { getService } from '../utils';\nimport {\n  validateApiTokenCreationInput,\n  validateApiTokenUpdateInput,\n} from '../validation/api-tokens';\n\nimport { Create, List, Revoke, Get, Update } from '../../../shared/contracts/api-token';\n\nconst { ApplicationError } = errors;\n\nexport default {\n  // -------------------------------------------------------------------------\n  // Create\n  // -------------------------------------------------------------------------\n  async create(ctx: Context) {\n    const { body } = ctx.request as Create.Request;\n    const apiTokenService = getService('api-token-content-api');\n\n    const attributes = {\n      kind: 'content-api' as const,\n      name: trim(body.name),\n      description: trim(body.description),\n      type: body.type,\n      permissions: body.permissions,\n      lifespan: body.lifespan,\n    };\n\n    await validateApiTokenCreationInput(attributes);\n\n    const alreadyExists = await apiTokenService.exists({ name: attributes.name });\n    if (alreadyExists) {\n      throw new ApplicationError('Name already taken');\n    }\n\n    const apiToken = await apiTokenService.create(attributes, ctx.state.user);\n    ctx.created({ data: apiToken } satisfies Create.Response);\n  },\n\n  // -------------------------------------------------------------------------\n  // Regenerate\n  // -------------------------------------------------------------------------\n  async regenerate(ctx: Context) {\n    const { id } = ctx.params;\n    const apiTokenService = getService('api-token-content-api');\n\n    const token = await apiTokenService.getById(id);\n    if (!token) {\n      ctx.notFound('API Token not found');\n      return;\n    }\n\n    const accessToken = await apiTokenService.regenerate(id);\n    ctx.created({ data: accessToken });\n  },\n\n  // -------------------------------------------------------------------------\n  // List — always content-api\n  // -------------------------------------------------------------------------\n  async list(ctx: Context) {\n    const apiTokenService = getService('api-token-content-api');\n    const apiTokens = await apiTokenService.list(ctx.state.user);\n\n    ctx.send({ data: apiTokens } satisfies List.Response);\n  },\n\n  // -------------------------------------------------------------------------\n  // Revoke\n  // -------------------------------------------------------------------------\n  async revoke(ctx: Context) {\n    const { id } = ctx.params as Revoke.Params;\n    const apiTokenService = getService('api-token-content-api');\n    const apiToken = await apiTokenService.revoke(id);\n\n    ctx.deleted({ data: apiToken } satisfies Revoke.Response);\n  },\n\n  // -------------------------------------------------------------------------\n  // Get — always expose the decrypted key (content-api back-compat)\n  // -------------------------------------------------------------------------\n  async get(ctx: Context) {\n    const { id } = ctx.params;\n    const apiTokenService = getService('api-token-content-api');\n\n    const token = await apiTokenService.getById(id);\n    if (!token) {\n      ctx.notFound('API Token not found');\n      return;\n    }\n\n    const withKey = await apiTokenService.getById(id, { includeDecryptedKey: true });\n    ctx.send({ data: withKey ?? token } satisfies Get.Response);\n  },\n\n  // -------------------------------------------------------------------------\n  // Update\n  // -------------------------------------------------------------------------\n  async update(ctx: Context) {\n    const { body } = ctx.request as Update.Request;\n    const { id } = ctx.params as Update.Params;\n    const apiTokenService = getService('api-token-content-api');\n\n    const mutableBody = body as Record<string, unknown>;\n    if (has('name', mutableBody)) {\n      mutableBody.name = trim(body.name ?? '');\n    }\n    if (has('description', mutableBody) || mutableBody.description === null) {\n      mutableBody.description = trim(body.description ?? '');\n    }\n\n    await validateApiTokenUpdateInput(body);\n\n    const existingToken = await apiTokenService.getById(id);\n    if (!existingToken) {\n      return ctx.notFound('API Token not found');\n    }\n\n    if (has('name', body)) {\n      const nameAlreadyTaken = await apiTokenService.getByName(body.name!);\n      if (nameAlreadyTaken !== null && !strings.isEqual(nameAlreadyTaken.id, id)) {\n        throw new ApplicationError('Name already taken');\n      }\n    }\n\n    const apiToken = await apiTokenService.update(id, body);\n    ctx.send({ data: apiToken } satisfies Update.Response);\n  },\n};\n"],"names":["ApplicationError","errors","create","ctx","body","request","apiTokenService","getService","attributes","kind","name","trim","description","type","permissions","lifespan","validateApiTokenCreationInput","alreadyExists","exists","apiToken","state","user","created","data","regenerate","id","params","token","getById","notFound","accessToken","list","apiTokens","send","revoke","deleted","get","withKey","includeDecryptedKey","update","mutableBody","has","validateApiTokenUpdateInput","existingToken","nameAlreadyTaken","getByName","strings","isEqual"],"mappings":";;;;;AAYA,MAAM,EAAEA,gBAAgB,EAAE,GAAGC,MAAAA;AAE7B,eAAe;;;;AAIb,IAAA,MAAMC,QAAOC,GAAY,EAAA;AACvB,QAAA,MAAM,EAAEC,IAAI,EAAE,GAAGD,IAAIE,OAAO;AAC5B,QAAA,MAAMC,kBAAkBC,UAAAA,CAAW,uBAAA,CAAA;AAEnC,QAAA,MAAMC,UAAAA,GAAa;YACjBC,IAAAA,EAAM,aAAA;YACNC,IAAAA,EAAMC,IAAAA,CAAKP,KAAKM,IAAI,CAAA;YACpBE,WAAAA,EAAaD,IAAAA,CAAKP,KAAKQ,WAAW,CAAA;AAClCC,YAAAA,IAAAA,EAAMT,KAAKS,IAAI;AACfC,YAAAA,WAAAA,EAAaV,KAAKU,WAAW;AAC7BC,YAAAA,QAAAA,EAAUX,KAAKW;AACjB,SAAA;AAEA,QAAA,MAAMC,6BAAAA,CAA8BR,UAAAA,CAAAA;AAEpC,QAAA,MAAMS,aAAAA,GAAgB,MAAMX,eAAAA,CAAgBY,MAAM,CAAC;AAAER,YAAAA,IAAAA,EAAMF,WAAWE;AAAK,SAAA,CAAA;AAC3E,QAAA,IAAIO,aAAAA,EAAe;AACjB,YAAA,MAAM,IAAIjB,gBAAAA,CAAiB,oBAAA,CAAA;AAC7B,QAAA;QAEA,MAAMmB,QAAAA,GAAW,MAAMb,eAAAA,CAAgBJ,MAAM,CAACM,UAAAA,EAAYL,GAAAA,CAAIiB,KAAK,CAACC,IAAI,CAAA;AACxElB,QAAAA,GAAAA,CAAImB,OAAO,CAAC;YAAEC,IAAAA,EAAMJ;AAAS,SAAA,CAAA;AAC/B,IAAA,CAAA;;;;AAKA,IAAA,MAAMK,YAAWrB,GAAY,EAAA;AAC3B,QAAA,MAAM,EAAEsB,EAAE,EAAE,GAAGtB,IAAIuB,MAAM;AACzB,QAAA,MAAMpB,kBAAkBC,UAAAA,CAAW,uBAAA,CAAA;AAEnC,QAAA,MAAMoB,KAAAA,GAAQ,MAAMrB,eAAAA,CAAgBsB,OAAO,CAACH,EAAAA,CAAAA;AAC5C,QAAA,IAAI,CAACE,KAAAA,EAAO;AACVxB,YAAAA,GAAAA,CAAI0B,QAAQ,CAAC,qBAAA,CAAA;AACb,YAAA;AACF,QAAA;AAEA,QAAA,MAAMC,WAAAA,GAAc,MAAMxB,eAAAA,CAAgBkB,UAAU,CAACC,EAAAA,CAAAA;AACrDtB,QAAAA,GAAAA,CAAImB,OAAO,CAAC;YAAEC,IAAAA,EAAMO;AAAY,SAAA,CAAA;AAClC,IAAA,CAAA;;;;AAKA,IAAA,MAAMC,MAAK5B,GAAY,EAAA;AACrB,QAAA,MAAMG,kBAAkBC,UAAAA,CAAW,uBAAA,CAAA;QACnC,MAAMyB,SAAAA,GAAY,MAAM1B,eAAAA,CAAgByB,IAAI,CAAC5B,GAAAA,CAAIiB,KAAK,CAACC,IAAI,CAAA;AAE3DlB,QAAAA,GAAAA,CAAI8B,IAAI,CAAC;YAAEV,IAAAA,EAAMS;AAAU,SAAA,CAAA;AAC7B,IAAA,CAAA;;;;AAKA,IAAA,MAAME,QAAO/B,GAAY,EAAA;AACvB,QAAA,MAAM,EAAEsB,EAAE,EAAE,GAAGtB,IAAIuB,MAAM;AACzB,QAAA,MAAMpB,kBAAkBC,UAAAA,CAAW,uBAAA,CAAA;AACnC,QAAA,MAAMY,QAAAA,GAAW,MAAMb,eAAAA,CAAgB4B,MAAM,CAACT,EAAAA,CAAAA;AAE9CtB,QAAAA,GAAAA,CAAIgC,OAAO,CAAC;YAAEZ,IAAAA,EAAMJ;AAAS,SAAA,CAAA;AAC/B,IAAA,CAAA;;;;AAKA,IAAA,MAAMiB,KAAIjC,GAAY,EAAA;AACpB,QAAA,MAAM,EAAEsB,EAAE,EAAE,GAAGtB,IAAIuB,MAAM;AACzB,QAAA,MAAMpB,kBAAkBC,UAAAA,CAAW,uBAAA,CAAA;AAEnC,QAAA,MAAMoB,KAAAA,GAAQ,MAAMrB,eAAAA,CAAgBsB,OAAO,CAACH,EAAAA,CAAAA;AAC5C,QAAA,IAAI,CAACE,KAAAA,EAAO;AACVxB,YAAAA,GAAAA,CAAI0B,QAAQ,CAAC,qBAAA,CAAA;AACb,YAAA;AACF,QAAA;AAEA,QAAA,MAAMQ,OAAAA,GAAU,MAAM/B,eAAAA,CAAgBsB,OAAO,CAACH,EAAAA,EAAI;YAAEa,mBAAAA,EAAqB;AAAK,SAAA,CAAA;AAC9EnC,QAAAA,GAAAA,CAAI8B,IAAI,CAAC;AAAEV,YAAAA,IAAAA,EAAMc,OAAAA,IAAWV;AAAM,SAAA,CAAA;AACpC,IAAA,CAAA;;;;AAKA,IAAA,MAAMY,QAAOpC,GAAY,EAAA;AACvB,QAAA,MAAM,EAAEC,IAAI,EAAE,GAAGD,IAAIE,OAAO;AAC5B,QAAA,MAAM,EAAEoB,EAAE,EAAE,GAAGtB,IAAIuB,MAAM;AACzB,QAAA,MAAMpB,kBAAkBC,UAAAA,CAAW,uBAAA,CAAA;AAEnC,QAAA,MAAMiC,WAAAA,GAAcpC,IAAAA;QACpB,IAAIqC,GAAAA,CAAI,QAAQD,WAAAA,CAAAA,EAAc;AAC5BA,YAAAA,WAAAA,CAAY9B,IAAI,GAAGC,IAAAA,CAAKP,IAAAA,CAAKM,IAAI,IAAI,EAAA,CAAA;AACvC,QAAA;AACA,QAAA,IAAI+B,IAAI,aAAA,EAAeD,WAAAA,CAAAA,IAAgBA,WAAAA,CAAY5B,WAAW,KAAK,IAAA,EAAM;AACvE4B,YAAAA,WAAAA,CAAY5B,WAAW,GAAGD,IAAAA,CAAKP,IAAAA,CAAKQ,WAAW,IAAI,EAAA,CAAA;AACrD,QAAA;AAEA,QAAA,MAAM8B,2BAAAA,CAA4BtC,IAAAA,CAAAA;AAElC,QAAA,MAAMuC,aAAAA,GAAgB,MAAMrC,eAAAA,CAAgBsB,OAAO,CAACH,EAAAA,CAAAA;AACpD,QAAA,IAAI,CAACkB,aAAAA,EAAe;YAClB,OAAOxC,GAAAA,CAAI0B,QAAQ,CAAC,qBAAA,CAAA;AACtB,QAAA;QAEA,IAAIY,GAAAA,CAAI,QAAQrC,IAAAA,CAAAA,EAAO;AACrB,YAAA,MAAMwC,mBAAmB,MAAMtC,eAAAA,CAAgBuC,SAAS,CAACzC,KAAKM,IAAI,CAAA;YAClE,IAAIkC,gBAAAA,KAAqB,QAAQ,CAACE,OAAAA,CAAQC,OAAO,CAACH,gBAAAA,CAAiBnB,EAAE,EAAEA,EAAAA,CAAAA,EAAK;AAC1E,gBAAA,MAAM,IAAIzB,gBAAAA,CAAiB,oBAAA,CAAA;AAC7B,YAAA;AACF,QAAA;AAEA,QAAA,MAAMmB,QAAAA,GAAW,MAAMb,eAAAA,CAAgBiC,MAAM,CAACd,EAAAA,EAAIrB,IAAAA,CAAAA;AAClDD,QAAAA,GAAAA,CAAI8B,IAAI,CAAC;YAAEV,IAAAA,EAAMJ;AAAS,SAAA,CAAA;AAC5B,IAAA;AACF,CAAA;;;;"}

package/dist/server/server/src/controllers/index.js

@@ -2,6 +2,7 @@
 
 var admin = require('./admin.js');
 var apiToken = require('./api-token.js');
+var adminToken = require('./admin-token.js');
 var authenticatedUser = require('./authenticated-user.js');
 var authentication = require('./authentication.js');
 var permission = require('./permission.js');
@@ -16,6 +17,7 @@ var ai = require('../ai/controllers/ai.js');
 var controllers = {
     admin,
     'api-token': apiToken,
+    'admin-token': adminToken,
     'authenticated-user': authenticatedUser,
     authentication,
     permission,

package/dist/server/server/src/controllers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../server/src/controllers/index.ts"],"sourcesContent":["import type {} from 'koa-body';\n\nimport admin from './admin';\nimport apiToken from './api-token';\nimport authenticatedUser from './authenticated-user';\nimport authentication from './authentication';\nimport permission from './permission';\nimport role from './role';\nimport transfer from './transfer';\nimport user from './user';\nimport webhooks from './webhooks';\nimport contentApi from './content-api';\nimport homepage from './homepage';\nimport ai from '../ai/controllers/ai';\n\nexport default {\n  admin,\n  'api-token': apiToken,\n  'authenticated-user': authenticatedUser,\n  authentication,\n  permission,\n  role,\n  transfer,\n  user,\n  webhooks,\n  'content-api': contentApi,\n  homepage,\n  ai,\n};\n"],"names":["admin","apiToken","authenticatedUser","authentication","permission","role","transfer","user","webhooks","contentApi","homepage","ai"],"mappings":";;;;;;;;;;;;;;;AAeA,kBAAe;AACbA,IAAAA,KAAAA;IACA,WAAA,EAAaC,QAAAA;IACb,oBAAA,EAAsBC,iBAAAA;AACtBC,IAAAA,cAAAA;AACAC,IAAAA,UAAAA;AACAC,IAAAA,IAAAA;AACAC,cAAAA,KAAAA;AACAC,IAAAA,IAAAA;AACAC,IAAAA,QAAAA;IACA,aAAA,EAAeC,UAAAA;AACfC,IAAAA,QAAAA;AACAC,IAAAA;AACF,CAAA;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../../server/src/controllers/index.ts"],"sourcesContent":["import type {} from 'koa-body';\n\nimport admin from './admin';\nimport apiToken from './api-token';\nimport adminToken from './admin-token';\nimport authenticatedUser from './authenticated-user';\nimport authentication from './authentication';\nimport permission from './permission';\nimport role from './role';\nimport transfer from './transfer';\nimport user from './user';\nimport webhooks from './webhooks';\nimport contentApi from './content-api';\nimport homepage from './homepage';\nimport ai from '../ai/controllers/ai';\n\nexport default {\n  admin,\n  'api-token': apiToken,\n  'admin-token': adminToken,\n  'authenticated-user': authenticatedUser,\n  authentication,\n  permission,\n  role,\n  transfer,\n  user,\n  webhooks,\n  'content-api': contentApi,\n  homepage,\n  ai,\n};\n"],"names":["admin","apiToken","adminToken","authenticatedUser","authentication","permission","role","transfer","user","webhooks","contentApi","homepage","ai"],"mappings":";;;;;;;;;;;;;;;;AAgBA,kBAAe;AACbA,IAAAA,KAAAA;IACA,WAAA,EAAaC,QAAAA;IACb,aAAA,EAAeC,UAAAA;IACf,oBAAA,EAAsBC,iBAAAA;AACtBC,IAAAA,cAAAA;AACAC,IAAAA,UAAAA;AACAC,IAAAA,IAAAA;AACAC,cAAAA,KAAAA;AACAC,IAAAA,IAAAA;AACAC,IAAAA,QAAAA;IACA,aAAA,EAAeC,UAAAA;AACfC,IAAAA,QAAAA;AACAC,IAAAA;AACF,CAAA;;;;"}

package/dist/server/server/src/controllers/index.mjs

@@ -1,5 +1,6 @@
 import admin from './admin.mjs';
 import apiToken from './api-token.mjs';
+import adminToken from './admin-token.mjs';
 import authenticatedUser from './authenticated-user.mjs';
 import authentication from './authentication.mjs';
 import permission from './permission.mjs';
@@ -14,6 +15,7 @@ import ai from '../ai/controllers/ai.mjs';
 var controllers = {
     admin,
     'api-token': apiToken,
+    'admin-token': adminToken,
     'authenticated-user': authenticatedUser,
     authentication,
     permission,

package/dist/server/server/src/controllers/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../../../../server/src/controllers/index.ts"],"sourcesContent":["import type {} from 'koa-body';\n\nimport admin from './admin';\nimport apiToken from './api-token';\nimport authenticatedUser from './authenticated-user';\nimport authentication from './authentication';\nimport permission from './permission';\nimport role from './role';\nimport transfer from './transfer';\nimport user from './user';\nimport webhooks from './webhooks';\nimport contentApi from './content-api';\nimport homepage from './homepage';\nimport ai from '../ai/controllers/ai';\n\nexport default {\n  admin,\n  'api-token': apiToken,\n  'authenticated-user': authenticatedUser,\n  authentication,\n  permission,\n  role,\n  transfer,\n  user,\n  webhooks,\n  'content-api': contentApi,\n  homepage,\n  ai,\n};\n"],"names":["admin","apiToken","authenticatedUser","authentication","permission","role","transfer","user","webhooks","contentApi","homepage","ai"],"mappings":";;;;;;;;;;;;;AAeA,kBAAe;AACbA,IAAAA,KAAAA;IACA,WAAA,EAAaC,QAAAA;IACb,oBAAA,EAAsBC,iBAAAA;AACtBC,IAAAA,cAAAA;AACAC,IAAAA,UAAAA;AACAC,IAAAA,IAAAA;AACAC,IAAAA,QAAAA;AACAC,IAAAA,IAAAA;AACAC,IAAAA,QAAAA;IACA,aAAA,EAAeC,UAAAA;AACfC,IAAAA,QAAAA;AACAC,IAAAA;AACF,CAAA;;;;"}
+{"version":3,"file":"index.mjs","sources":["../../../../../server/src/controllers/index.ts"],"sourcesContent":["import type {} from 'koa-body';\n\nimport admin from './admin';\nimport apiToken from './api-token';\nimport adminToken from './admin-token';\nimport authenticatedUser from './authenticated-user';\nimport authentication from './authentication';\nimport permission from './permission';\nimport role from './role';\nimport transfer from './transfer';\nimport user from './user';\nimport webhooks from './webhooks';\nimport contentApi from './content-api';\nimport homepage from './homepage';\nimport ai from '../ai/controllers/ai';\n\nexport default {\n  admin,\n  'api-token': apiToken,\n  'admin-token': adminToken,\n  'authenticated-user': authenticatedUser,\n  authentication,\n  permission,\n  role,\n  transfer,\n  user,\n  webhooks,\n  'content-api': contentApi,\n  homepage,\n  ai,\n};\n"],"names":["admin","apiToken","adminToken","authenticatedUser","authentication","permission","role","transfer","user","webhooks","contentApi","homepage","ai"],"mappings":";;;;;;;;;;;;;;AAgBA,kBAAe;AACbA,IAAAA,KAAAA;IACA,WAAA,EAAaC,QAAAA;IACb,aAAA,EAAeC,UAAAA;IACf,oBAAA,EAAsBC,iBAAAA;AACtBC,IAAAA,cAAAA;AACAC,IAAAA,UAAAA;AACAC,IAAAA,IAAAA;AACAC,IAAAA,QAAAA;AACAC,IAAAA,IAAAA;AACAC,IAAAA,QAAAA;IACA,aAAA,EAAeC,UAAAA;AACfC,IAAAA,QAAAA;AACAC,IAAAA;AACF,CAAA;;;;"}

package/dist/server/server/src/domain/permission/index.js

@@ -11,7 +11,8 @@ const permissionFields = [
     'subject',
     'properties',
     'conditions',
-    'role'
+    'role',
+    'apiToken'
 ];
 const sanitizedPermissionFields = [
     'id',

package/dist/server/server/src/domain/permission/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../../server/src/domain/permission/index.ts"],"sourcesContent":["import type { Utils } from '@strapi/types';\n\nimport { providerFactory } from '@strapi/utils';\nimport {\n  pipe,\n  set,\n  pick,\n  eq,\n  omit,\n  remove,\n  get,\n  uniq,\n  isArray,\n  map,\n  curry,\n  merge,\n} from 'lodash/fp';\nimport { Permission } from '../../../../shared/contracts/shared';\nimport { SanitizedPermission } from '../../../../shared/contracts/roles';\n\nexport type CreatePermissionPayload = Utils.Object.PartialBy<\n  Permission,\n  'actionParameters' | 'conditions' | 'properties' | 'subject' | 'id' | 'createdAt' | 'updatedAt'\n>;\n\ntype Provider = ReturnType<typeof providerFactory>;\n\nexport const permissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n  'role',\n];\nexport const sanitizedPermissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n] as const;\n\nexport const sanitizePermissionFields: (p: Permission) => SanitizedPermission =\n  pick(sanitizedPermissionFields);\n\n/**\n * Creates a permission with default values\n */\nconst getDefaultPermission = () => ({\n  actionParameters: {},\n  conditions: [],\n  properties: {},\n  subject: null,\n});\n\n/**\n * Returns a new permission with the given condition\n * @param condition - The condition to add\n * @param permission - The permission on which we want to add the condition\n * @return\n */\nexport const addCondition = curry((condition: string, permission: Permission): Permission => {\n  const { conditions } = permission;\n  const newConditions = Array.isArray(conditions)\n    ? uniq(conditions.concat(condition))\n    : [condition];\n\n  return set('conditions', newConditions, permission);\n});\n\n/**\n * Returns a new permission without the given condition\n * @param condition - The condition to remove\n * @param permission - The permission on which we want to remove the condition\n */\nexport const removeCondition = curry((condition: string, permission: Permission): Permission => {\n  return set('conditions', remove(eq(condition), permission.conditions), permission);\n});\n\n/**\n * Gets a property or a part of a property from a permission.\n * @param property - The property to get\n * @param permission - The permission on which we want to access the property\n */\nexport const getProperty = curry(\n  (property: string, permission: Permission): Permission =>\n    get(`properties.${property}`, permission)\n);\n\n/**\n * Set a value for a given property on a new permission object\n * @param property - The name of the property\n * @param value - The value of the property\n * @param permission - The permission on which we want to set the property\n */\nexport const setProperty = (\n  property: string,\n  value: unknown,\n  permission: Permission\n): Permission => {\n  return set(`properties.${property}`, value, permission);\n};\n\n/**\n * Returns a new permission without the given property name set\n * @param property - The name of the property to delete\n * @param permission - The permission on which we want to remove the property\n */\nexport const deleteProperty = <TProperty extends string>(\n  property: TProperty,\n  permission: Permission\n) => omit(`properties.${property}`, permission) as Omit<Permission, TProperty>;\n\n/**\n * Creates a new {@link Permission} object from raw attributes. Set default values for certain fields\n * @param  attributes\n */\nexport const create = (attributes: CreatePermissionPayload) => {\n  return pipe(pick(permissionFields), merge(getDefaultPermission()))(attributes) as Permission;\n};\n\n/**\n * Using the given condition provider, check and remove invalid condition from the permission's condition array.\n * @param provider - The condition provider used to do the checks\n * @param permission - The condition to sanitize\n */\nexport const sanitizeConditions = curry(\n  (provider: Provider, permission: Permission): Permission => {\n    if (!isArray(permission.conditions)) {\n      return permission;\n    }\n\n    return permission.conditions\n      .filter((condition: string) => !provider.has(condition))\n      .reduce(\n        (perm: Permission, condition: string) => removeCondition(condition, perm),\n        permission\n      );\n  }\n);\n\n/**\n * Transform raw attributes into valid permissions using the create domain function.\n * @param  payload - Can either be a single object of attributes or an array of those objects.\n */\n\nfunction toPermission<T extends CreatePermissionPayload>(payload: T[]): Permission[];\nfunction toPermission<T extends CreatePermissionPayload>(payload: T): Permission;\nfunction toPermission<T extends CreatePermissionPayload>(\n  payload: T[] | T\n): Permission[] | Permission {\n  if (isArray(payload)) {\n    return map((value) => create(value), payload);\n  }\n\n  return create(payload);\n}\n\nexport { toPermission };\n\nexport default {\n  addCondition,\n  removeCondition,\n  create,\n  deleteProperty,\n  permissionFields,\n  getProperty,\n  sanitizedPermissionFields,\n  sanitizeConditions,\n  sanitizePermissionFields,\n  setProperty,\n  toPermission,\n};\n"],"names":["permissionFields","sanitizedPermissionFields","sanitizePermissionFields","pick","getDefaultPermission","actionParameters","conditions","properties","subject","addCondition","curry","condition","permission","newConditions","Array","isArray","uniq","concat","set","removeCondition","remove","eq","getProperty","property","get","setProperty","value","deleteProperty","omit","create","attributes","pipe","merge","sanitizeConditions","provider","filter","has","reduce","perm","toPermission","payload","map"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../../../../server/src/domain/permission/index.ts"],"sourcesContent":["import type { Utils } from '@strapi/types';\n\nimport { providerFactory } from '@strapi/utils';\nimport {\n  pipe,\n  set,\n  pick,\n  eq,\n  omit,\n  remove,\n  get,\n  uniq,\n  isArray,\n  map,\n  curry,\n  merge,\n} from 'lodash/fp';\nimport { Permission } from '../../../../shared/contracts/shared';\nimport { SanitizedPermission } from '../../../../shared/contracts/roles';\n\nexport type CreatePermissionPayload = Utils.Object.PartialBy<\n  Permission,\n  'actionParameters' | 'conditions' | 'properties' | 'subject' | 'id' | 'createdAt' | 'updatedAt'\n>;\n\ntype Provider = ReturnType<typeof providerFactory>;\n\nexport const permissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n  'role',\n  'apiToken',\n];\nexport const sanitizedPermissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n] as const;\n\nexport const sanitizePermissionFields: (p: Permission) => SanitizedPermission =\n  pick(sanitizedPermissionFields);\n\n/**\n * Creates a permission with default values\n */\nconst getDefaultPermission = () => ({\n  actionParameters: {},\n  conditions: [],\n  properties: {},\n  subject: null,\n});\n\n/**\n * Returns a new permission with the given condition\n * @param condition - The condition to add\n * @param permission - The permission on which we want to add the condition\n * @return\n */\nexport const addCondition = curry((condition: string, permission: Permission): Permission => {\n  const { conditions } = permission;\n  const newConditions = Array.isArray(conditions)\n    ? uniq(conditions.concat(condition))\n    : [condition];\n\n  return set('conditions', newConditions, permission);\n});\n\n/**\n * Returns a new permission without the given condition\n * @param condition - The condition to remove\n * @param permission - The permission on which we want to remove the condition\n */\nexport const removeCondition = curry((condition: string, permission: Permission): Permission => {\n  return set('conditions', remove(eq(condition), permission.conditions), permission);\n});\n\n/**\n * Gets a property or a part of a property from a permission.\n * @param property - The property to get\n * @param permission - The permission on which we want to access the property\n */\nexport const getProperty = curry(\n  (property: string, permission: Permission): Permission =>\n    get(`properties.${property}`, permission)\n);\n\n/**\n * Set a value for a given property on a new permission object\n * @param property - The name of the property\n * @param value - The value of the property\n * @param permission - The permission on which we want to set the property\n */\nexport const setProperty = (\n  property: string,\n  value: unknown,\n  permission: Permission\n): Permission => {\n  return set(`properties.${property}`, value, permission);\n};\n\n/**\n * Returns a new permission without the given property name set\n * @param property - The name of the property to delete\n * @param permission - The permission on which we want to remove the property\n */\nexport const deleteProperty = <TProperty extends string>(\n  property: TProperty,\n  permission: Permission\n) => omit(`properties.${property}`, permission) as Omit<Permission, TProperty>;\n\n/**\n * Creates a new {@link Permission} object from raw attributes. Set default values for certain fields\n * @param  attributes\n */\nexport const create = (attributes: CreatePermissionPayload) => {\n  return pipe(pick(permissionFields), merge(getDefaultPermission()))(attributes) as Permission;\n};\n\n/**\n * Using the given condition provider, check and remove invalid condition from the permission's condition array.\n * @param provider - The condition provider used to do the checks\n * @param permission - The condition to sanitize\n */\nexport const sanitizeConditions = curry(\n  (provider: Provider, permission: Permission): Permission => {\n    if (!isArray(permission.conditions)) {\n      return permission;\n    }\n\n    return permission.conditions\n      .filter((condition: string) => !provider.has(condition))\n      .reduce(\n        (perm: Permission, condition: string) => removeCondition(condition, perm),\n        permission\n      );\n  }\n);\n\n/**\n * Transform raw attributes into valid permissions using the create domain function.\n * @param  payload - Can either be a single object of attributes or an array of those objects.\n */\n\nfunction toPermission<T extends CreatePermissionPayload>(payload: T[]): Permission[];\nfunction toPermission<T extends CreatePermissionPayload>(payload: T): Permission;\nfunction toPermission<T extends CreatePermissionPayload>(\n  payload: T[] | T\n): Permission[] | Permission {\n  if (isArray(payload)) {\n    return map((value) => create(value), payload);\n  }\n\n  return create(payload);\n}\n\nexport { toPermission };\n\nexport default {\n  addCondition,\n  removeCondition,\n  create,\n  deleteProperty,\n  permissionFields,\n  getProperty,\n  sanitizedPermissionFields,\n  sanitizeConditions,\n  sanitizePermissionFields,\n  setProperty,\n  toPermission,\n};\n"],"names":["permissionFields","sanitizedPermissionFields","sanitizePermissionFields","pick","getDefaultPermission","actionParameters","conditions","properties","subject","addCondition","curry","condition","permission","newConditions","Array","isArray","uniq","concat","set","removeCondition","remove","eq","getProperty","property","get","setProperty","value","deleteProperty","omit","create","attributes","pipe","merge","sanitizeConditions","provider","filter","has","reduce","perm","toPermission","payload","map"],"mappings":"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"}

package/dist/server/server/src/domain/permission/index.mjs

@@ -7,7 +7,8 @@ const permissionFields = [
     'subject',
     'properties',
     'conditions',
-    'role'
+    'role',
+    'apiToken'
 ];
 const sanitizedPermissionFields = [
     'id',

package/dist/server/server/src/domain/permission/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../../../../../server/src/domain/permission/index.ts"],"sourcesContent":["import type { Utils } from '@strapi/types';\n\nimport { providerFactory } from '@strapi/utils';\nimport {\n  pipe,\n  set,\n  pick,\n  eq,\n  omit,\n  remove,\n  get,\n  uniq,\n  isArray,\n  map,\n  curry,\n  merge,\n} from 'lodash/fp';\nimport { Permission } from '../../../../shared/contracts/shared';\nimport { SanitizedPermission } from '../../../../shared/contracts/roles';\n\nexport type CreatePermissionPayload = Utils.Object.PartialBy<\n  Permission,\n  'actionParameters' | 'conditions' | 'properties' | 'subject' | 'id' | 'createdAt' | 'updatedAt'\n>;\n\ntype Provider = ReturnType<typeof providerFactory>;\n\nexport const permissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n  'role',\n];\nexport const sanitizedPermissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n] as const;\n\nexport const sanitizePermissionFields: (p: Permission) => SanitizedPermission =\n  pick(sanitizedPermissionFields);\n\n/**\n * Creates a permission with default values\n */\nconst getDefaultPermission = () => ({\n  actionParameters: {},\n  conditions: [],\n  properties: {},\n  subject: null,\n});\n\n/**\n * Returns a new permission with the given condition\n * @param condition - The condition to add\n * @param permission - The permission on which we want to add the condition\n * @return\n */\nexport const addCondition = curry((condition: string, permission: Permission): Permission => {\n  const { conditions } = permission;\n  const newConditions = Array.isArray(conditions)\n    ? uniq(conditions.concat(condition))\n    : [condition];\n\n  return set('conditions', newConditions, permission);\n});\n\n/**\n * Returns a new permission without the given condition\n * @param condition - The condition to remove\n * @param permission - The permission on which we want to remove the condition\n */\nexport const removeCondition = curry((condition: string, permission: Permission): Permission => {\n  return set('conditions', remove(eq(condition), permission.conditions), permission);\n});\n\n/**\n * Gets a property or a part of a property from a permission.\n * @param property - The property to get\n * @param permission - The permission on which we want to access the property\n */\nexport const getProperty = curry(\n  (property: string, permission: Permission): Permission =>\n    get(`properties.${property}`, permission)\n);\n\n/**\n * Set a value for a given property on a new permission object\n * @param property - The name of the property\n * @param value - The value of the property\n * @param permission - The permission on which we want to set the property\n */\nexport const setProperty = (\n  property: string,\n  value: unknown,\n  permission: Permission\n): Permission => {\n  return set(`properties.${property}`, value, permission);\n};\n\n/**\n * Returns a new permission without the given property name set\n * @param property - The name of the property to delete\n * @param permission - The permission on which we want to remove the property\n */\nexport const deleteProperty = <TProperty extends string>(\n  property: TProperty,\n  permission: Permission\n) => omit(`properties.${property}`, permission) as Omit<Permission, TProperty>;\n\n/**\n * Creates a new {@link Permission} object from raw attributes. Set default values for certain fields\n * @param  attributes\n */\nexport const create = (attributes: CreatePermissionPayload) => {\n  return pipe(pick(permissionFields), merge(getDefaultPermission()))(attributes) as Permission;\n};\n\n/**\n * Using the given condition provider, check and remove invalid condition from the permission's condition array.\n * @param provider - The condition provider used to do the checks\n * @param permission - The condition to sanitize\n */\nexport const sanitizeConditions = curry(\n  (provider: Provider, permission: Permission): Permission => {\n    if (!isArray(permission.conditions)) {\n      return permission;\n    }\n\n    return permission.conditions\n      .filter((condition: string) => !provider.has(condition))\n      .reduce(\n        (perm: Permission, condition: string) => removeCondition(condition, perm),\n        permission\n      );\n  }\n);\n\n/**\n * Transform raw attributes into valid permissions using the create domain function.\n * @param  payload - Can either be a single object of attributes or an array of those objects.\n */\n\nfunction toPermission<T extends CreatePermissionPayload>(payload: T[]): Permission[];\nfunction toPermission<T extends CreatePermissionPayload>(payload: T): Permission;\nfunction toPermission<T extends CreatePermissionPayload>(\n  payload: T[] | T\n): Permission[] | Permission {\n  if (isArray(payload)) {\n    return map((value) => create(value), payload);\n  }\n\n  return create(payload);\n}\n\nexport { toPermission };\n\nexport default {\n  addCondition,\n  removeCondition,\n  create,\n  deleteProperty,\n  permissionFields,\n  getProperty,\n  sanitizedPermissionFields,\n  sanitizeConditions,\n  sanitizePermissionFields,\n  setProperty,\n  toPermission,\n};\n"],"names":["permissionFields","sanitizedPermissionFields","sanitizePermissionFields","pick","getDefaultPermission","actionParameters","conditions","properties","subject","addCondition","curry","condition","permission","newConditions","Array","isArray","uniq","concat","set","removeCondition","remove","eq","getProperty","property","get","setProperty","value","deleteProperty","omit","create","attributes","pipe","merge","sanitizeConditions","provider","filter","has","reduce","perm","toPermission","payload","map"],"mappings":"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"}
+{"version":3,"file":"index.mjs","sources":["../../../../../../server/src/domain/permission/index.ts"],"sourcesContent":["import type { Utils } from '@strapi/types';\n\nimport { providerFactory } from '@strapi/utils';\nimport {\n  pipe,\n  set,\n  pick,\n  eq,\n  omit,\n  remove,\n  get,\n  uniq,\n  isArray,\n  map,\n  curry,\n  merge,\n} from 'lodash/fp';\nimport { Permission } from '../../../../shared/contracts/shared';\nimport { SanitizedPermission } from '../../../../shared/contracts/roles';\n\nexport type CreatePermissionPayload = Utils.Object.PartialBy<\n  Permission,\n  'actionParameters' | 'conditions' | 'properties' | 'subject' | 'id' | 'createdAt' | 'updatedAt'\n>;\n\ntype Provider = ReturnType<typeof providerFactory>;\n\nexport const permissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n  'role',\n  'apiToken',\n];\nexport const sanitizedPermissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n] as const;\n\nexport const sanitizePermissionFields: (p: Permission) => SanitizedPermission =\n  pick(sanitizedPermissionFields);\n\n/**\n * Creates a permission with default values\n */\nconst getDefaultPermission = () => ({\n  actionParameters: {},\n  conditions: [],\n  properties: {},\n  subject: null,\n});\n\n/**\n * Returns a new permission with the given condition\n * @param condition - The condition to add\n * @param permission - The permission on which we want to add the condition\n * @return\n */\nexport const addCondition = curry((condition: string, permission: Permission): Permission => {\n  const { conditions } = permission;\n  const newConditions = Array.isArray(conditions)\n    ? uniq(conditions.concat(condition))\n    : [condition];\n\n  return set('conditions', newConditions, permission);\n});\n\n/**\n * Returns a new permission without the given condition\n * @param condition - The condition to remove\n * @param permission - The permission on which we want to remove the condition\n */\nexport const removeCondition = curry((condition: string, permission: Permission): Permission => {\n  return set('conditions', remove(eq(condition), permission.conditions), permission);\n});\n\n/**\n * Gets a property or a part of a property from a permission.\n * @param property - The property to get\n * @param permission - The permission on which we want to access the property\n */\nexport const getProperty = curry(\n  (property: string, permission: Permission): Permission =>\n    get(`properties.${property}`, permission)\n);\n\n/**\n * Set a value for a given property on a new permission object\n * @param property - The name of the property\n * @param value - The value of the property\n * @param permission - The permission on which we want to set the property\n */\nexport const setProperty = (\n  property: string,\n  value: unknown,\n  permission: Permission\n): Permission => {\n  return set(`properties.${property}`, value, permission);\n};\n\n/**\n * Returns a new permission without the given property name set\n * @param property - The name of the property to delete\n * @param permission - The permission on which we want to remove the property\n */\nexport const deleteProperty = <TProperty extends string>(\n  property: TProperty,\n  permission: Permission\n) => omit(`properties.${property}`, permission) as Omit<Permission, TProperty>;\n\n/**\n * Creates a new {@link Permission} object from raw attributes. Set default values for certain fields\n * @param  attributes\n */\nexport const create = (attributes: CreatePermissionPayload) => {\n  return pipe(pick(permissionFields), merge(getDefaultPermission()))(attributes) as Permission;\n};\n\n/**\n * Using the given condition provider, check and remove invalid condition from the permission's condition array.\n * @param provider - The condition provider used to do the checks\n * @param permission - The condition to sanitize\n */\nexport const sanitizeConditions = curry(\n  (provider: Provider, permission: Permission): Permission => {\n    if (!isArray(permission.conditions)) {\n      return permission;\n    }\n\n    return permission.conditions\n      .filter((condition: string) => !provider.has(condition))\n      .reduce(\n        (perm: Permission, condition: string) => removeCondition(condition, perm),\n        permission\n      );\n  }\n);\n\n/**\n * Transform raw attributes into valid permissions using the create domain function.\n * @param  payload - Can either be a single object of attributes or an array of those objects.\n */\n\nfunction toPermission<T extends CreatePermissionPayload>(payload: T[]): Permission[];\nfunction toPermission<T extends CreatePermissionPayload>(payload: T): Permission;\nfunction toPermission<T extends CreatePermissionPayload>(\n  payload: T[] | T\n): Permission[] | Permission {\n  if (isArray(payload)) {\n    return map((value) => create(value), payload);\n  }\n\n  return create(payload);\n}\n\nexport { toPermission };\n\nexport default {\n  addCondition,\n  removeCondition,\n  create,\n  deleteProperty,\n  permissionFields,\n  getProperty,\n  sanitizedPermissionFields,\n  sanitizeConditions,\n  sanitizePermissionFields,\n  setProperty,\n  toPermission,\n};\n"],"names":["permissionFields","sanitizedPermissionFields","sanitizePermissionFields","pick","getDefaultPermission","actionParameters","conditions","properties","subject","addCondition","curry","condition","permission","newConditions","Array","isArray","uniq","concat","set","removeCondition","remove","eq","getProperty","property","get","setProperty","value","deleteProperty","omit","create","attributes","pipe","merge","sanitizeConditions","provider","filter","has","reduce","perm","toPermission","payload","map"],"mappings":"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"}

package/dist/server/server/src/policies/index.js

@@ -2,11 +2,13 @@
 
 var isAuthenticatedAdmin = require('./isAuthenticatedAdmin.js');
 var hasPermissions = require('./hasPermissions.js');
+var isAdminTokensEnabled = require('./isAdminTokensEnabled.js');
 var isTelemetryEnabled = require('./isTelemetryEnabled.js');
 
 var policies = {
     isAuthenticatedAdmin,
     hasPermissions,
+    isAdminTokensEnabled,
     isTelemetryEnabled
 };
 

package/dist/server/server/src/policies/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../server/src/policies/index.ts"],"sourcesContent":["import isAuthenticatedAdmin from './isAuthenticatedAdmin';\nimport hasPermissions from './hasPermissions';\nimport isTelemetryEnabled from './isTelemetryEnabled';\n\nexport default { isAuthenticatedAdmin, hasPermissions, isTelemetryEnabled };\n"],"names":["isAuthenticatedAdmin","hasPermissions","isTelemetryEnabled"],"mappings":";;;;;;AAIA,eAAe;AAAEA,IAAAA,oBAAAA;AAAsBC,IAAAA,cAAAA;AAAgBC,IAAAA;AAAmB,CAAA;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../../server/src/policies/index.ts"],"sourcesContent":["import isAuthenticatedAdmin from './isAuthenticatedAdmin';\nimport hasPermissions from './hasPermissions';\nimport isAdminTokensEnabled from './isAdminTokensEnabled';\nimport isTelemetryEnabled from './isTelemetryEnabled';\n\nexport default { isAuthenticatedAdmin, hasPermissions, isAdminTokensEnabled, isTelemetryEnabled };\n"],"names":["isAuthenticatedAdmin","hasPermissions","isAdminTokensEnabled","isTelemetryEnabled"],"mappings":";;;;;;;AAKA,eAAe;AAAEA,IAAAA,oBAAAA;AAAsBC,IAAAA,cAAAA;AAAgBC,IAAAA,oBAAAA;AAAsBC,IAAAA;AAAmB,CAAA;;;;"}