TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-24 06:35:49 +03:00
Code Issues Projects Releases Wiki Activity

Fixed limit service not allowing explore integration

Browse Source 
no issue

- Don't run limit checks for the Ghost Explore integration
This commit is contained in:
Aileen Nowak 2022-08-09 12:54:37 +01:00 committed by Aileen Booker
parent f34740d6d0
commit fd9e19ce07
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghost/core/core/server/services/auth/api-key/admin.js
View File

@ -127,7 +127,11 @@ const authenticateWithToken = async (req, res, next, {token, JWT_OPTIONS}) => {
// CASE: blocking all non-internal: "custom" and "builtin" integration requests when the limit is reached
if (limitService.isLimited('customIntegrations')
&& (apiKey.relations.integration && !['internal'].includes(apiKey.relations.integration.get('type')))) {
&& (apiKey.relations.integration
&& !['internal'].includes(apiKey.relations.integration.get('type'))
&& !['ghost-explore'].includes(apiKey.relations.integration.get('slug'))
)
) {
// NOTE: using "checkWouldGoOverLimit" instead of "checkIsOverLimit" here because flag limits don't have
// a concept of measuring if the limit has been surpassed
await limitService.errorIfWouldGoOverLimit('customIntegrations');

6
ghost/core/core/server/services/auth/api-key/content.js
View File

@ -43,7 +43,11 @@ const authenticateContentApiKey = async function authenticateContentApiKey(req,
// CASE: blocking all non-internal: "custom" and "builtin" integration requests when the limit is reached
if (limitService.isLimited('customIntegrations')
&& (apiKey.relations.integration && !['internal'].includes(apiKey.relations.integration.get('type')))) {
&& (apiKey.relations.integration
&& !['internal'].includes(apiKey.relations.integration.get('type'))
&& !['ghost-explore'].includes(apiKey.relations.integration.get('slug'))
)
) {
// NOTE: using "checkWouldGoOverLimit" instead of "checkIsOverLimit" here because flag limits don't have
// a concept of measuring if the limit has been surpassed
await limitService.errorIfWouldGoOverLimit('customIntegrations');