Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Removed references to Offers labs flag (#13709)

Browse source 
refs https://github.com/TryGhost/Team/issues/1115

This feature is now GA, and the flag has been hardcoded to `true`, here we clean up the
remaining references as they're no longer needed.
This commit is contained in:
Fabien 'egg' O'Carroll 2021-11-03 17:11:48 +02:00 • committed by GitHub
parent 0acdbde010
commit da152a0a13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
core/server/services/offers/service.js
View file

@ -1,6 +1,3 @@
const labs = require('../../../shared/labs');
const events = require('../../lib/common/events');
const DynamicRedirectManager = require('@tryghost/express-dynamic-redirects');
const OffersModule = require('@tryghost/members-offers');
@ -27,35 +24,6 @@ module.exports = {
});
this.api = offersModule.api;
let initCalled = false;
if (labs.isSet('offers')) {
// handles setting up redirects
const promise = offersModule.init();
initCalled = true;
await promise;
}
// TODO: Delete after GA
let offersEnabled = labs.isSet('offers');
events.on('settings.labs.edited', async () => {
if (labs.isSet('offers') && !initCalled) {
const promise = offersModule.init();
initCalled = true;
await promise;
} else if (labs.isSet('offers') !== offersEnabled) {
offersEnabled = labs.isSet('offers');
if (offersEnabled) {
const offers = await this.api.listOffers({});
for (const offer of offers) {
redirectManager.addRedirect(`/${offer.code}`, `/#/portal/offers/${offer.id}`, {permanent: false});
}
} else {
redirectManager.removeAllRedirects();
}
}
});
},
api: null,

8
core/server/web/api/canary/admin/routes.js
View file

@ -100,10 +100,10 @@ module.exports = function apiRoutes() {
router.del('/members', mw.authAdminApi, http(api.members.bulkDestroy));
router.put('/members/bulk', mw.authAdminApi, http(api.members.bulkEdit));
router.get('/offers', labs.enabledMiddleware('offers'), mw.authAdminApi, http(api.offers.browse));
router.post('/offers', labs.enabledMiddleware('offers'), mw.authAdminApi, http(api.offers.add));
router.get('/offers/:id', labs.enabledMiddleware('offers'), mw.authAdminApi, http(api.offers.read));
router.put('/offers/:id', labs.enabledMiddleware('offers'), mw.authAdminApi, http(api.offers.edit));
router.get('/offers', mw.authAdminApi, http(api.offers.browse));
router.post('/offers', mw.authAdminApi, http(api.offers.add));
router.get('/offers/:id', mw.authAdminApi, http(api.offers.read));
router.put('/offers/:id', mw.authAdminApi, http(api.offers.edit));
router.get('/members/stats/count', mw.authAdminApi, http(api.members.memberStats));
router.get('/members/stats/mrr', mw.authAdminApi, http(api.members.mrrStats));

2
core/server/web/members/app.js
View file

@ -37,7 +37,7 @@ module.exports = function setupMembersApp() {
membersApp.put('/api/member', bodyParser.json({limit: '1mb'}), middleware.updateMemberData);
membersApp.post('/api/member/email', bodyParser.json({limit: '1mb'}), (req, res) => membersService.api.middleware.updateEmailAddress(req, res));
membersApp.get('/api/session', middleware.getIdentityToken);
membersApp.get('/api/offers/:id', labs.enabledMiddleware('offers'), middleware.getOfferData);
membersApp.get('/api/offers/:id', middleware.getOfferData);
membersApp.delete('/api/session', middleware.deleteSession);
membersApp.get('/api/site', middleware.getMemberSiteData);

3
core/shared/labs.js
View file

@ -15,8 +15,7 @@ const messages = {
// flags in this list always return `true`, allows quick global enable prior to full flag removal
const GA_FEATURES = [
'customThemeSettings',
'offers'
'customThemeSettings'
];
// NOTE: this allowlist is meant to be used to filter out any unexpected

2
package.json
View file

@ -79,7 +79,7 @@
"@tryghost/limit-service": "1.0.0",
"@tryghost/logging": "1.0.0",
"@tryghost/magic-link": "1.0.14",
"@tryghost/members-api": "2.7.0",
"@tryghost/members-api": "2.7.1",
"@tryghost/members-csv": "1.1.8",
"@tryghost/members-importer": "0.3.4",
"@tryghost/members-offers": "0.10.1",

8
yarn.lock
View file

@ -1566,10 +1566,10 @@
"@tryghost/domain-events" "^0.1.3"
"@tryghost/member-events" "^0.3.1"
"@tryghost/members-api@2.7.0":
version "2.7.0"
resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-2.7.0.tgz#a6b09c3cb6fa315d3371a0180775288fcb9ece38"
integrity sha512-Obsg7AXbdnknaJtCs+kKXgSAtO1kgRWDyUQ7meoV70efoUzodK42ViXPPLxBwoS5+fdfkzmzWQY2JrLLx48POQ==
"@tryghost/members-api@2.7.1":
version "2.7.1"
resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-2.7.1.tgz#f1f10747c80c97830825ee16a4e5f5d1b9eaf866"
integrity sha512-xkz6GEOh8wmJY7oe2vj1SvtF+rBFBhinY0DmaMsCZYTBo2Lr0rTHcQKimba/xSlW0Ba/tosSyIVVwOmYNqY7sg==
dependencies:
"@tryghost/debug" "^0.1.2"
"@tryghost/domain-events" "^0.1.3"