@strapi/plugin-users-permissions 4.0.0-next.12 → 4.0.0-next.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.0.0-next.12",
+  "version": "4.0.0-next.13",
   "description": "Protect your API with a full-authentication process based on JWT",
   "strapi": {
     "displayName": "Roles & Permissions",
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@purest/providers": "^1.0.2",
-    "@strapi/helper-plugin": "4.0.0-next.12",
-    "@strapi/utils": "4.0.0-next.12",
+    "@strapi/helper-plugin": "4.0.0-next.13",
+    "@strapi/utils": "4.0.0-next.13",
     "bcryptjs": "^2.4.3",
     "grant-koa": "5.4.8",
     "jsonwebtoken": "^8.1.0",
@@ -58,5 +58,5 @@
     "npm": ">=6.0.0"
   },
   "license": "SEE LICENSE IN LICENSE",
-  "gitHead": "67af23d827fd48e7782e509a78d0ba66e67e2215"
+  "gitHead": "c1369c796034fb1b57471498eb1e0c75ce2d7715"
 }

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

@@ -68,5 +68,5 @@ module.exports = {
     },
   },
 
-  config: schemaConfig, // TODO: to handle differently for V4
+  config: schemaConfig, // TODO: to move to content-manager options
 };

package/server/controllers/user/admin.js

@@ -51,10 +51,9 @@ module.exports = {
    * @return {Object}
    */
   async create(ctx) {
-    const {
-      request: { body },
-      state: { userAbility, admin },
-    } = ctx;
+    const { body } = ctx.request;
+    const { user: admin, userAbility } = ctx.state;
+
     const { email, username, password } = body;
 
     const pm = strapi.admin.services.permission.createPermissionsManager({
@@ -117,7 +116,7 @@ module.exports = {
       [UPDATED_BY_ATTRIBUTE]: admin.id,
     };
 
-    user.email = user.email.toLowerCase();
+    user.email = _.toLower(user.email);
 
     if (!user.role) {
       const defaultRole = await strapi
@@ -141,15 +140,14 @@ module.exports = {
    */
 
   async update(ctx) {
+    const { id } = ctx.params;
+    const { body } = ctx.request;
+    const { user: admin, userAbility } = ctx.state;
+
     const advancedConfigs = await strapi
       .store({ type: 'plugin', name: 'users-permissions', key: 'advanced' })
       .get();
 
-    const {
-      params: { id },
-      request: { body },
-      state: { userAbility, admin },
-    } = ctx;
     const { email, username, password } = body;
 
     const { pm, entity: user } = await findEntityAndCheckPermissions(
@@ -191,7 +189,7 @@ module.exports = {
     if (_.has(body, 'email') && advancedConfigs.unique_email) {
       const userWithSameEmail = await strapi
         .query('plugin::users-permissions.user')
-        .findOne({ where: { email: email.toLowerCase() } });
+        .findOne({ where: { email: _.toLower(email) } });
 
       if (userWithSameEmail && userWithSameEmail.id != id) {
         return ctx.badRequest(
@@ -203,16 +201,12 @@ module.exports = {
           })
         );
       }
-      body.email = body.email.toLowerCase();
+      body.email = _.toLower(body.email);
     }
 
     const sanitizedData = pm.pickPermittedFieldsOf(body, { subject: pm.toSubject(user) });
     const updateData = _.omit({ ...sanitizedData, updatedBy: admin.id }, 'createdBy');
 
-    if (_.has(body, 'password') && password === user.password) {
-      delete updateData.password;
-    }
-
     const data = await getService('user').edit({ id }, updateData);
 
     ctx.body = pm.sanitize(data, { action: ACTIONS.read });

package/server/controllers/user/api.js

@@ -67,7 +67,7 @@ module.exports = {
       provider: 'local',
     };
 
-    user.email = user.email.toLowerCase();
+    user.email = _.toLower(user.email);
 
     if (!role) {
       const defaultRole = await strapi
@@ -85,11 +85,11 @@ module.exports = {
       ctx.badRequest(null, formatError(error));
     }
   },
+
   /**
    * Update a/an user record.
    * @return {Object}
    */
-
   async update(ctx) {
     const advancedConfigs = await strapi
       .store({ type: 'plugin', name: 'users-permissions', key: 'advanced' })
@@ -98,9 +98,7 @@ module.exports = {
     const { id } = ctx.params;
     const { email, username, password } = ctx.request.body;
 
-    const user = await getService('user').fetch({
-      id,
-    });
+    const user = await getService('user').fetch({ id });
 
     if (_.has(ctx.request.body, 'email') && !email) {
       return ctx.badRequest('email.notNull');
@@ -153,10 +151,6 @@ module.exports = {
       ...ctx.request.body,
     };
 
-    if (_.has(ctx.request.body, 'password') && password === user.password) {
-      delete updateData.password;
-    }
-
     const data = await getService('user').edit({ id }, updateData);
 
     ctx.send(sanitizeUser(data));

package/server/register.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const authStrategy = require('./auth/strategy');
+const authStrategy = require('./strategies/users-permissions');
 
 module.exports = strapi => {
   strapi.container.get('auth').register('content-api', authStrategy);

package/server/services/users-permissions.js

@@ -101,7 +101,10 @@ module.exports = ({ strapi }) => ({
         return;
       }
 
-      routesMap[`api::${apiName}`] = routes;
+      routesMap[`api::${apiName}`] = routes.map(route => ({
+        ...route,
+        path: `/api${route.path}`,
+      }));
     });
 
     _.forEach(strapi.plugins, (plugin, pluginName) => {
@@ -119,7 +122,10 @@ module.exports = ({ strapi }) => ({
         return;
       }
 
-      routesMap[`plugin::${pluginName}`] = routes;
+      routesMap[`plugin::${pluginName}`] = routes.map(route => ({
+        ...route,
+        path: `/api${route.path}`,
+      }));
     });
 
     return routesMap;
@@ -134,7 +140,7 @@ module.exports = ({ strapi }) => ({
     const appActions = _.flatMap(strapi.api, (api, apiName) => {
       return _.flatMap(api.controllers, (controller, controllerName) => {
         return _.keys(controller).map(actionName => {
-          return `api::${apiName}.${controllerName}.${_.toLower(actionName)}`;
+          return `api::${apiName}.${controllerName}.${actionName}`;
         });
       });
     });
@@ -142,7 +148,7 @@ module.exports = ({ strapi }) => ({
     const pluginsActions = _.flatMap(strapi.plugins, (plugin, pluginName) => {
       return _.flatMap(plugin.controllers, (controller, controllerName) => {
         return _.keys(controller).map(actionName => {
-          return `plugin::${pluginName}.${controllerName}.${_.toLower(actionName)}`;
+          return `plugin::${pluginName}.${controllerName}.${actionName}`;
         });
       });
     });

package/server/{auth/strategy.js → strategies/users-permissions.js}

@@ -14,7 +14,7 @@ const authenticate = async ctx => {
       const { id } = await getService('jwt').getToken(ctx);
 
       if (id === undefined) {
-        return { error: 'Invalid token: Token did not contain required fields' };
+        return { authenticated: false };
       }
 
       // fetch authenticated user
@@ -41,7 +41,7 @@ const authenticate = async ctx => {
         credentials: user,
       };
     } catch (err) {
-      return { error: 'Invalid credentials' };
+      return { authenticated: false };
     }
   }