yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-26 23:51:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update admin::administrator queries to match its new name

Browse Source 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
This commit is contained in:
Convly 2020-05-12 16:38:48 +02:00 committed by Alexandre Bodin
parent 1f3506710d
commit 364de7d2e8
5 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/strapi-admin/controllers/Admin.js
View File

@ -173,11 +173,9 @@ module.exports = {
);
}
const adminsWithSameEmail = await strapi.query('administrator', 'admin').findOne({ email });
const adminsWithSameEmail = await strapi.query('user', 'admin').findOne({ email });
const adminsWithSameUsername = await strapi
.query('administrator', 'admin')
.findOne({ username });
const adminsWithSameUsername = await strapi.query('user', 'admin').findOne({ username });
if (adminsWithSameEmail) {
return ctx.badRequest(
@ -208,7 +206,7 @@ module.exports = {
password: await strapi.admin.services.auth.hashPassword(password),
};
const data = await strapi.query('administrator', 'admin').create(user);
const data = await strapi.query('user', 'admin').create(user);
// Send 201 `created`
ctx.created(strapi.admin.services.auth.sanitizeUser(data));
@ -246,14 +244,14 @@ module.exports = {
);
}
const admin = await strapi.query('administrator', 'admin').findOne({ id });
const admin = await strapi.query('user', 'admin').findOne({ id });
// check the user exists
if (!admin) return ctx.notFound('Administrator not found');
// check there are not user with requested email
if (email !== admin.email) {
const adminsWithSameEmail = await strapi.query('administrator', 'admin').findOne({ email });
const adminsWithSameEmail = await strapi.query('user', 'admin').findOne({ email });
if (adminsWithSameEmail && adminsWithSameEmail.id !== admin.id) {
return ctx.badRequest(
@ -269,9 +267,7 @@ module.exports = {
// check there are not user with requested username
if (username !== admin.username) {
const adminsWithSameUsername = await strapi
.query('administrator', 'admin')
.findOne({ username });
const adminsWithSameUsername = await strapi.query('user', 'admin').findOne({ username });
if (adminsWithSameUsername && adminsWithSameUsername.id !== admin.id) {
return ctx.badRequest(
@ -295,7 +291,7 @@ module.exports = {
user.password = await strapi.admin.services.auth.hashPassword(password);
}
const data = await strapi.query('administrator', 'admin').update({ id }, user);
const data = await strapi.query('user', 'admin').update({ id }, user);
// Send 200 `ok`
ctx.send(data);

20
packages/strapi-admin/controllers/Auth.js
View File

@ -54,7 +54,7 @@ module.exports = {
}
// Check if the admin exists.
const admin = await strapi.query('administrator', 'admin').findOne(query);
const admin = await strapi.query('user', 'admin').findOne(query);
if (!admin) {
return ctx.badRequest(
@ -145,7 +145,7 @@ module.exports = {
}
// First, check if their is at least one admin
const admins = await strapi.query('administrator', 'admin').find({ _limit: 1 });
const admins = await strapi.query('user', 'admin').find({ _limit: 1 });
if (admins.length > 0) {
return ctx.badRequest(
@ -159,7 +159,7 @@ module.exports = {
params.password = await strapi.admin.services.auth.hashPassword(params.password);
const admin = await strapi.query('administrator', 'admin').findOne({
const admin = await strapi.query('user', 'admin').findOne({
email: params.email,
});
@ -174,7 +174,7 @@ module.exports = {
}
try {
const admin = await strapi.query('administrator', 'admin').create(params);
const admin = await strapi.query('user', 'admin').create(params);
admin.isAdmin = true;
@ -244,9 +244,7 @@ module.exports = {
);
}
const admin = await strapi
.query('administrator', 'admin')
.findOne({ resetPasswordToken: `${code}` });
const admin = await strapi.query('user', 'admin').findOne({ resetPasswordToken: `${code}` });
if (!admin) {
return ctx.badRequest(
@ -263,9 +261,7 @@ module.exports = {
password: await strapi.admin.services.auth.hashPassword(password),
};
const updatedAdmin = await strapi
.query('administrator', 'admin')
.update({ id: admin.id }, data);
const updatedAdmin = await strapi.query('user', 'admin').update({ id: admin.id }, data);
return ctx.send({
jwt: strapi.admin.services.auth.createJwtToken(updatedAdmin),
@ -296,7 +292,7 @@ module.exports = {
}
// Find the admin thanks to his email.
const admin = await strapi.query('administrator', 'admin').findOne({ email });
const admin = await strapi.query('user', 'admin').findOne({ email });
// admin not found.
if (!admin) {
@ -339,7 +335,7 @@ module.exports = {
}
// Update the admin.
await strapi.query('administrator', 'admin').update({ id: admin.id }, { resetPasswordToken });
await strapi.query('user', 'admin').update({ id: admin.id }, { resetPasswordToken });
ctx.send({ ok: true });
},

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

@ -14,7 +14,7 @@ module.exports = async (ctx, next) => {
}
if (isAdmin) {
ctx.state.admin = await strapi.query('administrator', 'admin').findOne({ id }, []);
ctx.state.admin = await strapi.query('user', 'admin').findOne({ id }, []);
} else {
ctx.state.user = await strapi.plugins['users-permissions'].services.user.fetch({ id });
}

2
packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
View File

@ -144,7 +144,7 @@ module.exports = {
},
async init(ctx) {
const admins = await strapi.query('administrator', 'admin').find({ _limit: 1 });
const admins = await strapi.query('user', 'admin').find({ _limit: 1 });
ctx.send({ hasAdmin: admins.length > 0 });
},

4
packages/strapi/lib/utils/index.js
View File

@ -14,9 +14,7 @@ module.exports = {
return true;
}
const numberOfAdministrators = await strapi
.query('administrator', 'admin')
.find({ _limit: 1 });
const numberOfAdministrators = await strapi.query('user', 'admin').find({ _limit: 1 });
return numberOfAdministrators.length > 0;
} catch (err) {