use merge from lodash to join a custom populate

Signed-off-by: Juan David <juand.business@gmail.com>
strapi · Jun 22, 2020 · c5ea3cf · c5ea3cf
1 parent 7d24c2e
commit c5ea3cf
Showing 1 changed file with 3 additions and 1 deletion.
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) {
-    const defaultPopulate = [...populate, 'role'];
+    let defaultPopulate = ['role'];
+
+    if (populate) _.merge(defaultPopulate, populate);
 
     return strapi.query('user', 'users-permissions').findOne(params, defaultPopulate);
   },