@strapi/plugin-users-permissions 4.0.6 → 4.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "description": "Protect your API with a full-authentication process based on JWT",
   "repository": {
     "type": "git",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@purest/providers": "^1.0.2",
-    "@strapi/helper-plugin": "4.0.6",
-    "@strapi/utils": "4.0.6",
+    "@strapi/helper-plugin": "4.0.7",
+    "@strapi/utils": "4.0.7",
     "bcryptjs": "2.4.3",
     "grant-koa": "5.4.8",
     "jsonwebtoken": "^8.1.0",
@@ -61,5 +61,5 @@
     "required": true,
     "kind": "plugin"
   },
-  "gitHead": "5b48053946aacfb564ff423342fe70d79cd6d66d"
+  "gitHead": "af0cba8c5b2ba7b371523e8f55413ef0fce98e1e"
 }

package/server/controllers/auth.js

@@ -137,13 +137,8 @@ module.exports = {
         throw new ValidationError('Incorrect code provided');
       }
 
-      const password = await getService('user').hashPassword({ password: params.password });
-
+      await getService('user').edit(user.id, { resetPasswordToken: null, password: params.password });
       // Update the user.
-      await strapi
-        .query('plugin::users-permissions.user')
-        .update({ where: { id: user.id }, data: { resetPasswordToken: null, password } });
-
       ctx.send({
         jwt: getService('jwt').issue({ id: user.id }),
         user: await sanitizeUser(user, ctx),
@@ -325,7 +320,6 @@ module.exports = {
     }
 
     params.role = role.id;
-    params.password = await getService('user').hashPassword(params);
 
     const user = await strapi.query('plugin::users-permissions.user').findOne({
       where: { email: params.email },
@@ -344,7 +338,7 @@ module.exports = {
         params.confirmed = true;
       }
 
-      const user = await strapi.query('plugin::users-permissions.user').create({ data: params });
+    const user = await getService('user').add(params);
 
       const sanitizedUser = await sanitizeUser(user, ctx);
 
@@ -367,8 +361,11 @@ module.exports = {
     } catch (err) {
       if (_.includes(err.message, 'username')) {
         throw new ApplicationError('Username already taken');
-      } else {
+      } else if (_.includes(err.message, 'email')) {
         throw new ApplicationError('Email already taken');
+      } else {
+        strapi.log.error(err);
+        throw new ApplicationError('An error occurred during account creation');
       }
     }
   },

package/server/services/user.js

@@ -35,13 +35,10 @@ module.exports = ({ strapi }) => ({
    * @return {Promise}
    */
   async add(values) {
-    if (values.password) {
-      values.password = await getService('user').hashPassword(values);
-    }
-
-    return strapi
-      .query('plugin::users-permissions.user')
-      .create({ data: values, populate: ['role'] });
+    return strapi.entityService.create('plugin::users-permissions.user', {
+      data: values,
+      populate: ['role'],
+    });
   },
 
   /**
@@ -51,10 +48,6 @@ module.exports = ({ strapi }) => ({
    * @return {Promise}
    */
   async edit(userId, params = {}) {
-    if (params.password) {
-      params.password = await getService('user').hashPassword(params);
-    }
-
     return strapi.entityService.update('plugin::users-permissions.user', userId, {
       data: params,
       populate: ['role'],
@@ -87,21 +80,13 @@ module.exports = ({ strapi }) => ({
     return strapi.query('plugin::users-permissions.user').findMany({ where: params, populate });
   },
 
-  hashPassword(user = {}) {
-    return new Promise((resolve, reject) => {
-      if (!user.password || this.isHashed(user.password)) {
-        resolve(null);
-      } else {
-        bcrypt.hash(`${user.password}`, 10, (err, hash) => {
-          if (err) {
-            return reject(err);
-          }
-          resolve(hash);
-        });
-      }
-    });
+  /**
+   * Promise to remove a/an user.
+   * @return {Promise}
+   */
+  async remove(params) {
+    return strapi.query('plugin::users-permissions.user').delete({ where: params });
   },
-
   isHashed(password) {
     if (typeof password !== 'string' || !password) {
       return false;
@@ -110,14 +95,6 @@ module.exports = ({ strapi }) => ({
     return password.split('$').length === 4;
   },
 
-  /**
-   * Promise to remove a/an user.
-   * @return {Promise}
-   */
-  async remove(params) {
-    return strapi.query('plugin::users-permissions.user').delete({ where: params });
-  },
-
   validatePassword(password, hash) {
     return bcrypt.compare(password, hash);
   },