Fix/#7197/Change custom populate state to own service

To avoid issue with population we change the service of state user to there own service call "fetchState", also to keep a separate customization
strapi · Jul 27, 2020 · 57f3f00 · 57f3f00
1 parent e81c6ba
commit 57f3f00
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/strapi-plugin-users-permissions/config/policies/permissions.js b/packages/strapi-plugin-users-permissions/config/policies/permissions.js
@@ -16,8 +16,7 @@ module.exports = async (ctx, next) => {
         throw new Error('Invalid token: Token did not contain required fields');
       }
 
-      ctx.state.user = await strapi.plugins['users-permissions'].services.user.fetch({ id });
-
+      ctx.state.user = await strapi.plugins['users-permissions'].services.user.fetchState({ 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
@@ -61,7 +61,15 @@ module.exports = {
    * Promise to fetch a/an user.
    * @return {Promise}
    */
-  fetch(params, populate = ['role']) {
+  fetch(params, populate) {
+    return strapi.query('user', 'users-permissions').findOne(params, populate);
+  },
+
+  /**
+   * Promise to fetch state user in header.
+   * @return {Promise}
+   */
+  fetchState(params, populate = ['role']) {
     return strapi.query('user', 'users-permissions').findOne(params, populate);
   },