mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-25 03:44:29 +03:00
c6a95c6478
no issue - this commit cleans up the usages of `include` and `withRelated`. ### API layer (`include`) - as request parameter e.g. `?include=roles,tags` - as theme API parameter e.g. `{{get .... include="author"}}` - as internal API access e.g. `api.posts.browse({include: 'author,tags'})` - the `include` notation is more readable than `withRelated` - and it allows us to use a different easier format (comma separated list) - the API utility transforms these more readable properties into model style (or into Ghost style) ### Model access (`withRelated`) - e.g. `models.Post.findPage({withRelated: ['tags']})` - driven by bookshelf --- Commits explained. * Reorder the usage of `convertOptions` - 1. validation - 2. options convertion - 3. permissions - the reason is simple, the permission layer access the model layer - we have to prepare the options before talking to the model layer - added `convertOptions` where it was missed (not required, but for consistency reasons) * Use `withRelated` when accessing the model layer and use `include` when accessing the API layer * Change `convertOptions` API utiliy - API Usage - ghost.api(..., {include: 'tags,authors'}) - `include` should only be used when calling the API (either via request or via manual usage) - `include` is only for readability and easier format - Ghost (Model Layer Usage) - models.Post.findOne(..., {withRelated: ['tags', 'authors']}) - should only use `withRelated` - model layer cannot read 'tags,authors` - model layer has no idea what `include` means, speaks a different language - `withRelated` is bookshelf - internal usage * include-count plugin: use `withRelated` instead of `include` - imagine you outsource this plugin to git and publish it to npm - `include` is an unknown option in bookshelf * Updated `permittedOptions` in base model - `include` is no longer a known option * Remove all occurances of `include` in the model layer * Extend `filterOptions` base function - this function should be called as first action - we clone the unfiltered options - check if you are using `include` (this is a protection which could help us in the beginning) - check for permitted and (later on default `withRelated`) options - the usage is coming in next commit * Ensure we call `filterOptions` as first action - use `ghostBookshelf.Model.filterOptions` as first action - consistent naming pattern for incoming options: `unfilteredOptions` - re-added allowed options for `toJSON` - one unsolved architecture problem: - if you override a function e.g. `edit` - then you should call `filterOptions` as first action - the base implementation of e.g. `edit` will call it again - future improvement * Removed `findOne` from Invite model - no longer needed, the base implementation is the same
251 lines
9.6 KiB
JavaScript
251 lines
9.6 KiB
JavaScript
var Promise = require('bluebird'),
|
|
_ = require('lodash'),
|
|
pipeline = require('../lib/promise/pipeline'),
|
|
mail = require('../services/mail'),
|
|
urlService = require('../services/url'),
|
|
localUtils = require('./utils'),
|
|
models = require('../models'),
|
|
common = require('../lib/common'),
|
|
security = require('../lib/security'),
|
|
mailAPI = require('./mail'),
|
|
settingsAPI = require('./settings'),
|
|
docName = 'invites',
|
|
allowedIncludes = ['created_by', 'updated_by'],
|
|
invites;
|
|
|
|
invites = {
|
|
browse: function browse(options) {
|
|
var tasks;
|
|
|
|
function modelQuery(options) {
|
|
return models.Invite.findPage(options);
|
|
}
|
|
|
|
tasks = [
|
|
localUtils.validate(docName, {opts: localUtils.browseDefaultOptions}),
|
|
localUtils.convertOptions(allowedIncludes),
|
|
localUtils.handlePublicPermissions(docName, 'browse'),
|
|
modelQuery
|
|
];
|
|
|
|
return pipeline(tasks, options);
|
|
},
|
|
|
|
read: function read(options) {
|
|
var attrs = ['id', 'email'],
|
|
tasks;
|
|
|
|
function modelQuery(options) {
|
|
return models.Invite.findOne(options.data, _.omit(options, ['data']))
|
|
.then(function onModelResponse(model) {
|
|
if (!model) {
|
|
return Promise.reject(new common.errors.NotFoundError({
|
|
message: common.i18n.t('errors.api.invites.inviteNotFound')
|
|
}));
|
|
}
|
|
|
|
return {
|
|
invites: [model.toJSON(options)]
|
|
};
|
|
});
|
|
}
|
|
|
|
tasks = [
|
|
localUtils.validate(docName, {attrs: attrs}),
|
|
localUtils.convertOptions(allowedIncludes),
|
|
localUtils.handlePublicPermissions(docName, 'read'),
|
|
modelQuery
|
|
];
|
|
|
|
return pipeline(tasks, options);
|
|
},
|
|
|
|
destroy: function destroy(options) {
|
|
var tasks;
|
|
|
|
function modelQuery(options) {
|
|
return models.Invite.findOne({id: options.id}, _.omit(options, ['data']))
|
|
.then(function (invite) {
|
|
if (!invite) {
|
|
throw new common.errors.NotFoundError({message: common.i18n.t('errors.api.invites.inviteNotFound')});
|
|
}
|
|
|
|
return invite.destroy(options).return(null);
|
|
});
|
|
}
|
|
|
|
tasks = [
|
|
localUtils.validate(docName, {opts: localUtils.idDefaultOptions}),
|
|
localUtils.convertOptions(allowedIncludes),
|
|
localUtils.handlePermissions(docName, 'destroy'),
|
|
modelQuery
|
|
];
|
|
|
|
return pipeline(tasks, options);
|
|
},
|
|
|
|
add: function add(object, options) {
|
|
var tasks,
|
|
loggedInUser = options.context.user,
|
|
emailData,
|
|
invite;
|
|
|
|
function addInvite(options) {
|
|
var data = options.data;
|
|
|
|
return models.Invite.add(data.invites[0], _.omit(options, 'data'))
|
|
.then(function (_invite) {
|
|
invite = _invite;
|
|
|
|
return settingsAPI.read({key: 'title'});
|
|
})
|
|
.then(function (response) {
|
|
var adminUrl = urlService.utils.urlFor('admin', true);
|
|
|
|
emailData = {
|
|
blogName: response.settings[0].value,
|
|
invitedByName: loggedInUser.get('name'),
|
|
invitedByEmail: loggedInUser.get('email'),
|
|
// @TODO: resetLink sounds weird
|
|
resetLink: urlService.utils.urlJoin(adminUrl, 'signup', security.url.encodeBase64(invite.get('token')), '/')
|
|
};
|
|
|
|
return mail.utils.generateContent({data: emailData, template: 'invite-user'});
|
|
}).then(function (emailContent) {
|
|
var payload = {
|
|
mail: [{
|
|
message: {
|
|
to: invite.get('email'),
|
|
subject: common.i18n.t('common.api.users.mail.invitedByName', {
|
|
invitedByName: emailData.invitedByName,
|
|
blogName: emailData.blogName
|
|
}),
|
|
html: emailContent.html,
|
|
text: emailContent.text
|
|
},
|
|
options: {}
|
|
}]
|
|
};
|
|
|
|
return mailAPI.send(payload, {context: {internal: true}});
|
|
}).then(function () {
|
|
options.id = invite.id;
|
|
return models.Invite.edit({status: 'sent'}, options);
|
|
}).then(function () {
|
|
invite.set('status', 'sent');
|
|
var inviteAsJSON = invite.toJSON();
|
|
|
|
return {
|
|
invites: [inviteAsJSON]
|
|
};
|
|
}).catch(function (error) {
|
|
if (error && error.errorType === 'EmailError') {
|
|
error.message = common.i18n.t('errors.api.invites.errorSendingEmail.error', {message: error.message}) + ' ' +
|
|
common.i18n.t('errors.api.invites.errorSendingEmail.help');
|
|
common.logging.warn(error.message);
|
|
}
|
|
|
|
return Promise.reject(error);
|
|
});
|
|
}
|
|
|
|
function destroyOldInvite(options) {
|
|
var data = options.data;
|
|
|
|
return models.Invite.findOne({email: data.invites[0].email}, _.omit(options, 'data'))
|
|
.then(function (invite) {
|
|
if (!invite) {
|
|
return Promise.resolve(options);
|
|
}
|
|
|
|
return invite.destroy(options);
|
|
})
|
|
.then(function () {
|
|
return options;
|
|
});
|
|
}
|
|
|
|
function validation(options) {
|
|
if (!options.data.invites[0].email) {
|
|
return Promise.reject(new common.errors.ValidationError({message: common.i18n.t('errors.api.invites.emailIsRequired')}));
|
|
}
|
|
|
|
if (!options.data.invites[0].role_id) {
|
|
return Promise.reject(new common.errors.ValidationError({message: common.i18n.t('errors.api.invites.roleIsRequired')}));
|
|
}
|
|
|
|
// @TODO remove when we have a new permission unit
|
|
// Make sure user is allowed to add a user with this role
|
|
// We cannot use permissible because we don't have access to the role_id!!!
|
|
// Adding a permissible function to the invite model, doesn't give us much context of the invite we would like to add
|
|
// As we are looking forward to replace the permission system completely, we do not add a hack here
|
|
return models.Role.findOne({id: options.data.invites[0].role_id}).then(function (roleToInvite) {
|
|
if (!roleToInvite) {
|
|
return Promise.reject(new common.errors.NotFoundError({message: common.i18n.t('errors.api.invites.roleNotFound')}));
|
|
}
|
|
|
|
if (roleToInvite.get('name') === 'Owner') {
|
|
return Promise.reject(new common.errors.NoPermissionError({message: common.i18n.t('errors.api.invites.notAllowedToInviteOwner')}));
|
|
}
|
|
|
|
var loggedInUserRole = loggedInUser.related('roles').models[0].get('name'),
|
|
allowed = [];
|
|
|
|
if (loggedInUserRole === 'Owner' || loggedInUserRole === 'Administrator') {
|
|
allowed = ['Administrator', 'Editor', 'Author', 'Contributor'];
|
|
} else if (loggedInUserRole === 'Editor') {
|
|
allowed = ['Author', 'Contributor'];
|
|
}
|
|
|
|
if (allowed.indexOf(roleToInvite.get('name')) === -1) {
|
|
return Promise.reject(new common.errors.NoPermissionError({
|
|
message: common.i18n.t('errors.api.invites.notAllowedToInvite')
|
|
}));
|
|
}
|
|
}).then(function () {
|
|
return options;
|
|
});
|
|
}
|
|
|
|
function checkIfUserExists(options) {
|
|
return models.User.findOne({email: options.data.invites[0].email}, options)
|
|
.then(function (user) {
|
|
if (user) {
|
|
return Promise.reject(new common.errors.ValidationError({
|
|
message: common.i18n.t('errors.api.users.userAlreadyRegistered')
|
|
}));
|
|
}
|
|
|
|
return options;
|
|
});
|
|
}
|
|
|
|
function fetchLoggedInUser(options) {
|
|
return models.User.findOne({id: loggedInUser}, _.merge({}, _.omit(options, 'data'), {withRelated: ['roles']}))
|
|
.then(function (user) {
|
|
if (!user) {
|
|
return Promise.reject(new common.errors.NotFoundError({message: common.i18n.t('errors.api.users.userNotFound')}));
|
|
}
|
|
|
|
loggedInUser = user;
|
|
return options;
|
|
});
|
|
}
|
|
|
|
tasks = [
|
|
localUtils.validate(docName, {opts: ['email']}),
|
|
localUtils.convertOptions(allowedIncludes),
|
|
localUtils.handlePermissions(docName, 'add'),
|
|
fetchLoggedInUser,
|
|
validation,
|
|
checkIfUserExists,
|
|
destroyOldInvite,
|
|
addInvite
|
|
];
|
|
|
|
return pipeline(tasks, object, options);
|
|
}
|
|
};
|
|
|
|
module.exports = invites;
|