@strapi/plugin-users-permissions 4.0.0-next.9 → 4.0.0

package/server/bootstrap/index.js

@@ -13,12 +13,8 @@ const { getService } = require('../utils');
 
 const usersPermissionsActions = require('./users-permissions-actions');
 
-module.exports = async () => {
-  const pluginStore = strapi.store({
-    environment: '',
-    type: 'plugin',
-    name: 'users-permissions',
-  });
+module.exports = async ({ strapi }) => {
+  const pluginStore = strapi.store({ type: 'plugin', name: 'users-permissions' });
 
   await initGrant(pluginStore);
   await initEmails(pluginStore);
@@ -30,7 +26,6 @@ module.exports = async () => {
 
   await getService('users-permissions').initialize();
 
-  // TODO: adapt with new extension system
   if (!strapi.config.get('plugin.users-permissions.jwtSecret')) {
     const jwtSecret = uuid();
     strapi.config.set('plugin.users-permissions.jwtSecret', jwtSecret);
@@ -42,6 +37,9 @@ module.exports = async () => {
 };
 
 const initGrant = async pluginStore => {
+  const apiPrefix = strapi.config.get('api.rest.prefix');
+  const baseURL = `${strapi.config.server.url}/${apiPrefix}/auth`;
+
   const grantConfig = {
     email: {
       enabled: true,
@@ -52,7 +50,7 @@ const initGrant = async pluginStore => {
       icon: 'discord',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/auth/discord/callback`,
+      callback: `${baseURL}/discord/callback`,
       scope: ['identify', 'email'],
     },
     facebook: {
@@ -60,7 +58,7 @@ const initGrant = async pluginStore => {
       icon: 'facebook-square',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/auth/facebook/callback`,
+      callback: `${baseURL}/facebook/callback`,
       scope: ['email'],
     },
     google: {
@@ -68,7 +66,7 @@ const initGrant = async pluginStore => {
       icon: 'google',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/auth/google/callback`,
+      callback: `${baseURL}/google/callback`,
       scope: ['email'],
     },
     github: {
@@ -76,7 +74,7 @@ const initGrant = async pluginStore => {
       icon: 'github',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/auth/github/callback`,
+      callback: `${baseURL}/github/callback`,
       scope: ['user', 'user:email'],
     },
     microsoft: {
@@ -84,7 +82,7 @@ const initGrant = async pluginStore => {
       icon: 'windows',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/auth/microsoft/callback`,
+      callback: `${baseURL}/microsoft/callback`,
       scope: ['user.read'],
     },
     twitter: {
@@ -92,14 +90,14 @@ const initGrant = async pluginStore => {
       icon: 'twitter',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/auth/twitter/callback`,
+      callback: `${baseURL}/twitter/callback`,
     },
     instagram: {
       enabled: false,
       icon: 'instagram',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/auth/instagram/callback`,
+      callback: `${baseURL}/instagram/callback`,
       scope: ['user_profile'],
     },
     vk: {
@@ -107,7 +105,7 @@ const initGrant = async pluginStore => {
       icon: 'vk',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/auth/vk/callback`,
+      callback: `${baseURL}/vk/callback`,
       scope: ['email'],
     },
     twitch: {
@@ -115,7 +113,7 @@ const initGrant = async pluginStore => {
       icon: 'twitch',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/auth/twitch/callback`,
+      callback: `${baseURL}/twitch/callback`,
       scope: ['user:read:email'],
     },
     linkedin: {
@@ -123,7 +121,7 @@ const initGrant = async pluginStore => {
       icon: 'linkedin',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/auth/linkedin/callback`,
+      callback: `${baseURL}/linkedin/callback`,
       scope: ['r_liteprofile', 'r_emailaddress'],
     },
     cognito: {
@@ -132,7 +130,7 @@ const initGrant = async pluginStore => {
       key: '',
       secret: '',
       subdomain: 'my.subdomain.com',
-      callback: `${strapi.config.server.url}/auth/cognito/callback`,
+      callback: `${baseURL}/cognito/callback`,
       scope: ['email', 'openid', 'profile'],
     },
     reddit: {
@@ -141,7 +139,7 @@ const initGrant = async pluginStore => {
       key: '',
       secret: '',
       state: true,
-      callback: `${strapi.config.server.url}/auth/reddit/callback`,
+      callback: `${baseURL}/reddit/callback`,
       scope: ['identity'],
     },
     auth0: {
@@ -150,7 +148,7 @@ const initGrant = async pluginStore => {
       key: '',
       secret: '',
       subdomain: 'my-tenant.eu',
-      callback: `${strapi.config.server.url}/auth/auth0/callback`,
+      callback: `${baseURL}/auth0/callback`,
       scope: ['openid', 'email', 'profile'],
     },
     cas: {
@@ -158,7 +156,7 @@ const initGrant = async pluginStore => {
       icon: 'book',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/auth/cas/callback`,
+      callback: `${baseURL}/cas/callback`,
       scope: ['openid email'], // scopes should be space delimited
       subdomain: 'my.subdomain.com/cas',
     },

package/server/config.js

@@ -13,11 +13,11 @@ module.exports = {
     layout: {
       user: {
         actions: {
-          create: 'User.create', // Use the User plugin's controller.
-          update: 'User.update',
+          create: 'contentManagerUser.create', // Use the User plugin's controller.
+          update: 'contentManagerUser.update',
         },
       },
     },
   }),
-  validator: () => {},
+  validator() {},
 };

package/server/content-types/index.js

@@ -5,7 +5,7 @@ const role = require('./role');
 const user = require('./user');
 
 module.exports = {
-  permission,
-  role,
-  user,
+  permission: { schema: permission },
+  role: { schema: role },
+  user: { schema: user },
 };

package/server/content-types/permission/index.js

@@ -1,7 +1,34 @@
 'use strict';
 
-const schema = require('./schema');
-
 module.exports = {
-  schema,
+  collectionName: 'up_permissions',
+  info: {
+    name: 'permission',
+    description: '',
+    singularName: 'permission',
+    pluralName: 'permissions',
+    displayName: 'Permission',
+  },
+  pluginOptions: {
+    'content-manager': {
+      visible: false,
+    },
+    'content-type-builder': {
+      visible: false,
+    },
+  },
+  attributes: {
+    action: {
+      type: 'string',
+      required: true,
+      configurable: false,
+    },
+    role: {
+      type: 'relation',
+      relation: 'manyToOne',
+      target: 'plugin::users-permissions.role',
+      inversedBy: 'permissions',
+      configurable: false,
+    },
+  },
 };

package/server/content-types/role/index.js

@@ -1,7 +1,51 @@
 'use strict';
 
-const schema = require('./schema');
-
 module.exports = {
-  schema,
+  collectionName: 'up_roles',
+  info: {
+    name: 'role',
+    description: '',
+    singularName: 'role',
+    pluralName: 'roles',
+    displayName: 'Role',
+  },
+  pluginOptions: {
+    'content-manager': {
+      visible: false,
+    },
+    'content-type-builder': {
+      visible: false,
+    },
+  },
+  attributes: {
+    name: {
+      type: 'string',
+      minLength: 3,
+      required: true,
+      configurable: false,
+    },
+    description: {
+      type: 'string',
+      configurable: false,
+    },
+    type: {
+      type: 'string',
+      unique: true,
+      configurable: false,
+    },
+    permissions: {
+      type: 'relation',
+      relation: 'oneToMany',
+      target: 'plugin::users-permissions.permission',
+      mappedBy: 'role',
+      configurable: false,
+    },
+    users: {
+      type: 'relation',
+      relation: 'oneToMany',
+      target: 'plugin::users-permissions.user',
+      mappedBy: 'role',
+      configurable: false,
+    },
+  },
 };

package/server/content-types/user/index.js

@@ -1,11 +1,72 @@
 'use strict';
 
-const schema = require('./schema');
 const schemaConfig = require('./schema-config');
 
 module.exports = {
-  schema: {
-    ...schema,
-    config: schemaConfig, // TODO: to handle differently for V4
+  collectionName: 'up_users',
+  info: {
+    name: 'user',
+    description: '',
+    singularName: 'user',
+    pluralName: 'users',
+    displayName: 'User',
   },
+  options: {
+    draftAndPublish: false,
+    timestamps: true,
+  },
+  attributes: {
+    username: {
+      type: 'string',
+      minLength: 3,
+      unique: true,
+      configurable: false,
+      required: true,
+    },
+    email: {
+      type: 'email',
+      minLength: 6,
+      configurable: false,
+      required: true,
+    },
+    provider: {
+      type: 'string',
+      configurable: false,
+    },
+    password: {
+      type: 'password',
+      minLength: 6,
+      configurable: false,
+      private: true,
+    },
+    resetPasswordToken: {
+      type: 'string',
+      configurable: false,
+      private: true,
+    },
+    confirmationToken: {
+      type: 'string',
+      configurable: false,
+      private: true,
+    },
+    confirmed: {
+      type: 'boolean',
+      default: false,
+      configurable: false,
+    },
+    blocked: {
+      type: 'boolean',
+      default: false,
+      configurable: false,
+    },
+    role: {
+      type: 'relation',
+      relation: 'manyToOne',
+      target: 'plugin::users-permissions.role',
+      inversedBy: 'users',
+      configurable: false,
+    },
+  },
+
+  config: schemaConfig, // TODO: to move to content-manager options
 };