@strapi/plugin-users-permissions 4.3.4 → 4.3.7

package/server/controllers/auth.js

@@ -259,10 +259,7 @@ module.exports = {
     await getService('user').edit(user.id, { resetPasswordToken });
 
     // Send an email to the user.
-    await strapi
-      .plugin('email')
-      .service('email')
-      .send(emailToSend);
+    await strapi.plugin('email').service('email').send(emailToSend);
 
     ctx.send({ ok: true });
   },
@@ -326,7 +323,7 @@ module.exports = {
       }
     }
 
-    let newUser = {
+    const newUser = {
       ...params,
       role: role.id,
       email: email.toLowerCase(),

package/server/controllers/content-manager-user.js

@@ -2,12 +2,8 @@
 
 const _ = require('lodash');
 const { contentTypes: contentTypesUtils } = require('@strapi/utils');
-const {
-  ApplicationError,
-  ValidationError,
-  NotFoundError,
-  ForbiddenError,
-} = require('@strapi/utils').errors;
+const { ApplicationError, ValidationError, NotFoundError, ForbiddenError } =
+  require('@strapi/utils').errors;
 const { validateCreateUserBody, validateUpdateUserBody } = require('./validation/user');
 
 const { UPDATED_BY_ATTRIBUTE, CREATED_BY_ATTRIBUTE } = contentTypesUtils.constants;
@@ -132,17 +128,13 @@ module.exports = {
 
     const { email, username, password } = body;
 
-    let pm;
-    let user;
-
-    const { pm: permissionManager, entity } = await findEntityAndCheckPermissions(
+    const { pm, entity } = await findEntityAndCheckPermissions(
       userAbility,
       ACTIONS.edit,
       userModel,
       id
     );
-    pm = permissionManager;
-    user = entity;
+    const user = entity;
 
     await validateUpdateUserBody(ctx.request.body);
 

package/server/controllers/settings.js

@@ -17,7 +17,7 @@ module.exports = {
 
     const emailTemplates = ctx.request.body['email-templates'];
 
-    for (let key in emailTemplates) {
+    for (const key of Object.keys(emailTemplates)) {
       const template = emailTemplates[key].options.message;
 
       if (!isValidEmailTemplate(template)) {

package/server/controllers/user.js

@@ -121,7 +121,7 @@ module.exports = {
       ctx.request.body.email = ctx.request.body.email.toLowerCase();
     }
 
-    let updateData = {
+    const updateData = {
       ...ctx.request.body,
     };
 
@@ -138,7 +138,7 @@ module.exports = {
   async find(ctx) {
     const users = await getService('user').fetchAll(ctx.query);
 
-    ctx.body = await Promise.all(users.map(user => sanitizeOutput(user, ctx)));
+    ctx.body = await Promise.all(users.map((user) => sanitizeOutput(user, ctx)));
   },
 
   /**

package/server/controllers/validation/auth.js

@@ -8,19 +8,13 @@ const callbackSchema = yup.object({
 });
 
 const registerSchema = yup.object({
-  email: yup
-    .string()
-    .email()
-    .required(),
+  email: yup.string().email().required(),
   username: yup.string().required(),
   password: yup.string().required(),
 });
 
 const sendEmailConfirmationSchema = yup.object({
-  email: yup
-    .string()
-    .email()
-    .required(),
+  email: yup.string().email().required(),
 });
 
 const validateEmailConfirmationSchema = yup.object({
@@ -29,10 +23,7 @@ const validateEmailConfirmationSchema = yup.object({
 
 const forgotPasswordSchema = yup
   .object({
-    email: yup
-      .string()
-      .email()
-      .required(),
+    email: yup.string().email().required(),
   })
   .noUnknown();
 

package/server/controllers/validation/email-template.js

@@ -19,6 +19,7 @@ const matchAll = (pattern, src) => {
   let match;
 
   const regexPatternWithGlobal = RegExp(pattern, 'g');
+  // eslint-disable-next-line no-cond-assign
   while ((match = regexPatternWithGlobal.exec(src))) {
     const [, group] = match;
 
@@ -27,8 +28,8 @@ const matchAll = (pattern, src) => {
   return matches;
 };
 
-const isValidEmailTemplate = template => {
-  for (let reg of invalidPatternsRegexes) {
+const isValidEmailTemplate = (template) => {
+  for (const reg of invalidPatternsRegexes) {
     if (reg.test(template)) {
       return false;
     }

package/server/controllers/validation/user.js

@@ -7,26 +7,14 @@ const deleteRoleSchema = yup.object().shape({
 });
 
 const createUserBodySchema = yup.object().shape({
-  email: yup
-    .string()
-    .email()
-    .required(),
-  username: yup
-    .string()
-    .min(1)
-    .required(),
-  password: yup
-    .string()
-    .min(1)
-    .required(),
+  email: yup.string().email().required(),
+  username: yup.string().min(1).required(),
+  password: yup.string().min(1).required(),
   role: yup.strapiID(),
 });
 
 const updateUserBodySchema = yup.object().shape({
-  email: yup
-    .string()
-    .email()
-    .min(1),
+  email: yup.string().email().min(1),
   username: yup.string().min(1),
   password: yup.string().min(1),
 });

package/server/graphql/mutations/auth/change-password.js

@@ -23,10 +23,7 @@ module.exports = ({ nexus, strapi }) => {
 
       koaContext.request.body = toPlainObject(args);
 
-      await strapi
-        .plugin('users-permissions')
-        .controller('auth')
-        .changePassword(koaContext);
+      await strapi.plugin('users-permissions').controller('auth').changePassword(koaContext);
 
       const output = koaContext.body;
 

package/server/graphql/mutations/auth/forgot-password.js

@@ -21,10 +21,7 @@ module.exports = ({ nexus, strapi }) => {
 
       koaContext.request.body = toPlainObject(args);
 
-      await strapi
-        .plugin('users-permissions')
-        .controller('auth')
-        .forgotPassword(koaContext);
+      await strapi.plugin('users-permissions').controller('auth').forgotPassword(koaContext);
 
       const output = koaContext.body;
 

package/server/graphql/mutations/auth/login.js

@@ -20,10 +20,7 @@ module.exports = ({ nexus, strapi }) => {
       koaContext.params = { provider: args.input.provider };
       koaContext.request.body = toPlainObject(args.input);
 
-      await strapi
-        .plugin('users-permissions')
-        .controller('auth')
-        .callback(koaContext);
+      await strapi.plugin('users-permissions').controller('auth').callback(koaContext);
 
       const output = koaContext.body;
 

package/server/graphql/mutations/auth/register.js

@@ -21,10 +21,7 @@ module.exports = ({ nexus, strapi }) => {
 
       koaContext.request.body = toPlainObject(args.input);
 
-      await strapi
-        .plugin('users-permissions')
-        .controller('auth')
-        .register(koaContext);
+      await strapi.plugin('users-permissions').controller('auth').register(koaContext);
 
       const output = koaContext.body;
 

package/server/graphql/mutations/auth/reset-password.js

@@ -23,10 +23,7 @@ module.exports = ({ nexus, strapi }) => {
 
       koaContext.request.body = toPlainObject(args);
 
-      await strapi
-        .plugin('users-permissions')
-        .controller('auth')
-        .resetPassword(koaContext);
+      await strapi.plugin('users-permissions').controller('auth').resetPassword(koaContext);
 
       const output = koaContext.body;
 

package/server/graphql/mutations/crud/role/create-role.js

@@ -26,10 +26,7 @@ module.exports = ({ nexus, strapi }) => {
 
       koaContext.request.body = toPlainObject(args.data);
 
-      await strapi
-        .plugin('users-permissions')
-        .controller('role')
-        .createRole(koaContext);
+      await strapi.plugin('users-permissions').controller('role').createRole(koaContext);
 
       return { ok: true };
     },

package/server/graphql/mutations/crud/role/delete-role.js

@@ -17,10 +17,7 @@ module.exports = ({ nexus, strapi }) => {
 
       koaContext.params = { role: args.id };
 
-      await strapi
-        .plugin('users-permissions')
-        .controller('role')
-        .deleteRole(koaContext);
+      await strapi.plugin('users-permissions').controller('role').deleteRole(koaContext);
 
       return { ok: true };
     },

package/server/graphql/mutations/crud/role/update-role.js

@@ -27,10 +27,7 @@ module.exports = ({ nexus, strapi }) => {
       koaContext.request.body = args.data;
       koaContext.request.body.role = args.id;
 
-      await strapi
-        .plugin('users-permissions')
-        .controller('role')
-        .updateRole(koaContext);
+      await strapi.plugin('users-permissions').controller('role').updateRole(koaContext);
 
       return { ok: true };
     },

package/server/graphql/mutations/crud/user/create-user.js

@@ -32,10 +32,7 @@ module.exports = ({ nexus, strapi }) => {
       koaContext.params = {};
       koaContext.request.body = toPlainObject(args.data);
 
-      await strapi
-        .plugin('users-permissions')
-        .controller('user')
-        .create(koaContext);
+      await strapi.plugin('users-permissions').controller('user').create(koaContext);
 
       checkBadRequest(koaContext.body);
 

package/server/graphql/mutations/crud/user/delete-user.js

@@ -26,10 +26,7 @@ module.exports = ({ nexus, strapi }) => {
 
       koaContext.params = { id: args.id };
 
-      await strapi
-        .plugin('users-permissions')
-        .controller('user')
-        .destroy(koaContext);
+      await strapi.plugin('users-permissions').controller('user').destroy(koaContext);
 
       checkBadRequest(koaContext.body);
 

package/server/graphql/mutations/crud/user/update-user.js

@@ -33,10 +33,7 @@ module.exports = ({ nexus, strapi }) => {
       koaContext.params = { id: args.id };
       koaContext.request.body = toPlainObject(args.data);
 
-      await strapi
-        .plugin('users-permissions')
-        .controller('user')
-        .update(koaContext);
+      await strapi.plugin('users-permissions').controller('user').update(koaContext);
 
       checkBadRequest(koaContext.body);
 

package/server/graphql/mutations/index.js

@@ -3,7 +3,7 @@
 const userUID = 'plugin::users-permissions.user';
 const roleUID = 'plugin::users-permissions.role';
 
-module.exports = context => {
+module.exports = (context) => {
   const { nexus, strapi } = context;
 
   const { naming } = strapi.plugin('graphql').service('utils');

package/server/graphql/types/index.js

@@ -18,4 +18,4 @@ const typesFactories = [
  * @param {object} context.strapi
  * @return {any[]}
  */
-module.exports = context => typesFactories.map(factory => factory(context));
+module.exports = (context) => typesFactories.map((factory) => factory(context));

package/server/middlewares/rateLimit.js

@@ -1,30 +1,27 @@
 'use strict';
 
-module.exports = (config, { strapi }) => async (ctx, next) => {
-  const ratelimit = require('koa2-ratelimit').RateLimit;
+module.exports =
+  (config, { strapi }) =>
+  async (ctx, next) => {
+    const ratelimit = require('koa2-ratelimit').RateLimit;
 
-  const message = [
-    {
-      messages: [
-        {
-          id: 'Auth.form.error.ratelimit',
-          message: 'Too many attempts, please try again in a minute.',
-        },
-      ],
-    },
-  ];
-
-  return ratelimit.middleware(
-    Object.assign(
-      {},
+    const message = [
       {
-        interval: 1 * 60 * 1000,
-        max: 5,
-        prefixKey: `${ctx.request.path}:${ctx.request.ip}`,
-        message,
+        messages: [
+          {
+            id: 'Auth.form.error.ratelimit',
+            message: 'Too many attempts, please try again in a minute.',
+          },
+        ],
       },
-      strapi.config.get('plugin.users-permissions.ratelimit'),
-      config
-    )
-  )(ctx, next);
-};
+    ];
+
+    return ratelimit.middleware({
+      interval: 1 * 60 * 1000,
+      max: 5,
+      prefixKey: `${ctx.request.path}:${ctx.request.ip}`,
+      message,
+      ...strapi.config.get('plugin.users-permissions.ratelimit'),
+      ...config,
+    })(ctx, next);
+  };

package/server/register.js

@@ -1,4 +1,5 @@
 'use strict';
+
 const fs = require('fs');
 const path = require('path');
 
@@ -17,9 +18,6 @@ module.exports = ({ strapi }) => {
     const specPath = path.join(__dirname, '../documentation/content-api.yaml');
     const spec = fs.readFileSync(specPath, 'utf8');
 
-    strapi
-      .plugin('documentation')
-      .service('documentation')
-      .registerDoc(spec);
+    strapi.plugin('documentation').service('documentation').registerDoc(spec);
   }
 };

package/server/services/jwt.js

@@ -38,16 +38,18 @@ module.exports = ({ strapi }) => ({
   },
 
   verify(token) {
-    return new Promise(function(resolve, reject) {
-      jwt.verify(token, strapi.config.get('plugin.users-permissions.jwtSecret'), {}, function(
-        err,
-        tokenPayload = {}
-      ) {
-        if (err) {
-          return reject(new Error('Invalid token.'));
+    return new Promise((resolve, reject) => {
+      jwt.verify(
+        token,
+        strapi.config.get('plugin.users-permissions.jwtSecret'),
+        {},
+        (err, tokenPayload = {}) => {
+          if (err) {
+            return reject(new Error('Invalid token.'));
+          }
+          resolve(tokenPayload);
         }
-        resolve(tokenPayload);
-      });
+      );
     });
   },
 });