yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-14 09:07:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow custom populate in ctx.state.user (#6770)

Browse Source 
* Allow custom populate in user model

Signed-off-by: Juan David <juand.business@gmail.com>

* use merge from lodash to join a custom populate

Signed-off-by: Juan David <juand.business@gmail.com>

* refactor fech
This commit is contained in:
Juan David Landazabal 2020-07-06 10:43:30 +03:00 committed by GitHub
parent 66637e0101
commit f4959d9560
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-plugin-users-permissions/config/policies/permissions.js
View File

@ -16,7 +16,7 @@ module.exports = async (ctx, next) => {
if (isAdmin) { if (isAdmin) {
ctx.state.admin = await strapi.query('administrator', 'admin').findOne({ id }, []); ctx.state.admin = await strapi.query('administrator', 'admin').findOne({ id }, []);
} else { } 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) { } catch (err) {
return handleErrors(ctx, err, 'unauthorized'); return handleErrors(ctx, err, 'unauthorized');

2
packages/strapi-plugin-users-permissions/services/User.js
View File

@ -62,7 +62,7 @@ module.exports = {
* Promise to fetch a/an user. * Promise to fetch a/an user.
* @return {Promise} * @return {Promise}
*/ */
fetch(params, populate) { fetch(params, populate = ['role']) {
return strapi.query('user', 'users-permissions').findOne(params, populate); return strapi.query('user', 'users-permissions').findOne(params, populate);
}, },