@strapi/plugin-users-permissions 4.3.2 → 4.3.5

package/server/services/role.js

@@ -53,7 +53,7 @@ module.exports = ({ strapi }) => ({
     const allActions = getService('users-permissions').getActions();
 
     // Group by `type`.
-    role.permissions.forEach(permission => {
+    role.permissions.forEach((permission) => {
       const [type, controller, action] = permission.action.split('.');
 
       _.set(allActions, `${type}.controllers.${controller}.${action}`, {
@@ -124,11 +124,11 @@ module.exports = ({ strapi }) => ({
     }, []);
 
     const toCreate = newActions
-      .filter(action => !oldActions.includes(action))
-      .map(action => ({ action, role: role.id }));
+      .filter((action) => !oldActions.includes(action))
+      .map((action) => ({ action, role: role.id }));
 
     await Promise.all(
-      toDelete.map(permission =>
+      toDelete.map((permission) =>
         strapi
           .query('plugin::users-permissions.permission')
           .delete({ where: { id: permission.id } })
@@ -136,7 +136,7 @@ module.exports = ({ strapi }) => ({
     );
 
     await Promise.all(
-      toCreate.map(permissionInfo =>
+      toCreate.map((permissionInfo) =>
         strapi.query('plugin::users-permissions.permission').create({ data: permissionInfo })
       )
     );
@@ -153,7 +153,7 @@ module.exports = ({ strapi }) => ({
 
     // Move users to guest role.
     await Promise.all(
-      role.users.map(user => {
+      role.users.map((user) => {
         return strapi.query('plugin::users-permissions.user').update({
           where: { id: user.id },
           data: { role: publicRoleID },
@@ -164,7 +164,7 @@ module.exports = ({ strapi }) => ({
     // Remove permissions related to this role.
     // TODO: use delete many
     await Promise.all(
-      role.permissions.map(permission => {
+      role.permissions.map((permission) => {
         return strapi.query('plugin::users-permissions.permission').delete({
           where: { id: permission.id },
         });

package/server/services/user.js

@@ -87,13 +87,6 @@ module.exports = ({ strapi }) => ({
   async remove(params) {
     return strapi.query('plugin::users-permissions.user').delete({ where: params });
   },
-  isHashed(password) {
-    if (typeof password !== 'string' || !password) {
-      return false;
-    }
-
-    return password.split('$').length === 4;
-  },
 
   validatePassword(password, hash) {
     return bcrypt.compare(password, hash);
@@ -106,7 +99,7 @@ module.exports = ({ strapi }) => ({
 
     const settings = await pluginStore
       .get({ key: 'email' })
-      .then(storeEmail => storeEmail['email_confirmation'].options);
+      .then((storeEmail) => storeEmail.email_confirmation.options);
 
     // Sanitize the template's user information
     const sanitizedUserInfo = await sanitize.sanitizers.defaultSanitizeOutput(userSchema, user);

package/server/services/users-permissions.js

@@ -15,9 +15,10 @@ const DEFAULT_PERMISSIONS = [
   { action: 'plugin::users-permissions.auth.emailConfirmation', roleType: 'public' },
   { action: 'plugin::users-permissions.auth.sendEmailConfirmation', roleType: 'public' },
   { action: 'plugin::users-permissions.user.me', roleType: 'authenticated' },
+  { action: 'plugin::users-permissions.auth.changePassword', roleType: 'authenticated' },
 ];
 
-const transformRoutePrefixFor = pluginName => route => {
+const transformRoutePrefixFor = (pluginName) => (route) => {
   const prefix = route.config && route.config.prefix;
   const path = prefix !== undefined ? `${prefix}${route.path}` : `/${pluginName}${route.path}`;
 
@@ -31,7 +32,7 @@ module.exports = ({ strapi }) => ({
   getActions({ defaultEnable = false } = {}) {
     const actionMap = {};
 
-    const isContentApi = action => {
+    const isContentApi = (action) => {
       if (!_.has(action, Symbol.for('__type__'))) {
         return false;
       }
@@ -100,20 +101,20 @@ module.exports = ({ strapi }) => ({
     const routesMap = {};
 
     _.forEach(strapi.api, (api, apiName) => {
-      const routes = _.flatMap(api.routes, route => {
+      const routes = _.flatMap(api.routes, (route) => {
         if (_.has(route, 'routes')) {
           return route.routes;
         }
 
         return route;
-      }).filter(route => route.info.type === 'content-api');
+      }).filter((route) => route.info.type === 'content-api');
 
       if (routes.length === 0) {
         return;
       }
 
       const apiPrefix = strapi.config.get('api.rest.prefix');
-      routesMap[`api::${apiName}`] = routes.map(route => ({
+      routesMap[`api::${apiName}`] = routes.map((route) => ({
         ...route,
         path: urlJoin(apiPrefix, route.path),
       }));
@@ -122,20 +123,20 @@ module.exports = ({ strapi }) => ({
     _.forEach(strapi.plugins, (plugin, pluginName) => {
       const transformPrefix = transformRoutePrefixFor(pluginName);
 
-      const routes = _.flatMap(plugin.routes, route => {
+      const routes = _.flatMap(plugin.routes, (route) => {
         if (_.has(route, 'routes')) {
           return route.routes.map(transformPrefix);
         }
 
         return transformPrefix(route);
-      }).filter(route => route.info.type === 'content-api');
+      }).filter((route) => route.info.type === 'content-api');
 
       if (routes.length === 0) {
         return;
       }
 
       const apiPrefix = strapi.config.get('api.rest.prefix');
-      routesMap[`plugin::${pluginName}`] = routes.map(route => ({
+      routesMap[`plugin::${pluginName}`] = routes.map((route) => ({
         ...route,
         path: urlJoin(apiPrefix, route.path),
       }));
@@ -152,7 +153,7 @@ module.exports = ({ strapi }) => ({
 
     const appActions = _.flatMap(strapi.api, (api, apiName) => {
       return _.flatMap(api.controllers, (controller, controllerName) => {
-        return _.keys(controller).map(actionName => {
+        return _.keys(controller).map((actionName) => {
           return `api::${apiName}.${controllerName}.${actionName}`;
         });
       });
@@ -160,7 +161,7 @@ module.exports = ({ strapi }) => ({
 
     const pluginsActions = _.flatMap(strapi.plugins, (plugin, pluginName) => {
       return _.flatMap(plugin.controllers, (controller, controllerName) => {
-        return _.keys(controller).map(actionName => {
+        return _.keys(controller).map((actionName) => {
           return `plugin::${pluginName}.${controllerName}.${actionName}`;
         });
       });
@@ -171,7 +172,7 @@ module.exports = ({ strapi }) => ({
     const toDelete = _.difference(permissionsFoundInDB, allActions);
 
     await Promise.all(
-      toDelete.map(action => {
+      toDelete.map((action) => {
         return strapi.query('plugin::users-permissions.permission').delete({ where: { action } });
       })
     );
@@ -185,7 +186,7 @@ module.exports = ({ strapi }) => ({
         )(DEFAULT_PERMISSIONS);
 
         await Promise.all(
-          toCreate.map(action => {
+          toCreate.map((action) => {
             return strapi.query('plugin::users-permissions.permission').create({
               data: {
                 action,

package/server/strategies/users-permissions.js

@@ -9,7 +9,7 @@ const getAdvancedSettings = () => {
   return strapi.store({ type: 'plugin', name: 'users-permissions' }).get({ key: 'advanced' });
 };
 
-const authenticate = async ctx => {
+const authenticate = async (ctx) => {
   try {
     const token = await getService('jwt').getToken(ctx);
 
@@ -77,7 +77,7 @@ const verify = async (auth, config) => {
     }
   }
 
-  let allowedActions = auth.allowedActions;
+  let { allowedActions } = auth;
 
   if (!allowedActions) {
     const permissions = await strapi.query('plugin::users-permissions.permission').findMany({
@@ -88,7 +88,7 @@ const verify = async (auth, config) => {
     auth.allowedActions = allowedActions;
   }
 
-  const isAllowed = castArray(config.scope).every(scope => allowedActions.includes(scope));
+  const isAllowed = castArray(config.scope).every((scope) => allowedActions.includes(scope));
 
   if (!isAllowed) {
     throw new ForbiddenError();

package/server/utils/index.js

@@ -2,7 +2,7 @@
 
 const sanitize = require('./sanitize');
 
-const getService = name => {
+const getService = (name) => {
   return strapi.plugin('users-permissions').service(name);
 };