TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-28 05:37:34 +03:00
Code Issues Projects Releases Wiki Activity

Enabled Admin integration for newsletters API (#14714)

Browse Source 
refs https://github.com/TryGhost/Team/issues/1546

- allows newsletters API to work with Admin API keys
- updates fixtures to add permissions to admin integration role for new sites
- adds migration to update existing sites to have correct permissions for role
- whitelists add/edit/read/browse on newsletters API for integrations
This commit is contained in:
Rishabh Garg 2022-05-09 20:46:34 +05:30 committed by GitHub
parent e10f33e30f
commit 4d6b3568c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/server/data/migrations/versions/5.0/2022-05-05-13-29-add-newsletters-admin-integration-permission-roles.js Normal file
View File

@ -0,0 +1,20 @@
const {combineTransactionalMigrations, addPermissionToRole} = require('../../utils');
module.exports = combineTransactionalMigrations(
addPermissionToRole({
permission: 'Browse newsletters',
role: 'Admin Integration'
}),
addPermissionToRole({
permission: 'Read newsletters',
role: 'Admin Integration'
}),
addPermissionToRole({
permission: 'Edit newsletters',
role: 'Admin Integration'
}),
addPermissionToRole({
permission: 'Add newsletters',
role: 'Admin Integration'
})
);

3
core/server/data/schema/fixtures/fixtures.json
View File

@ -699,7 +699,8 @@
"email": "all", "email": "all",
"snippet": "all", "snippet": "all",
"product": ["browse", "read", "add", "edit"], "product": ["browse", "read", "add", "edit"],
"offer": ["browse", "read", "add", "edit"] "offer": ["browse", "read", "add", "edit"],
"newsletter": ["browse", "read", "add", "edit"]
}, },
"Editor": { "Editor": {
"notification": "all", "notification": "all",

24
test/integration/migrations/migration.test.js
View File

@ -147,15 +147,15 @@ describe('Database Migration (special functions)', function () {
permissions.should.havePermission('Add Members'); permissions.should.havePermission('Add Members');
permissions.should.havePermission('Delete Members'); permissions.should.havePermission('Delete Members');
permissions.should.havePermission('Browse offers', ['Administrator']); permissions.should.havePermission('Browse offers');
permissions.should.havePermission('Read offers', ['Administrator']); permissions.should.havePermission('Read offers');
permissions.should.havePermission('Edit offers', ['Administrator']); permissions.should.havePermission('Edit offers');
permissions.should.havePermission('Add offers', ['Administrator']); permissions.should.havePermission('Add offers');
permissions.should.havePermission('Browse Products', ['Administrator', 'Editor', 'Author']); permissions.should.havePermission('Browse Products', ['Administrator', 'Editor', 'Author', 'Admin Integration']);
permissions.should.havePermission('Read Products', ['Administrator', 'Editor', 'Author']); permissions.should.havePermission('Read Products', ['Administrator', 'Editor', 'Author', 'Admin Integration']);
permissions.should.havePermission('Edit Products', ['Administrator']); permissions.should.havePermission('Edit Products', ['Administrator', 'Admin Integration']);
permissions.should.havePermission('Add Products', ['Administrator']); permissions.should.havePermission('Add Products', ['Administrator', 'Admin Integration']);
permissions.should.havePermission('Delete Products', ['Administrator']); permissions.should.havePermission('Delete Products', ['Administrator']);
permissions.should.havePermission('Reset all passwords', ['Administrator']); permissions.should.havePermission('Reset all passwords', ['Administrator']);
@ -163,10 +163,10 @@ describe('Database Migration (special functions)', function () {
permissions.should.havePermission('Browse custom theme settings', ['Administrator']); permissions.should.havePermission('Browse custom theme settings', ['Administrator']);
permissions.should.havePermission('Edit custom theme settings', ['Administrator']); permissions.should.havePermission('Edit custom theme settings', ['Administrator']);
permissions.should.havePermission('Browse newsletters', ['Administrator']); permissions.should.havePermission('Browse newsletters', ['Administrator', 'Admin Integration']);
permissions.should.havePermission('Read newsletters', ['Administrator']); permissions.should.havePermission('Read newsletters', ['Administrator', 'Admin Integration']);
permissions.should.havePermission('Edit newsletters', ['Administrator']); permissions.should.havePermission('Edit newsletters', ['Administrator', 'Admin Integration']);
permissions.should.havePermission('Add newsletters', ['Administrator']); permissions.should.havePermission('Add newsletters', ['Administrator', 'Admin Integration']);
}); });
describe('Populate', function () { describe('Populate', function () {

12
test/unit/server/data/schema/fixtures/fixture-manager.test.js
View File

@ -201,18 +201,18 @@ describe('Migration Fixture Utils', function () {
fixtureManager.addFixturesForRelation(fixtures.relations[0]).then(function (result) { fixtureManager.addFixturesForRelation(fixtures.relations[0]).then(function (result) {
should.exist(result); should.exist(result);
result.should.be.an.Object(); result.should.be.an.Object();
result.should.have.property('expected', 83); result.should.have.property('expected', 86);
result.should.have.property('done', 83); result.should.have.property('done', 86);
// Permissions & Roles // Permissions & Roles
permsAllStub.calledOnce.should.be.true(); permsAllStub.calledOnce.should.be.true();
rolesAllStub.calledOnce.should.be.true(); rolesAllStub.calledOnce.should.be.true();
dataMethodStub.filter.callCount.should.eql(83); dataMethodStub.filter.callCount.should.eql(86);
dataMethodStub.find.callCount.should.eql(7); dataMethodStub.find.callCount.should.eql(7);
baseUtilAttachStub.callCount.should.eql(83); baseUtilAttachStub.callCount.should.eql(86);
fromItem.related.callCount.should.eql(83); fromItem.related.callCount.should.eql(86);
fromItem.find.callCount.should.eql(83); fromItem.find.callCount.should.eql(86);
done(); done();
}).catch(done); }).catch(done);

2
test/unit/server/data/schema/integrity.test.js
View File

@ -36,7 +36,7 @@ const validateRouteSettings = require('../../../../../core/server/services/route
describe('DB version integrity', function () { describe('DB version integrity', function () {
// Only these variables should need updating // Only these variables should need updating
const currentSchemaHash = 'e913ad0d62d2e8e64c28aa41cb443076'; const currentSchemaHash = 'e913ad0d62d2e8e64c28aa41cb443076';
const currentFixturesHash = 'ab89cbc5cfb7b977c34b2de00e1bea40'; const currentFixturesHash = 'e840343b816a5f9c6b1849c5220bacf8';
const currentSettingsHash = 'ffd899a82b0ad2886e92d8244bcbca6a'; const currentSettingsHash = 'ffd899a82b0ad2886e92d8244bcbca6a';
const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01'; const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01';

5
test/utils/fixtures/fixtures.json
View File

@ -870,7 +870,10 @@
"label": "all", "label": "all",
"email_preview": "all", "email_preview": "all",
"email": "all", "email": "all",
"snippet": "all" "snippet": "all",
"product": ["browse", "read", "add", "edit"],
"offer": ["browse", "read", "add", "edit"],
"newsletter": ["browse", "read", "add", "edit"]
}, },
"Editor": { "Editor": {
"notification": "all", "notification": "all",