yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 12:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5576 from strapi/fix/removeConsole4xx

Browse Source 
Remove extra logs in users-permissions
This commit is contained in:
Alexandre BODIN 2020-03-23 14:29:52 +01:00 committed by GitHub
commit 826bb8a9f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,16 +14,11 @@ module.exports = async (ctx, next) => {
} }
if (isAdmin) { if (isAdmin) {
ctx.state.admin = await strapi ctx.state.admin = await strapi.query('administrator', 'admin').findOne({ id }, []);
.query('administrator', 'admin')
.findOne({ id }, []);
} else { } else {
ctx.state.user = await strapi ctx.state.user = await strapi.query('user', 'users-permissions').findOne({ id }, ['role']);
.query('user', 'users-permissions')
.findOne({ id }, ['role']);
} }
} catch (err) { } catch (err) {
strapi.log.error(err);
return handleErrors(ctx, err, 'unauthorized'); return handleErrors(ctx, err, 'unauthorized');
} }
@ -60,11 +55,7 @@ module.exports = async (ctx, next) => {
_.get(await store.get({ key: 'advanced' }), 'email_confirmation') && _.get(await store.get({ key: 'advanced' }), 'email_confirmation') &&
!ctx.state.user.confirmed !ctx.state.user.confirmed
) { ) {
return handleErrors( return handleErrors(ctx, 'Your account email is not confirmed.', 'unauthorized');
ctx,
'Your account email is not confirmed.',
'unauthorized'
);
} }
if (ctx.state.user.blocked) { if (ctx.state.user.blocked) {
@ -78,24 +69,20 @@ module.exports = async (ctx, next) => {
// Retrieve `public` role. // Retrieve `public` role.
if (!role) { if (!role) {
role = await strapi role = await strapi.query('role', 'users-permissions').findOne({ type: 'public' }, []);
.query('role', 'users-permissions')
.findOne({ type: 'public' }, []);
} }
const route = ctx.request.route; const route = ctx.request.route;
const permission = await strapi const permission = await strapi.query('permission', 'users-permissions').findOne(
.query('permission', 'users-permissions') {
.findOne( role: role.id,
{ type: route.plugin || 'application',
role: role.id, controller: route.controller,
type: route.plugin || 'application', action: route.action,
controller: route.controller, enabled: true,
action: route.action, },
enabled: true, []
}, );
[]
);
if (!permission) { if (!permission) {
return handleErrors(ctx, undefined, 'forbidden'); return handleErrors(ctx, undefined, 'forbidden');
@ -103,9 +90,7 @@ module.exports = async (ctx, next) => {
// Execute the policies. // Execute the policies.
if (permission.policy) { if (permission.policy) {
return await strapi.plugins['users-permissions'].config.policies[ return await strapi.plugins['users-permissions'].config.policies[permission.policy](ctx, next);
permission.policy
](ctx, next);
} }
// Execute the action. // Execute the action.