TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-29 13:52:10 +03:00
Code Issues Projects Releases Wiki Activity

Disabled portal and stripe in {{ghost_head}} when signup access is none

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

- skips insertion of members-related scripts and styles when `members_signup_access` setting is set to `'none'`
- adds `id="gh-members-styles"` to the inserted style script tag for reference in tests and JS
This commit is contained in:
Kevin Ansfield 2021-04-19 17:27:37 +01:00
parent fff6a04c54
commit 4a8352c418
2 changed files with 123 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/frontend/helpers/ghost_head.js
View File

@ -37,13 +37,17 @@ function finaliseStructuredData(meta) {
}
function getMembersHelper(data) {
if (settingsCache.get('members_signup_access') === 'none') {
return '';
}
const stripeDirectSecretKey = settingsCache.get('stripe_secret_key');
const stripeDirectPublishableKey = settingsCache.get('stripe_publishable_key');
const stripeConnectAccountId = settingsCache.get('stripe_connect_account_id');
const colorString = _.has(data, 'site._preview') && data.site.accent_color ? ` data-accent-color="${data.site.accent_color}"` : '';
const portalUrl = config.get('portal:url');
let membersHelper = `<script defer src="${portalUrl}" data-ghost="${urlUtils.getSiteUrl()}"${colorString}></script>`;
membersHelper += (`<style> ${templateStyles}</style>`);
membersHelper += (`<style id="gh-members-styles">${templateStyles}</style>`);
if ((!!stripeDirectSecretKey && !!stripeDirectPublishableKey) || !!stripeConnectAccountId) {
membersHelper += '<script async src="https://js.stripe.com/v3/"></script>';
}

118
test/unit/helpers/ghost_head_spec.js
View File

@ -1684,4 +1684,122 @@ describe('{{ghost_head}} helper', function () {
}).catch(done);
});
});
describe('members scripts', function () {
it('includes portal when signup is "all"', function (done) {
settingsCache.get.withArgs('members_signup_access').returns('all');
helpers.ghost_head(testUtils.createHbsResponse({
locals: {
relativeUrl: '/',
context: ['home', 'index'],
safeVersion: '4.3'
}
})).then(function (rendered) {
should.exist(rendered);
rendered.string.should.containEql('<script defer src="https://unpkg.com/@tryghost/portal');
rendered.string.should.containEql('<style id="gh-members-styles">');
done();
}).catch(done);
});
it('includes portal when signup is "invite"', function (done) {
settingsCache.get.withArgs('members_signup_access').returns('invite');
helpers.ghost_head(testUtils.createHbsResponse({
locals: {
relativeUrl: '/',
context: ['home', 'index'],
safeVersion: '4.3'
}
})).then(function (rendered) {
should.exist(rendered);
rendered.string.should.containEql('<script defer src="https://unpkg.com/@tryghost/portal');
rendered.string.should.containEql('<style id="gh-members-styles">');
done();
}).catch(done);
});
it('includes stripe when set up as direct', function (done) {
settingsCache.get.withArgs('members_signup_access').returns('all');
settingsCache.get.withArgs('stripe_secret_key').returns('secret');
settingsCache.get.withArgs('stripe_publishable_key').returns('publishable');
settingsCache.get.withArgs('stripe_connect_account_id').returns(null);
helpers.ghost_head(testUtils.createHbsResponse({
locals: {
relativeUrl: '/',
context: ['home', 'index'],
safeVersion: '4.3'
}
})).then(function (rendered) {
should.exist(rendered);
rendered.string.should.containEql('<script defer src="https://unpkg.com/@tryghost/portal');
rendered.string.should.containEql('<style id="gh-members-styles">');
rendered.string.should.containEql('<script async src="https://js.stripe.com');
done();
}).catch(done);
});
it('includes stripe when set up as connect', function (done) {
settingsCache.get.withArgs('members_signup_access').returns('all');
settingsCache.get.withArgs('stripe_secret_key').returns(null);
settingsCache.get.withArgs('stripe_publishable_key').returns(null);
settingsCache.get.withArgs('stripe_connect_account_id').returns('connect_account');
helpers.ghost_head(testUtils.createHbsResponse({
locals: {
relativeUrl: '/',
context: ['home', 'index'],
safeVersion: '4.3'
}
})).then(function (rendered) {
should.exist(rendered);
rendered.string.should.containEql('<script defer src="https://unpkg.com/@tryghost/portal');
rendered.string.should.containEql('<style id="gh-members-styles">');
rendered.string.should.containEql('<script async src="https://js.stripe.com');
done();
}).catch(done);
});
it('skips portal and stripe when signup is "none"', function (done) {
settingsCache.get.withArgs('members_signup_access').returns('none');
settingsCache.get.withArgs('stripe_connect_account_id').returns('connect_account');
helpers.ghost_head(testUtils.createHbsResponse({
locals: {
relativeUrl: '/',
context: ['home', 'index'],
safeVersion: '4.3'
}
})).then(function (rendered) {
should.exist(rendered);
rendered.string.should.not.containEql('<script defer src="https://unpkg.com/@tryghost/portal');
rendered.string.should.not.containEql('<style id="gh-members-styles">');
rendered.string.should.not.containEql('<script async src="https://js.stripe.com');
done();
}).catch(done);
});
it('skips stripe if not set up', function (done) {
settingsCache.get.withArgs('members_signup_access').returns('all');
settingsCache.get.withArgs('stripe_secret_key', null);
settingsCache.get.withArgs('stripe_publishable_key', null);
settingsCache.get.withArgs('stripe_connect_account_id', null);
helpers.ghost_head(testUtils.createHbsResponse({
locals: {
relativeUrl: '/',
context: ['home', 'index'],
safeVersion: '4.3'
}
})).then(function (rendered) {
should.exist(rendered);
rendered.string.should.containEql('<script defer src="https://unpkg.com/@tryghost/portal');
rendered.string.should.containEql('<style id="gh-members-styles">');
rendered.string.should.not.containEql('<script async src="https://js.stripe.com');
done();
}).catch(done);
});
});
});