Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Moved the service logic out of the users controller

Browse source 
refs #12537
This commit is contained in:
Thibaut Patel 2021-01-12 16:02:34 +00:00
parent d8245216ec
commit 0bea158832
2 changed files with 39 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/server/api/canary/users.js
View file

@ -1,10 +1,9 @@
const path = require('path');
const Promise = require('bluebird');
const {i18n} = require('../../lib/common');
const errors = require('@tryghost/errors');
const dbBackup = require('../../data/db/backup');
const models = require('../../models');
const permissionsService = require('../../services/permissions');
const {destroyUser} = require('../../services/users');
const ALLOWED_INCLUDES = ['count.posts', 'permissions', 'roles', 'roles.permissions'];
const UNSAFE_ATTRS = ['status', 'roles'];
@ -148,33 +147,7 @@ module.exports = {
},
permissions: true,
async query(frame) {
const backupPath = await dbBackup.backup();
const parsedFileName = path.parse(backupPath);
const filename = `${parsedFileName.name}${parsedFileName.ext}`;
return models.Base.transaction((t) => {
frame.options.transacting = t;
return models.Post.destroyByAuthor(frame.options)
.then(() => {
return models.ApiKey.destroy({
...frame.options,
require: true,
destroyBy: {
user_id: frame.options.id
}
}).catch((err) => {
if (err instanceof models.ApiKey.NotFoundError) {
return; //Do nothing here as it's ok
}
throw err;
});
})
.then(() => {
return models.User.destroy(Object.assign({status: 'all'}, frame.options));
})
.then(() => filename);
}).catch((err) => {
return destroyUser(frame.options).catch((err) => {
return Promise.reject(new errors.NoPermissionError({
err: err
}));

37
core/server/services/users.js Normal file
View file

@ -0,0 +1,37 @@
const path = require('path');
const dbBackup = require('../data/db/backup');
const models = require('../models');
async function destroyUser(frameOptions) {
const backupPath = await dbBackup.backup();
const parsedFileName = path.parse(backupPath);
const filename = `${parsedFileName.name}${parsedFileName.ext}`;
return models.Base.transaction((t) => {
frameOptions.transacting = t;
return models.Post.destroyByAuthor(frameOptions)
.then(() => {
return models.ApiKey.destroy({
...frameOptions,
require: true,
destroyBy: {
user_id: frameOptions.id
}
}).catch((err) => {
if (err instanceof models.ApiKey.NotFoundError) {
return; //Do nothing here as it's ok
}
throw err;
});
})
.then(() => {
return models.User.destroy(Object.assign({status: 'all'}, frameOptions));
})
.then(() => filename);
});
}
module.exports = {
destroyUser
};