tqt
/
Ghost
mirror of https://github.com/TryGhost/Ghost.git
2
1
Fork 0
Code Issues 1 Releases Wiki Activity

🐛 Fixed get helper when API v0.1 is disabled (#10270) 

closes #10266

- the Public API labs flag refers to the v0.1 API only
- if it is disabled, the v0.1 API should be disabled
- if the theme is using v2 API, then the get helper should be available regardless
This commit is contained in:
Hannah Wolfe 2018-12-12 15:38:35 +00:00 committed by GitHub
parent a357df1eb9
commit 7cce71d997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/server/helpers/get.js
View File

@ -130,7 +130,7 @@ get = function get(resource, options) {
const self = this;
const data = createFrame(options.data);
const apiVersion = data.root._locals.apiVersion;
const apiVersion = _.get(data, 'root._locals.apiVersion');
let apiOptions = options.hash;
if (!options.fn) {
@ -182,16 +182,23 @@ get = function get(resource, options) {
};
module.exports = function getLabsWrapper() {
var self = this,
args = arguments;
const self = this;
const args = arguments;
const apiVersion = _.get(args, '[1].data.root._locals.apiVersion');
return labs.enabledHelper({
flagKey: 'publicAPI',
flagName: 'Public API',
helperName: 'get',
helpUrl: 'https://help.ghost.org/hc/en-us/articles/115000301672-Public-API-Beta',
async: true
}, function executeHelper() {
return get.apply(self, args);
});
// If the API version is v0.1 return the labs enabled version of the helper
if (apiVersion === 'v0.1') {
return labs.enabledHelper({
flagKey: 'publicAPI',
flagName: 'Public API',
helperName: 'get',
helpUrl: 'https://help.ghost.org/hc/en-us/articles/115000301672-Public-API-Beta',
async: true
}, function executeHelper() {
return get.apply(self, args);
});
}
// Else, we just apply the helper normally
return get.apply(self, args);
};

8
core/test/unit/helpers/get_spec.js
View File

@ -37,7 +37,7 @@ describe('{{#get}} helper', function () {
helpers.get.call(
{},
'posts',
{hash: {}, fn: fn, inverse: inverse}
{hash: {}, data: locals, fn: fn, inverse: inverse}
).then(function (result) {
labsStub.calledOnce.should.be.true();
fn.called.should.be.false();
@ -326,7 +326,8 @@ describe('{{#get}} helper', function () {
'users',
{hash: {}, data: locals, fn: fn, inverse: inverse}
).then(function () {
labsStub.calledOnce.should.be.true();
// We don't use the labs helper for v2
labsStub.calledOnce.should.be.false();
fn.called.should.be.true();
fn.firstCall.args[0].should.be.an.Object().with.property('authors');
@ -358,7 +359,8 @@ describe('{{#get}} helper', function () {
'authors',
{hash: {}, data: locals, fn: fn, inverse: inverse}
).then(function () {
labsStub.calledOnce.should.be.true();
// We don't use the labs helper for v2
labsStub.calledOnce.should.be.false();
fn.called.should.be.true();
fn.firstCall.args[0].should.be.an.Object().with.property('authors');