@strapi/admin 4.3.7 → 4.4.0-beta.1

package/server/config/admin-actions.js

@@ -118,12 +118,21 @@ module.exports = {
       category: 'users and roles',
       subCategory: 'roles',
     },
+    {
+      uid: 'api-tokens.access',
+      displayName: 'Access the API tokens settings page',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'api tokens',
+      subCategory: 'api Tokens',
+    },
     {
       uid: 'api-tokens.create',
       displayName: 'Create (generate)',
       pluginName: 'admin',
       section: 'settings',
       category: 'api tokens',
+      subCategory: 'general',
     },
     {
       uid: 'api-tokens.read',
@@ -131,6 +140,7 @@ module.exports = {
       pluginName: 'admin',
       section: 'settings',
       category: 'api tokens',
+      subCategory: 'general',
     },
     {
       uid: 'api-tokens.update',
@@ -138,6 +148,15 @@ module.exports = {
       pluginName: 'admin',
       section: 'settings',
       category: 'api tokens',
+      subCategory: 'general',
+    },
+    {
+      uid: 'api-tokens.regenerate',
+      displayName: 'Regenerate',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'api tokens',
+      subCategory: 'general',
     },
     {
       uid: 'api-tokens.delete',
@@ -145,6 +164,7 @@ module.exports = {
       pluginName: 'admin',
       section: 'settings',
       category: 'api tokens',
+      subCategory: 'general',
     },
     {
       uid: 'project-settings.update',

package/server/content-types/api-token-permission.js

@@ -0,0 +1,36 @@
+'use strict';
+
+module.exports = {
+  collectionName: 'strapi_api_token_permissions',
+  info: {
+    name: 'API Token Permission',
+    description: '',
+    singularName: 'api-token-permission',
+    pluralName: 'api-token-permissions',
+    displayName: 'API Token Permission',
+  },
+  options: {},
+  pluginOptions: {
+    'content-manager': {
+      visible: false,
+    },
+    'content-type-builder': {
+      visible: false,
+    },
+  },
+  attributes: {
+    action: {
+      type: 'string',
+      minLength: 1,
+      configurable: false,
+      required: true,
+    },
+    token: {
+      configurable: false,
+      type: 'relation',
+      relation: 'manyToOne',
+      inversedBy: 'permissions',
+      target: 'admin::api-token',
+    },
+  },
+};

package/server/content-types/api-token.js

@@ -26,6 +26,7 @@ module.exports = {
       minLength: 1,
       configurable: false,
       required: true,
+      unique: true,
     },
     description: {
       type: 'string',
@@ -38,7 +39,7 @@ module.exports = {
       type: 'enumeration',
       enum: Object.values(constants.API_TOKEN_TYPE),
       configurable: false,
-      required: false,
+      required: true,
       default: constants.API_TOKEN_TYPE.READ_ONLY,
     },
     accessKey: {
@@ -47,5 +48,28 @@ module.exports = {
       configurable: false,
       required: true,
     },
+    lastUsedAt: {
+      type: 'datetime',
+      configurable: false,
+      required: false,
+    },
+    permissions: {
+      type: 'relation',
+      target: 'admin::api-token-permission',
+      relation: 'oneToMany',
+      mappedBy: 'token',
+      configurable: false,
+      required: false,
+    },
+    expiresAt: {
+      type: 'datetime',
+      configurable: false,
+      required: false,
+    },
+    lifespan: {
+      type: 'integer',
+      configurable: false,
+      required: false,
+    },
   },
 };

package/server/content-types/index.js

@@ -5,4 +5,5 @@ module.exports = {
   user: { schema: require('./User') },
   role: { schema: require('./Role') },
   'api-token': { schema: require('./api-token') },
+  'api-token-permission': { schema: require('./api-token-permission') },
 };

package/server/controllers/api-token.js

@@ -24,6 +24,8 @@ module.exports = {
       name: trim(body.name),
       description: trim(body.description),
       type: body.type,
+      permissions: body.permissions,
+      lifespan: body.lifespan,
     };
 
     await validateApiTokenCreationInput(attributes);
@@ -37,6 +39,21 @@ module.exports = {
     ctx.created({ data: apiToken });
   },
 
+  async regenerate(ctx) {
+    const { id } = ctx.params;
+    const apiTokenService = getService('api-token');
+
+    const apiTokenExists = await apiTokenService.getById(id);
+    if (!apiTokenExists) {
+      ctx.notFound('API Token not found');
+      return;
+    }
+
+    const accessToken = await apiTokenService.regenerate(id);
+
+    ctx.created({ data: accessToken });
+  },
+
   async list(ctx) {
     const apiTokenService = getService('api-token');
     const apiTokens = await apiTokenService.list();
@@ -59,7 +76,6 @@ module.exports = {
 
     if (!apiToken) {
       ctx.notFound('API Token not found');
-
       return;
     }
 
@@ -108,4 +124,11 @@ module.exports = {
     const apiToken = await apiTokenService.update(id, attributes);
     ctx.send({ data: apiToken });
   },
+
+  async getLayout(ctx) {
+    const apiTokenService = getService('api-token');
+    const layout = await apiTokenService.getApiTokenLayout();
+
+    ctx.send({ data: layout });
+  },
 };

package/server/controllers/content-api.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = {
+  async getPermissions(ctx) {
+    const actionsMap = await strapi.contentAPI.permissions.getActionsMap();
+
+    ctx.send({ data: actionsMap });
+  },
+
+  async getRoutes(ctx) {
+    const routesMap = await strapi.contentAPI.getRoutesMap();
+
+    ctx.send({ data: routesMap });
+  },
+};

package/server/controllers/index.js

@@ -9,4 +9,5 @@ module.exports = {
   role: require('./role'),
   user: require('./user'),
   webhooks: require('./webhooks'),
+  'content-api': require('./content-api'),
 };

package/server/routes/api-tokens.js

@@ -56,4 +56,15 @@ module.exports = [
       ],
     },
   },
+  {
+    method: 'POST',
+    path: '/api-tokens/:id/regenerate',
+    handler: 'api-token.regenerate',
+    config: {
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        { name: 'admin::hasPermissions', config: { actions: ['admin::api-tokens.regenerate'] } },
+      ],
+    },
+  },
 ];

package/server/routes/content-api.js

@@ -0,0 +1,20 @@
+'use strict';
+
+module.exports = [
+  {
+    method: 'GET',
+    path: '/content-api/permissions',
+    handler: 'content-api.getPermissions',
+    config: {
+      policies: ['admin::isAuthenticatedAdmin'],
+    },
+  },
+  {
+    method: 'GET',
+    path: '/content-api/routes',
+    handler: 'content-api.getRoutes',
+    config: {
+      policies: ['admin::isAuthenticatedAdmin'],
+    },
+  },
+];

package/server/routes/index.js

@@ -7,6 +7,7 @@ const users = require('./users');
 const roles = require('./roles');
 const webhooks = require('./webhooks');
 const apiTokens = require('./api-tokens');
+const contentApi = require('./content-api');
 
 module.exports = [
   ...admin,
@@ -16,4 +17,5 @@ module.exports = [
   ...roles,
   ...webhooks,
   ...apiTokens,
+  ...contentApi,
 ];