@strapi/plugin-users-permissions 4.0.0-next.7 → 4.0.1

package/documentation/1.0.0/overrides/users-permissions-Role.json

@@ -67,16 +67,16 @@
                           "role": {
                             "type": "string"
                           },
-                          "created_by": {
+                          "createdBy": {
                             "type": "string"
                           },
-                          "updated_by": {
+                          "updatedBy": {
                             "type": "string"
                           }
                         }
                       }
                     },
-                    "created_by": {
+                    "createdBy": {
                       "required": ["id", "email"],
                       "properties": {
                         "id": {
@@ -117,7 +117,7 @@
                         }
                       }
                     },
-                    "updated_by": {
+                    "updatedBy": {
                       "required": ["id", "email"],
                       "properties": {
                         "id": {
@@ -192,7 +192,7 @@
                       "type": {
                         "type": "string"
                       },
-                      "created_by": {
+                      "createdBy": {
                         "required": ["id", "email"],
                         "properties": {
                           "id": {
@@ -233,7 +233,7 @@
                           }
                         }
                       },
-                      "updated_by": {
+                      "updatedBy": {
                         "required": ["id", "email"],
                         "properties": {
                           "id": {

package/documentation/1.0.0/overrides/users-permissions-User.json

@@ -6,7 +6,7 @@
         "security": [],
         "externalDocs": {
           "description": "Find out more in the strapi's documentation",
-          "url": "https://strapi.io/documentation/developer-docs/latest/development/plugins/users-permissions.html#registration"
+          "url": "https://docs.strapi.io/developer-docs/latest/plugins/users-permissions.html#registration"
         },
         "responses": {
           "200": {
@@ -58,7 +58,7 @@
         "security": [],
         "externalDocs": {
           "description": "Find out more in the strapi's documentation",
-          "url": "https://strapi.io/documentation/developer-docs/latest/development/plugins/users-permissions.html#email-validation"
+          "url": "https://docs.strapi.io/developer-docs/latest/plugins/users-permissions.html#email-validation"
         },
         "responses": {
           "200": {
@@ -130,7 +130,7 @@
         ],
         "externalDocs": {
           "description": "Find out more about the authentication flow in the strapi documentation",
-          "url": "https://strapi.io/documentation/developer-docs/latest/development/plugins/users-permissions.html#setting-up-the-provider-examples"
+          "url": "https://docs.strapi.io/developer-docs/latest/plugins/users-permissions.html#providers"
         },
         "responses": {
           "200": {
@@ -143,7 +143,7 @@
       "post": {
         "externalDocs": {
           "description": "Find out more in the strapi's documentation",
-          "url": "https://strapi.io/documentation/developer-docs/latest/development/plugins/users-permissions.html#login"
+          "url": "https://docs.strapi.io/developer-docs/latest/plugins/users-permissions.html#login"
         },
         "tags": ["Authentication"],
         "security": [],
@@ -188,7 +188,7 @@
         "tags": ["Authentication"],
         "externalDocs": {
           "description": "Find out more in the strapi's documentation",
-          "url": "https://strapi.io/documentation/developer-docs/latest/development/plugins/users-permissions.html#setting-up-the-provider-examples"
+          "url": "https://docs.strapi.io/developer-docs/latest/plugins/users-permissions.html#providers"
         },
         "parameters": [
           {
@@ -223,7 +223,7 @@
         "summary": "Send an email to reset your password",
         "externalDocs": {
           "description": "Find out more in the strapi's documentation",
-          "url": "https://strapi.io/documentation/developer-docs/latest/development/plugins/users-permissions.html#forgotten-reset-password"
+          "url": "https://docs.strapi.io/developer-docs/latest/plugins/users-permissions.html#forgotten-reset-password"
         },
         "requestBody": {
           "description": "",
@@ -315,7 +315,7 @@
       "description": "All the routes related to the authentication",
       "externalDocs": {
         "description": "Find out more in strapi's documentation",
-        "url": "https://strapi.io/documentation/developer-docs/latest/development/plugins/users-permissions.html"
+        "url": "https://docs.strapi.io/developer-docs/latest/plugins/users-permissions.html"
       }
     },
     {

package/jest.config.front.js

@@ -0,0 +1,10 @@
+'use strict';
+
+const baseConfig = require('../../../jest.base-config.front');
+const pkg = require('./package');
+
+module.exports = {
+  ...baseConfig,
+  displayName: (pkg.strapi && pkg.strapi.name) || pkg.name,
+  roots: [__dirname],
+};

package/package.json

@@ -1,23 +1,36 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.0.0-next.7",
+  "version": "4.0.1",
   "description": "Protect your API with a full-authentication process based on JWT",
-  "strapi": {
-    "displayName": "Roles & Permissions",
-    "name": "users-permissions",
-    "icon": "users",
-    "description": "users-permissions.plugin.description",
-    "required": true,
-    "kind": "plugin"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/strapi/strapi.git"
+  },
+  "license": "SEE LICENSE IN LICENSE",
+  "author": {
+    "name": "Strapi Solutions SAS",
+    "email": "hi@strapi.io",
+    "url": "https://strapi.io"
   },
+  "maintainers": [
+    {
+      "name": "Strapi Solutions SAS",
+      "email": "hi@strapi.io",
+      "url": "https://strapi.io"
+    }
+  ],
   "scripts": {
-    "test": "echo \"no tests yet\""
+    "test:unit": "jest --verbose",
+    "test:front": "cross-env IS_EE=true jest --config ./jest.config.front.js",
+    "test:front:watch": "cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
+    "test:front:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js",
+    "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll"
   },
   "dependencies": {
     "@purest/providers": "^1.0.2",
-    "@strapi/helper-plugin": "4.0.0-next.7",
-    "@strapi/utils": "4.0.0-next.7",
-    "bcryptjs": "^2.4.3",
+    "@strapi/helper-plugin": "4.0.1",
+    "@strapi/utils": "4.0.1",
+    "bcryptjs": "2.4.3",
     "grant-koa": "5.4.8",
     "jsonwebtoken": "^8.1.0",
     "koa2-ratelimit": "^0.9.0",
@@ -28,35 +41,25 @@
     "react-intl": "5.20.2",
     "react-redux": "7.2.3",
     "react-router": "^5.2.0",
-    "react-router-dom": "^5.0.0",
-    "reactstrap": "8.4.1",
+    "react-router-dom": "5.2.0",
     "redux-saga": "^0.16.0",
     "request": "^2.83.0",
+    "url-join": "4.0.1",
     "uuid": "^3.1.0"
   },
   "devDependencies": {
     "koa": "^2.13.1"
   },
-  "author": {
-    "name": "Strapi team",
-    "email": "hi@strapi.io",
-    "url": "https://strapi.io"
-  },
-  "maintainers": [
-    {
-      "name": "Strapi team",
-      "email": "hi@strapi.io",
-      "url": "https://strapi.io"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/strapi/strapi.git"
-  },
   "engines": {
     "node": ">=12.x.x <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "license": "SEE LICENSE IN LICENSE",
-  "gitHead": "522d6afd54b68ed3376dd0c807fab6c1315f1931"
+  "strapi": {
+    "displayName": "Roles & Permissions",
+    "name": "users-permissions",
+    "description": "Protect your API with a full authentication process based on JWT. This plugin comes also with an ACL strategy that allows you to manage the permissions between the groups of users.",
+    "required": true,
+    "kind": "plugin"
+  },
+  "gitHead": "e2cd01e8c6cbfeba15ad7787e38b6eebcbb92221"
 }

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,21 +26,20 @@ 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);
-    strapi.reload.isWatching = false;
 
     if (!process.env.JWT_SECRET) {
-      await strapi.fs.appendFile('.env', `JWT_SECRET=${jwtSecret}\n`);
+      strapi.fs.appendFile('.env', `JWT_SECRET=${jwtSecret}\n`);
     }
-
-    strapi.reload.isWatching = true;
   }
 };
 
 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,
@@ -55,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: {
@@ -63,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: {
@@ -71,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: {
@@ -79,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: {
@@ -87,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: {
@@ -95,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: {
@@ -110,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: {
@@ -118,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: {
@@ -126,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: {
@@ -135,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: {
@@ -144,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: {
@@ -153,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: {
@@ -161,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
 };