Allow custom populate in user model

strapi · Jun 22, 2020 · 40892ba · 40892ba
1 parent 9ed11a6
commit 40892ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/strapi-plugin-users-permissions/config/policies/permissions.js b/packages/strapi-plugin-users-permissions/config/policies/permissions.js
@@ -16,7 +16,7 @@ module.exports = async (ctx, next) => {
       if (isAdmin) {
         ctx.state.admin = await strapi.query('administrator', 'admin').findOne({ id }, []);
       } else {
-        ctx.state.user = await strapi.query('user', 'users-permissions').findOne({ id }, ['role']);
+        ctx.state.user = await strapi.plugins['users-permissions'].services.user.fetch({ id });
       }
     } catch (err) {
       return handleErrors(ctx, err, 'unauthorized');

diff --git a/packages/strapi-plugin-users-permissions/services/User.js b/packages/strapi-plugin-users-permissions/services/User.js
@@ -63,7 +63,9 @@ module.exports = {
    * @return {Promise}
    */
   fetch(params, populate) {
-    return strapi.query('user', 'users-permissions').findOne(params, populate);
+    const defaultPopulate = [...populate, 'role'];
+
+    return strapi.query('user', 'users-permissions').findOne(params, defaultPopulate);
   },
 
   /**