TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 11:55:03 +03:00
Code Issues Projects Releases Wiki Activity

Moved the users service to use our DI pattern

Browse Source 
refs #12537
This commit is contained in:
Thibaut Patel 2021-01-15 16:34:06 +00:00
parent c8931a47b5
commit 6a49df36cb
2 changed files with 62 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/server/api/canary/users.js
View File

@ -3,7 +3,9 @@ const {i18n} = require('../../lib/common');
const errors = require('@tryghost/errors');
const models = require('../../models');
const permissionsService = require('../../services/permissions');
const {destroyUser} = require('../../services/users');
const dbBackup = require('../../data/db/backup');
const UsersService = require('../../services/users');
const userService = new UsersService({dbBackup, models});
const ALLOWED_INCLUDES = ['count.posts', 'permissions', 'roles', 'roles.permissions'];
const UNSAFE_ATTRS = ['status', 'roles'];
@ -147,7 +149,7 @@ module.exports = {
},
permissions: true,
async query(frame) {
return destroyUser(frame.options).catch((err) => {
return userService.destroyUser(frame.options).catch((err) => {
return Promise.reject(new errors.NoPermissionError({
err: err
}));

51
core/server/services/users.js
View File

@ -1,37 +1,64 @@
// @ts-check
const path = require('path');
const dbBackup = require('../data/db/backup');
const models = require('../models');
async function destroyUser(frameOptions) {
const backupPath = await dbBackup.backup();
/**
* @typedef {Object} IdbBackup
* @prop {() => Promise<string>} backup
*/
/**
* @typedef {Object} IModels
* @prop {Object} Base
* @prop {(callback: function) => Promise} Base.transaction
* @prop {Object} Post
* @prop {(frameOptions: Object) => Promise} Post.destroyByAuthor
* @prop {Object} ApiKey
* @prop {(Object) => Promise} ApiKey.destroy
* @prop {Object} ApiKey.NotFoundError
* @prop {Object} User
* @prop {(Object) => Promise} User.destroy
*/
class Users {
/**
* @param {Object} dependencies
* @param {IdbBackup} dependencies.dbBackup
* @param {IModels} dependencies.models
*/
constructor({dbBackup, models}) {
this.dbBackup = dbBackup;
this.models = models;
}
async destroyUser(frameOptions) {
const backupPath = await this.dbBackup.backup();
const parsedFileName = path.parse(backupPath);
const filename = `${parsedFileName.name}${parsedFileName.ext}`;
return models.Base.transaction((t) => {
return this.models.Base.transaction((t) => {
frameOptions.transacting = t;
return models.Post.destroyByAuthor(frameOptions)
return this.models.Post.destroyByAuthor(frameOptions)
.then(() => {
return models.ApiKey.destroy({
return this.models.ApiKey.destroy({
...frameOptions,
require: true,
destroyBy: {
user_id: frameOptions.id
}
}).catch((err) => {
if (err instanceof models.ApiKey.NotFoundError) {
if (err instanceof this.models.ApiKey.NotFoundError) {
return; //Do nothing here as it's ok
}
throw err;
});
})
.then(() => {
return models.User.destroy(Object.assign({status: 'all'}, frameOptions));
return this.models.User.destroy(Object.assign({status: 'all'}, frameOptions));
})
.then(() => filename);
});
}
}
module.exports = {
destroyUser
};
module.exports = Users;