yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-11 15:49:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use default role on register action

Browse Source
This commit is contained in:
Jim Laurie 2018-03-12 16:06:54 +01:00
parent 9b7a216411
commit 88afad1502
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/strapi-plugin-users-permissions/controllers/Auth.js
View File

@ -209,12 +209,14 @@ module.exports = {
}, },
register: async (ctx) => { register: async (ctx) => {
if (!(await strapi.store({ const settings = await strapi.store({
environment: '', environment: '',
type: 'plugin', type: 'plugin',
name: 'users-permissions', name: 'users-permissions',
key: 'advanced' key: 'advanced'
}).get()).allow_register) { }).get();
if (!settings.allow_register) {
return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.advanced.allow_register' }] }] : 'Register action is currently disabled.'); return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.advanced.allow_register' }] }] : 'Register action is currently disabled.');
} }
@ -241,7 +243,7 @@ module.exports = {
const hasAdmin = users.length > 0; const hasAdmin = users.length > 0;
// Check if the user is the first to register // Check if the user is the first to register
const role = hasAdmin === false ? root : await strapi.query('role', 'users-permissions').findOne({ type: 'guest' }, []); const role = hasAdmin === false ? root : await strapi.query('role', 'users-permissions').findOne({ type: settings.default_role }, []);
if (!role) { if (!role) {
return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.form.error.role.notFound' }] }] : 'Impossible to find the root role.'); return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.form.error.role.notFound' }] }] : 'Impossible to find the root role.');