@strapi/plugin-users-permissions 0.0.0-4fc90398602f → 0.0.0-8581854cb3

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

@@ -26,7 +26,10 @@ 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,7 +17,10 @@ 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,7 +27,10 @@ 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,7 +32,10 @@ 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,7 +26,10 @@ 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,7 +33,10 @@ 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,27 +1,30 @@
 '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 = [
+  const message = [
+    {
+      messages: [
+        {
+          id: 'Auth.form.error.ratelimit',
+          message: 'Too many attempts, please try again in a minute.',
+        },
+      ],
+    },
+  ];
+
+  return ratelimit.middleware(
+    Object.assign(
+      {},
       {
-        messages: [
-          {
-            id: 'Auth.form.error.ratelimit',
-            message: 'Too many attempts, please try again in a minute.',
-          },
-        ],
+        interval: 1 * 60 * 1000,
+        max: 5,
+        prefixKey: `${ctx.request.path}:${ctx.request.ip}`,
+        message,
       },
-    ];
-
-    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);
-  };
+      strapi.config.get('plugin.users-permissions.ratelimit'),
+      config
+    )
+  )(ctx, next);
+};

package/server/register.js

@@ -1,5 +1,4 @@
 'use strict';
-
 const fs = require('fs');
 const path = require('path');
 
@@ -18,6 +17,9 @@ 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,18 +38,16 @@ module.exports = ({ strapi }) => ({
   },
 
   verify(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);
+    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.'));
         }
-      );
+        resolve(tokenPayload);
+      });
     });
   },
 });

package/server/services/providers-registry.js

@@ -4,15 +4,15 @@ const { strict: assert } = require('assert');
 const jwt = require('jsonwebtoken');
 
 const getInitialProviders = ({ purest }) => ({
-  async discord({ accessToken }) {
+  async discord({ access_token }) {
     const discord = purest({ provider: 'discord' });
     return discord
       .get('users/@me')
-      .auth(accessToken)
+      .auth(access_token)
       .request()
       .then(({ body }) => {
         // Combine username and discriminator because discord username is not unique
-        const username = `${body.username}#${body.discriminator}`;
+        var username = `${body.username}#${body.discriminator}`;
         return {
           username,
           email: body.email,
@@ -33,12 +33,12 @@ const getInitialProviders = ({ purest }) => ({
       };
     }
   },
-  async facebook({ accessToken }) {
+  async facebook({ access_token }) {
     const facebook = purest({ provider: 'facebook' });
 
     return facebook
       .get('me')
-      .auth(accessToken)
+      .auth(access_token)
       .qs({ fields: 'name,email' })
       .request()
       .then(({ body }) => ({
@@ -46,20 +46,20 @@ const getInitialProviders = ({ purest }) => ({
         email: body.email,
       }));
   },
-  async google({ accessToken }) {
+  async google({ access_token }) {
     const google = purest({ provider: 'google' });
 
     return google
       .query('oauth')
       .get('tokeninfo')
-      .qs({ accessToken })
+      .qs({ access_token })
       .request()
       .then(({ body }) => ({
         username: body.email.split('@')[0],
         email: body.email,
       }));
   },
-  async github({ accessToken }) {
+  async github({ access_token }) {
     const github = purest({
       provider: 'github',
       defaults: {
@@ -69,7 +69,10 @@ const getInitialProviders = ({ purest }) => ({
       },
     });
 
-    const { body: userBody } = await github.get('user').auth(accessToken).request();
+    const { body: userBody } = await github
+      .get('user')
+      .auth(access_token)
+      .request();
 
     // This is the public email on the github profile
     if (userBody.email) {
@@ -79,28 +82,31 @@ const getInitialProviders = ({ purest }) => ({
       };
     }
     // Get the email with Github's user/emails API
-    const { body: emailBody } = await github.get('user/emails').auth(accessToken).request();
+    const { body: emailBody } = await github
+      .get('user/emails')
+      .auth(access_token)
+      .request();
 
     return {
       username: userBody.login,
       email: Array.isArray(emailBody)
-        ? emailBody.find((email) => email.primary === true).email
+        ? emailBody.find(email => email.primary === true).email
         : null,
     };
   },
-  async microsoft({ accessToken }) {
+  async microsoft({ access_token }) {
     const microsoft = purest({ provider: 'microsoft' });
 
     return microsoft
       .get('me')
-      .auth(accessToken)
+      .auth(access_token)
       .request()
       .then(({ body }) => ({
         username: body.userPrincipalName,
         email: body.userPrincipalName,
       }));
   },
-  async twitter({ accessToken, query, providers }) {
+  async twitter({ access_token, query, providers }) {
     const twitter = purest({
       provider: 'twitter',
       defaults: {
@@ -113,7 +119,7 @@ const getInitialProviders = ({ purest }) => ({
 
     return twitter
       .get('account/verify_credentials')
-      .auth(accessToken, query.access_secret)
+      .auth(access_token, query.access_secret)
       .qs({ screen_name: query['raw[screen_name]'], include_email: 'true' })
       .request()
       .then(({ body }) => ({
@@ -121,12 +127,12 @@ const getInitialProviders = ({ purest }) => ({
         email: body.email,
       }));
   },
-  async instagram({ accessToken }) {
+  async instagram({ access_token }) {
     const instagram = purest({ provider: 'instagram' });
 
     return instagram
       .get('me')
-      .auth(accessToken)
+      .auth(access_token)
       .qs({ fields: 'id,username' })
       .request()
       .then(({ body }) => ({
@@ -134,12 +140,12 @@ const getInitialProviders = ({ purest }) => ({
         email: `${body.username}@strapi.io`, // dummy email as Instagram does not provide user email
       }));
   },
-  async vk({ accessToken, query }) {
+  async vk({ access_token, query }) {
     const vk = purest({ provider: 'vk' });
 
     return vk
       .get('users.get')
-      .auth(accessToken)
+      .auth(access_token)
       .qs({ id: query.raw.user_id, v: '5.122' })
       .request()
       .then(({ body }) => ({
@@ -147,7 +153,7 @@ const getInitialProviders = ({ purest }) => ({
         email: query.raw.email,
       }));
   },
-  async twitch({ accessToken, providers }) {
+  async twitch({ access_token, providers }) {
     const twitch = purest({
       provider: 'twitch',
       config: {
@@ -166,23 +172,26 @@ const getInitialProviders = ({ purest }) => ({
 
     return twitch
       .get('users')
-      .auth(accessToken, providers.twitch.key)
+      .auth(access_token, providers.twitch.key)
       .request()
       .then(({ body }) => ({
         username: body.data[0].login,
         email: body.data[0].email,
       }));
   },
-  async linkedin({ accessToken }) {
+  async linkedin({ access_token }) {
     const linkedIn = purest({ provider: 'linkedin' });
     const {
       body: { localizedFirstName },
-    } = await linkedIn.get('me').auth(accessToken).request();
+    } = await linkedIn
+      .get('me')
+      .auth(access_token)
+      .request();
     const {
       body: { elements },
     } = await linkedIn
       .get('emailAddress?q=members&projection=(elements*(handle~))')
-      .auth(accessToken)
+      .auth(access_token)
       .request();
 
     const email = elements[0]['handle~'];
@@ -192,7 +201,7 @@ const getInitialProviders = ({ purest }) => ({
       email: email.emailAddress,
     };
   },
-  async reddit({ accessToken }) {
+  async reddit({ access_token }) {
     const reddit = purest({
       provider: 'reddit',
       config: {
@@ -212,20 +221,20 @@ const getInitialProviders = ({ purest }) => ({
 
     return reddit
       .get('me')
-      .auth(accessToken)
+      .auth(access_token)
       .request()
       .then(({ body }) => ({
         username: body.name,
         email: `${body.name}@strapi.io`, // dummy email as Reddit does not provide user email
       }));
   },
-  async auth0({ accessToken, providers }) {
+  async auth0({ access_token, providers }) {
     const auth0 = purest({ provider: 'auth0' });
 
     return auth0
       .get('userinfo')
       .subdomain(providers.auth0.subdomain)
-      .auth(accessToken)
+      .auth(access_token)
       .request()
       .then(({ body }) => {
         const username = body.username || body.nickname || body.name || body.email.split('@')[0];
@@ -237,13 +246,13 @@ const getInitialProviders = ({ purest }) => ({
         };
       });
   },
-  async cas({ accessToken, providers }) {
+  async cas({ access_token, providers }) {
     const cas = purest({ provider: 'cas' });
 
     return cas
       .get('oidc/profile')
       .subdomain(providers.cas.subdomain)
-      .auth(accessToken)
+      .auth(access_token)
       .request()
       .then(({ body }) => {
         // CAS attribute may be in body.attributes or "FLAT", depending on CAS config
@@ -255,7 +264,7 @@ const getInitialProviders = ({ purest }) => ({
           : body.strapiemail || body.email;
         if (!username || !email) {
           strapi.log.warn(
-            `CAS Response Body did not contain required attributes: ${JSON.stringify(body)}`
+            'CAS Response Body did not contain required attributes: ' + JSON.stringify(body)
           );
         }
         return {
@@ -279,14 +288,14 @@ module.exports = () => {
       providersCallbacks[providerName] = provider({ purest });
     },
 
-    async run({ provider, accessToken, query, providers }) {
+    async run({ provider, access_token, query, providers }) {
       if (!providersCallbacks[provider]) {
         throw new Error('Unknown provider.');
       }
 
       const providerCb = providersCallbacks[provider];
 
-      return providerCb({ accessToken, query, providers });
+      return providerCb({ access_token, query, providers });
     },
   };
 };

package/server/services/providers.js

@@ -19,7 +19,7 @@ module.exports = ({ strapi }) => {
    */
 
   const getProfile = async (provider, query) => {
-    const accessToken = query.access_token || query.code || query.oauth_token;
+    const access_token = query.access_token || query.code || query.oauth_token;
 
     const providers = await strapi
       .store({ type: 'plugin', name: 'users-permissions', key: 'grant' })
@@ -28,7 +28,7 @@ module.exports = ({ strapi }) => {
     return getService('providers-registry').run({
       provider,
       query,
-      accessToken,
+      access_token,
       providers,
     });
   };
@@ -38,15 +38,15 @@ module.exports = ({ strapi }) => {
    *
    *
    * @param {String}    provider
-   * @param {String}    accessToken
+   * @param {String}    access_token
    *
    * @return  {*}
    */
 
   const connect = async (provider, query) => {
-    const accessToken = query.access_token || query.code || query.oauth_token;
+    const access_token = query.access_token || query.code || query.oauth_token;
 
-    if (!accessToken) {
+    if (!access_token) {
       throw new Error('No access_token.');
     }
 

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

@@ -99,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

@@ -18,7 +18,7 @@ const DEFAULT_PERMISSIONS = [
   { 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}`;
 
@@ -32,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;
       }
@@ -101,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),
       }));
@@ -123,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),
       }));
@@ -153,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}`;
         });
       });
@@ -161,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}`;
         });
       });
@@ -172,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 } });
       })
     );
@@ -186,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;
+  let allowedActions = auth.allowedActions;
 
   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();